diff --git a/ci/eval/README.md b/ci/eval/README.md index 020e7127f51a9..0436a028ed69e 100644 --- a/ci/eval/README.md +++ b/ci/eval/README.md @@ -5,14 +5,16 @@ The code in this directory is used by the [eval.yml](../../.github/workflows/eva Furthermore it also allows local evaluation using ``` nix-build ci -A eval.full \ - --max-jobs 4 - --cores 2 - --arg chunkSize 10000 + --max-jobs 4 \ + --cores 2 \ + --arg chunkSize 10000 \ + --arg evalSystems '["x86_64-linux" "aarch64-darwin"]' ``` - `--max-jobs`: The maximum number of derivations to run at the same time. Only each [supported system](../supportedSystems.nix) gets a separate derivation, so it doesn't make sense to set this higher than that number. - `--cores`: The number of cores to use for each job. Recommended to set this to the amount of cores on your system divided by `--max-jobs`. - `chunkSize`: The number of attributes that are evaluated simultaneously on a single core. Lowering this decreases memory usage at the cost of increased evaluation time. If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time. +- `evalSystems`: The set of systems for which `nixpkgs` should be evaluated. Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`). A good default is to set `chunkSize` to 10000, which leads to about 3.6GB max memory usage per core, so suitable for fully utilising machines with 4 cores and 16GB memory, 8 cores and 32GB memory or 16 cores and 64GB memory. diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 393d5eae4fba9..927dec5a908dc 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -259,14 +259,13 @@ let full = { - # Whether to evaluate just a single system, by default all are evaluated - evalSystem ? if quickTest then "x86_64-linux" else null, + # Whether to evaluate on a specific set of systems, by default all are evaluated + evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems, # The number of attributes per chunk, see ./README.md for more info. chunkSize, quickTest ? false, }: let - systems = if evalSystem == null then supportedSystems else [ evalSystem ]; results = linkFarm "results" ( map (evalSystem: { name = evalSystem; @@ -274,7 +273,7 @@ let inherit quickTest evalSystem chunkSize; attrpathFile = attrpathsSuperset + "/paths.json"; }; - }) systems + }) evalSystems ); in combine { diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 187457cb55cc7..d62a4ac7abddd 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.31.2"; + version = "1.32.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-L+x1a9wttu2OBY5T6AY8k91ystu0uZAGd3px4oNVptM="; + hash = "sha256-VpinMMWvFYpcqDC9f3q/oEqUHRz7thHMs0bKt6AaNms="; }; vendorHash = null; diff --git a/pkgs/by-name/gi/git-nomad/package.nix b/pkgs/by-name/gi/git-nomad/package.nix index 659a342247c98..34e2b95c9ba2f 100644 --- a/pkgs/by-name/gi/git-nomad/package.nix +++ b/pkgs/by-name/gi/git-nomad/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-nomad"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "rraval"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N+iPr389l9PDfJIhvRL6ziGSPI6pgvfdGX6wxmapLhA="; + sha256 = "sha256-G/i+mCKZSe8tPMuCLzymkU9SGyFNHY74cGhcC4ru0/k="; }; - cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk="; + cargoHash = "sha256-DEGYOPUr3tWDak1J0EkY2yjaLlXjKRH+9puC/oDJacg="; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/ip/iproute2mac/package.nix b/pkgs/by-name/ip/iproute2mac/package.nix index 8149580703c86..a6c5003492a53 100644 --- a/pkgs/by-name/ip/iproute2mac/package.nix +++ b/pkgs/by-name/ip/iproute2mac/package.nix @@ -7,14 +7,14 @@ python3, }: -stdenv.mkDerivation rec { - version = "1.5.4"; +stdenv.mkDerivation (finalAttrs: { pname = "iproute2mac"; + version = "1.5.4"; src = fetchFromGitHub { owner = "brona"; repo = "iproute2mac"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-hmSqJ2gc0DOXUuFrp1ZG8usjFdo07zjV/1JLs5r/E04="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jiegec ]; platforms = lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ir/iro/package.nix b/pkgs/by-name/ir/iro/package.nix new file mode 100644 index 0000000000000..6b55a4a564108 --- /dev/null +++ b/pkgs/by-name/ir/iro/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage { + pname = "iro"; + version = "0-unstable-2024-10-24"; + + src = fetchFromGitHub { + owner = "kyoheiu"; + repo = "iro"; + rev = "ba4adc00e13da9086389357b0e92e608928a8b39"; + hash = "sha256-hGGrEGG1LyzfUCEnV7ahhRO0GrLk28xDWZEFqUHk1rE="; + }; + + cargoHash = "sha256-ZP0YO+5juxFGc2rtvNBvknlTJBrtr8HiuN6/kKW1WNU="; + + meta = { + description = "CLI tool to convet Hex color code or RGB to color code, RGB, HSL and color name"; + homepage = "https://github.com/kyoheiu/iro"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ airrnot ]; + mainProgram = "iro"; + }; +} diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix index a5fd19405a374..a5dfa15ba17fa 100644 --- a/pkgs/by-name/mi/minizign/package.nix +++ b/pkgs/by-name/mi/minizign/package.nix @@ -1,30 +1,37 @@ -{ lib -, stdenv -, fetchFromGitHub -, zig_0_11 +{ + lib, + stdenv, + fetchFromGitHub, + zig_0_13, + apple-sdk_11, }: -stdenv.mkDerivation { +let + zig = zig_0_13; +in +stdenv.mkDerivation (finalAttrs: { pname = "minizign"; - version = "unstable-2023-08-13"; + version = "0.1.4"; src = fetchFromGitHub { owner = "jedisct1"; repo = "zig-minisign"; - rev = "47edc26d0c7bcfb531fe08e3b2411d8dda516d47"; - hash = "sha256-zyxjUFxg+VufEVycYGCQPdjERE3p5Vz5iIi2UDujEjI="; + rev = finalAttrs.version; + hash = "sha256-Su66UohRc9C4INIp+7NHiW28sUq5YBfrI0EoEbGojG0="; }; nativeBuildInputs = [ - zig_0_11.hook + zig.hook ]; - meta = with lib; { + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + + meta = { description = "Minisign reimplemented in Zig"; homepage = "https://github.com/jedisct1/zig-minisign"; - license = licenses.isc; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "minizign"; - inherit (zig_0_11.meta) platforms; + inherit (zig.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix index d35c849604a16..47d4cde8e6f02 100644 --- a/pkgs/by-name/pi/pinocchio/package.nix +++ b/pkgs/by-name/pi/pinocchio/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "pinocchio"; rev = "v${finalAttrs.version}"; - hash = "sha256-8lRGdtN3V0pfRH3f70H8n2pt5CGQkUY1wKg9gUY0toQ="; + hash = "sha256-dm5xfYAnn5N/8ZKTMyZNFM5/j3LLBrG+NOgmtxCAI6I="; }; outputs = [ diff --git a/pkgs/by-name/pi/pixi/Cargo.lock b/pkgs/by-name/pi/pixi/Cargo.lock index a67d68e188cf6..5f2ee5d2237a4 100644 --- a/pkgs/by-name/pi/pixi/Cargo.lock +++ b/pkgs/by-name/pi/pixi/Cargo.lock @@ -28,17 +28,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -139,9 +128,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" [[package]] name = "arbitrary" @@ -198,9 +187,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.15" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26a9844c659a2a293d239c7910b752f8487fe122c6c8bd1659bf85a6507c302" +checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" dependencies = [ "bzip2", "flate2", @@ -317,7 +306,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -352,21 +341,21 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] name = "async_http_range_reader" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a0e0571c5d724d17fbe0b608d31a91e94938722c141877d3a2982216b084c2" +checksum = "4015e7130cf870da1c64a9c7ba474f4b3772a530edbeb05f8358bc9a02f8e505" dependencies = [ "bisection", "futures", "http-content-range", - "itertools 0.12.1", + "itertools 0.13.0", "memmap2 0.9.5", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "thiserror", "tokio", @@ -540,9 +529,9 @@ dependencies = [ [[package]] name = "boxcar" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510a90332002c1af3317ef6b712f0dab697f30bbe809b86965eac2923c0bca8e" +checksum = "fba19c552ee63cb6646b75e1166d1bdb8a6d34a6d19e319dec88c8adadff2db3" [[package]] name = "bstr" @@ -551,6 +540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", + "regex-automata 0.4.8", "serde", ] @@ -562,24 +552,25 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" -version = "0.6.12" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +checksum = "50c8f430744b23b54ad15161fcbc22d82a29b73eacbe425fea23ec822600bc6f" dependencies = [ "bytecheck_derive", "ptr_meta", + "rancor", "simdutf8", ] [[package]] name = "bytecheck_derive" -version = "0.6.12" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -590,9 +581,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bzip2" @@ -642,16 +633,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "cache-key" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" -dependencies = [ - "hex", - "seahash", - "url", -] - [[package]] name = "cache_control" version = "0.2.0" @@ -669,12 +650,12 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0ade8eec3675f2a0962c3b4c1e1d40f83a8005ed536091d98ed2440bba5254" +checksum = "b6dd67a24439ca5260a08128b6cbf4b0f4453497a2f60508163ab9d5b534b122" dependencies = [ "anyhow", - "core-foundation", + "core-foundation 0.9.4", "filetime", "hex", "ignore", @@ -687,7 +668,7 @@ dependencies = [ "tempfile", "tracing", "walkdir", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -818,7 +799,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -857,7 +838,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.14", "windows-sys 0.52.0", ] @@ -871,11 +852,21 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -960,6 +951,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "ctrlc" +version = "3.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +dependencies = [ + "nix", + "windows-sys 0.59.0", +] + [[package]] name = "darling" version = "0.20.10" @@ -981,7 +982,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.79", + "syn", ] [[package]] @@ -992,7 +993,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -1071,17 +1072,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_arbitrary" version = "1.3.2" @@ -1090,7 +1080,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -1161,48 +1151,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", -] - -[[package]] -name = "distribution-filename" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" -dependencies = [ - "pep440_rs", - "platform-tags", - "rkyv", - "serde", - "thiserror", - "url", - "uv-normalize", -] - -[[package]] -name = "distribution-types" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" -dependencies = [ - "anyhow", - "cache-key", - "distribution-filename", - "fs-err", - "itertools 0.13.0", - "jiff", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", - "rkyv", - "serde", - "serde_json", - "thiserror", - "tracing", - "url", - "urlencoding", - "uv-fs", - "uv-git", - "uv-normalize", + "syn", ] [[package]] @@ -1271,7 +1220,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -1283,7 +1232,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -1304,7 +1253,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -1410,9 +1359,9 @@ dependencies = [ [[package]] name = "file_url" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e581e35fcfcf40b1767a88e44e3e1ef27faa11fc7383287d47bd3efef1cfe199" +checksum = "eff487eda48708def359958613c6c9762d9c4f8396db240e37083758ccb01c79" dependencies = [ "itertools 0.13.0", "percent-encoding", @@ -1458,15 +1407,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "fluent-uri" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1507,6 +1447,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "fs-err" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb60e7409f34ef959985bc9d9c5ee8f5db24ee46ed9775850548021710f807f" +dependencies = [ + "autocfg", + "tokio", +] + [[package]] name = "fs2" version = "0.4.3" @@ -1519,11 +1469,11 @@ dependencies = [ [[package]] name = "fs4" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de" +checksum = "adc91b3da7f1a7968b00f9f65a4971252f6a927d3cb9eec05d91cbeaff678f9a" dependencies = [ - "fs-err", + "fs-err 2.11.0", "rustix", "windows-sys 0.52.0", ] @@ -1619,7 +1569,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -1716,11 +1666,22 @@ dependencies = [ "regex-syntax 0.8.5", ] +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + [[package]] name = "goblin" -version = "0.8.2" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47" +checksum = "53ab3f32d1d77146981dea5d6b1e8fe31eedcb7013e5e00d6ccd1259a4b4d923" dependencies = [ "log", "plain", @@ -1729,9 +1690,9 @@ dependencies = [ [[package]] name = "google-cloud-auth" -version = "0.13.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf7cb7864f08a92e77c26bb230d021ea57691788fb5dd51793f96965d19e7f9" +checksum = "357160f51a60ec3e32169ad687f4abe0ee1e90c73b449aa5d11256c4f1cf2ff6" dependencies = [ "async-trait", "base64 0.21.7", @@ -1739,7 +1700,7 @@ dependencies = [ "google-cloud-token", "home", "jsonwebtoken", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "thiserror", @@ -1751,11 +1712,11 @@ dependencies = [ [[package]] name = "google-cloud-metadata" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc279bfb50487d7bcd900e8688406475fc750fe474a835b2ab9ade9eb1fc90e2" +checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f" dependencies = [ - "reqwest 0.11.27", + "reqwest", "thiserror", "tokio", ] @@ -1769,25 +1730,6 @@ dependencies = [ "async-trait", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "h2" version = "0.4.6" @@ -1799,7 +1741,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.1.0", + "http", "indexmap 2.6.0", "slab", "tokio", @@ -1822,9 +1764,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -1832,7 +1771,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", ] @@ -1911,17 +1850,6 @@ dependencies = [ "utf8-width", ] -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http" version = "1.1.0" @@ -1933,17 +1861,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.1" @@ -1951,7 +1868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] @@ -1962,8 +1879,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", - "http-body 1.0.1", + "http", + "http-body", "pin-project-lite", ] @@ -1976,7 +1893,7 @@ dependencies = [ "async-trait", "bincode", "cacache", - "http 1.1.0", + "http", "http-cache-semantics", "httpdate", "serde", @@ -1991,10 +1908,10 @@ checksum = "be3e27c4e2e510571cbcc601407b639667146aa9a4e818d5cc1d97c8b4b27d61" dependencies = [ "anyhow", "async-trait", - "http 1.1.0", + "http", "http-cache", "http-cache-semantics", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "serde", "url", @@ -2006,18 +1923,18 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ - "http 1.1.0", + "http", "http-serde", - "reqwest 0.12.8", + "reqwest", "serde", "time", ] [[package]] name = "http-content-range" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" +checksum = "91314cc9d86f625097a3365cab4e4b6f190eac231650f8f41c1edd8080cea1d0" [[package]] name = "http-serde" @@ -2025,7 +1942,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd" dependencies = [ - "http 1.1.0", + "http", "serde", ] @@ -2062,30 +1979,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "0.14.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "1.5.0" @@ -2095,9 +1988,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "httparse", "itoa", "pin-project-lite", @@ -2106,20 +1999,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.31", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.3" @@ -2127,29 +2006,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", - "hyper 1.5.0", + "http", + "hyper", "hyper-util", - "rustls 0.23.14", + "rustls", "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", - "webpki-roots 0.26.5", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper 0.14.31", - "native-tls", - "tokio", - "tokio-native-tls", + "webpki-roots", ] [[package]] @@ -2160,7 +2026,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.0", + "hyper", "hyper-util", "native-tls", "tokio", @@ -2177,9 +2043,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.5.0", + "http", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -2274,7 +2140,7 @@ dependencies = [ "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -2309,38 +2175,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "install-wheel-rs" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" -dependencies = [ - "configparser", - "csv", - "data-encoding", - "distribution-filename", - "fs-err", - "mailparse", - "pathdiff", - "pep440_rs", - "platform-info", - "platform-tags", - "pypi-types", - "reflink-copy", - "regex", - "rustc-hash", - "serde", - "serde_json", - "sha2", - "tempfile", - "thiserror", - "tracing", - "uv-fs", - "uv-normalize", - "uv-warnings", - "walkdir", - "zip 0.6.6", -] - [[package]] name = "instant" version = "0.1.13" @@ -2406,9 +2240,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jiff" -version = "0.1.8" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2b7379a75544c94b3da32821b0bf41f9062e9970e23b78cc577d0d89676d16" +checksum = "b9d9d414fc817d3e3d62b2598616733f76c4cc74fbac96069674739b881295c8" dependencies = [ "jiff-tzdb-platform", "serde", @@ -2417,15 +2251,15 @@ dependencies = [ [[package]] name = "jiff-tzdb" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6" +checksum = "91335e575850c5c4c673b9bd467b0e025f164ca59d0564f69d0c2ee0ffad4653" [[package]] name = "jiff-tzdb-platform" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940" +checksum = "9835f0060a626fe59f160437bc725491a6af23133ea906500027d1bd2f8f4329" dependencies = [ "jiff-tzdb", ] @@ -2450,9 +2284,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "2.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" +checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" dependencies = [ "jsonptr", "serde", @@ -2462,11 +2296,10 @@ dependencies = [ [[package]] name = "jsonptr" -version = "0.4.7" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" dependencies = [ - "fluent-uri", "serde", "serde_json", ] @@ -2488,9 +2321,9 @@ dependencies = [ [[package]] name = "junction" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa" +checksum = "72bbdfd737a243da3dfc1f99ee8d6e166480f17ab4ac84d7c34aacd73fc7bd16" dependencies = [ "scopeguard", "windows-sys 0.52.0", @@ -2498,18 +2331,36 @@ dependencies = [ [[package]] name = "keyring" -version = "3.2.1" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030a9b84bb2a2f3673d4c8b8236091ed5d8f6b66a56d8085471d8abd5f3c6a80" +checksum = "2f8fe839464d4e4b37d756d7e910063696af79a7e877282cb1825e4ec5f10833" dependencies = [ "byteorder", "dbus-secret-service", + "log", "secret-service", - "security-framework", + "security-framework 2.11.1", + "security-framework 3.0.0", "windows-sys 0.59.0", "zbus", ] +[[package]] +name = "krata-tokio-tar" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8bd5fee9b96acb5fc36b401896d601e6fdcce52b0e651ce24a3b21fb524e79f" +dependencies = [ + "filetime", + "futures-core", + "libc", + "portable-atomic", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + [[package]] name = "lazy-regex" version = "3.3.0" @@ -2530,7 +2381,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.79", + "syn", ] [[package]] @@ -2698,7 +2549,7 @@ dependencies = [ "miette-derive 5.10.0", "once_cell", "thiserror", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -2718,7 +2569,7 @@ dependencies = [ "terminal_size 0.3.0", "textwrap", "thiserror", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -2729,7 +2580,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -2740,7 +2591,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -2749,6 +2600,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minijinja" version = "2.1.1" @@ -2801,8 +2662,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea" [[package]] -name = "nanoid" -version = "0.4.0" +name = "munge" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" +dependencies = [ + "munge_macro", +] + +[[package]] +name = "munge_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "nanoid" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" dependencies = [ @@ -2821,7 +2702,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", + "security-framework 2.11.1", "security-framework-sys", "tempfile", ] @@ -2978,16 +2859,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "once-map" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" -dependencies = [ - "dashmap", - "futures", - "tokio", -] - [[package]] name = "once_cell" version = "1.20.2" @@ -3017,7 +2888,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -3044,6 +2915,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-stream" version = "0.2.0" @@ -3064,6 +2944,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +dependencies = [ + "memchr", +] + [[package]] name = "ouroboros" version = "0.18.4" @@ -3086,7 +2975,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -3194,36 +3083,36 @@ dependencies = [ [[package]] name = "pep440_rs" -version = "0.6.0" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0922a442c78611fa8c5ed6065d2d898a820cf12fa90604217fdb2d01675efec7" dependencies = [ - "rkyv", "serde", - "unicode-width", + "unicode-width 0.2.0", "unscanny", + "version-ranges 0.1.0 (git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79)", ] [[package]] name = "pep508_rs" -version = "0.6.0" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2feee999fa547bacab06a4881bacc74688858b92fa8ef1e206c748b0a76048" dependencies = [ "boxcar", "indexmap 2.6.0", "itertools 0.13.0", + "once_cell", "pep440_rs", - "pubgrub", "regex", "rustc-hash", - "schemars", "serde", "smallvec", "thiserror", - "unicode-width", + "unicode-width 0.2.0", "url", - "uv-fs", - "uv-normalize", - "uv-pubgrub", + "urlencoding", + "version-ranges 0.1.0 (git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79)", ] [[package]] @@ -3272,7 +3161,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.79", + "syn", "unicase", ] @@ -3303,14 +3192,14 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -3331,9 +3220,9 @@ dependencies = [ [[package]] name = "pixi" -version = "0.34.0" +version = "0.38.0" dependencies = [ - "ahash 0.8.11", + "ahash", "assert_matches", "async-once-cell", "async-trait", @@ -3348,23 +3237,20 @@ dependencies = [ "csv", "deno_task_shell", "dialoguer", - "distribution-filename", - "distribution-types", "dunce", "fake", "fancy_display", "flate2", - "fs-err", + "fs-err 2.11.0", "fs_extra", "futures", - "http 1.1.0", + "http", "human_bytes", "humantime", "ignore", "indexmap 2.6.0", "indicatif", "insta", - "install-wheel-rs", "is_executable", "itertools 0.13.0", "libc", @@ -3385,7 +3271,6 @@ dependencies = [ "pixi_spec", "pixi_utils", "pixi_uv_conversions", - "pypi-types", "pypi_mapping", "pypi_modifiers", "rattler", @@ -3398,7 +3283,7 @@ dependencies = [ "rattler_solve", "rattler_virtual_packages", "regex", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "rlimit", "rstest", @@ -3425,14 +3310,22 @@ dependencies = [ "uv-configuration", "uv-dispatch", "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", "uv-git", + "uv-install-wheel", "uv-installer", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", + "uv-requirements", "uv-resolver", "uv-types", "xxhash-rust", "zip 2.2.0", + "zstd", ] [[package]] @@ -3502,6 +3395,7 @@ dependencies = [ "rstest", "serde", "serde-untagged", + "serde-value", "serde_json", "serde_with", "spdx", @@ -3565,7 +3459,7 @@ dependencies = [ "pixi_consts", "rattler_conda_types", "rattler_networking", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "rstest", "serde", @@ -3582,18 +3476,22 @@ dependencies = [ name = "pixi_uv_conversions" version = "0.1.0" dependencies = [ - "distribution-filename", - "distribution-types", "dunce", + "pep440_rs", "pep508_rs", "pixi_manifest", - "pypi-types", "rattler_lock", + "serde_json", "thiserror", "url", "uv-configuration", + "uv-distribution-filename", + "uv-distribution-types", "uv-git", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-types", ] @@ -3620,16 +3518,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "platform-tags" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" -dependencies = [ - "rustc-hash", - "serde", - "thiserror", -] - [[package]] name = "plist" version = "1.7.0" @@ -3681,9 +3569,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.0.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c501afe3a2e25c9bd219aa56ec1e04cdb3fcdd763055be268778c13fa82c1f" +checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" dependencies = [ "autocfg", "equivalent", @@ -3716,41 +3604,65 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", "version_check", "yansi", ] +[[package]] +name = "procfs" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" +dependencies = [ + "bitflags 2.6.0", + "flate2", + "hex", + "procfs-core", + "rustix", +] + +[[package]] +name = "procfs-core" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" +dependencies = [ + "bitflags 2.6.0", + "hex", +] + [[package]] name = "ptr_meta" -version = "0.1.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90" dependencies = [ "ptr_meta_derive", ] [[package]] name = "ptr_meta_derive" -version = "0.1.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=388685a8711092971930986644cfed152d1a1f6c#388685a8711092971930986644cfed152d1a1f6c" +source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79" dependencies = [ "indexmap 2.6.0", "log", "priority-queue", "rustc-hash", "thiserror", + "version-ranges 0.1.0 (git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79)", ] [[package]] @@ -3768,30 +3680,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "pypi-types" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" -dependencies = [ - "distribution-filename", - "indexmap 2.6.0", - "itertools 0.13.0", - "jiff", - "mailparse", - "pep440_rs", - "pep508_rs", - "regex", - "rkyv", - "serde", - "thiserror", - "toml", - "tracing", - "url", - "uv-fs", - "uv-git", - "uv-normalize", -] - [[package]] name = "pypi_mapping" version = "0.1.0" @@ -3807,7 +3695,7 @@ dependencies = [ "pixi_consts", "rattler_conda_types", "rattler_digest", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "reqwest-retry 0.5.0", "serde", @@ -3821,23 +3709,24 @@ name = "pypi_modifiers" version = "0.1.0" dependencies = [ "miette 7.2.0", - "pep508_rs", "pixi_default_versions", "pixi_manifest", - "platform-tags", "rattler_conda_types", + "uv-pep508", + "uv-platform-tags", ] [[package]] name = "pyproject-toml" -version = "0.11.0" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef7061023bcb58a0fc4a4bbe9819c13b0dca7c2abc14da14f5ecc1532ab3a36a" +checksum = "643af57c3f36ba90a8b53e972727d8092f7408a9ebfbaf4c3d2c17b07c58d835" dependencies = [ "indexmap 2.6.0", "pep440_rs", "pep508_rs", "serde", + "thiserror", "toml", ] @@ -3861,7 +3750,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.14", + "rustls", "socket2", "thiserror", "tokio", @@ -3878,7 +3767,7 @@ dependencies = [ "rand", "ring", "rustc-hash", - "rustls 0.23.14", + "rustls", "slab", "thiserror", "tinyvec", @@ -3919,6 +3808,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rancor" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947" +dependencies = [ + "ptr_meta", +] + [[package]] name = "rand" version = "0.8.5" @@ -3951,16 +3849,16 @@ dependencies = [ [[package]] name = "rattler" -version = "0.27.16" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b1afb401b5ae69ef0c20beabdf822c650cc6c387bd01369876a3cc05807b65" +checksum = "7365abb0dff1cc5dce7d5b54accfbaccaca512216557a860a59099b2e41872cd" dependencies = [ "anyhow", "clap", "console", "digest", "dirs", - "fs-err", + "fs-err 3.0.0", "futures", "humantime", "indexmap 2.6.0", @@ -3978,7 +3876,7 @@ dependencies = [ "rattler_shell", "reflink-copy", "regex", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "simple_spawn_blocking", "smallvec", @@ -3992,9 +3890,9 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abdd55d83e6b1a573920b0b40b79fe11b4957abef45e2fac3144c323f48a2f60" +checksum = "e6fcc7980d8b4f0422145abbaec1f9f05ebd6e59f97fe4e5f9ba17fe2cf3846d" dependencies = [ "anyhow", "dashmap", @@ -4009,7 +3907,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_package_streaming", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "simple_spawn_blocking", "thiserror", @@ -4020,9 +3918,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.28.3" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ada4de35daa5b8ef2eecf18f51eaec355c52c5a6f9ca21b6413807b72cb90d0f" +checksum = "f70c3e619609920f0fc792743e427f012d449951a951c16154fea8ee2a957a48" dependencies = [ "chrono", "dirs", @@ -4056,9 +3954,9 @@ dependencies = [ [[package]] name = "rattler_digest" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a87e1ed2c7df1dbbfaa79d8f520c347d511231c77f4dd5327a6c389758a98db0" +checksum = "a6a97526971dd357657ea4c88f6d39b31b2875c87dfe9fd12aac305fec6c0f60" dependencies = [ "blake2", "digest", @@ -4073,9 +3971,9 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.22.28" +version = "0.22.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889a7a66861b54beec196fbcf72fc699e3696692cec02b8e429b6394257dd2c9" +checksum = "0db0f03a38c93f291acc3df137fa5e4717da5de36ed4164f0dfdb657977619e0" dependencies = [ "chrono", "file_url", @@ -4096,19 +3994,19 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0306a96eb7216c786fa6234fd26207bf3769cbb48b2373d682eabb36ff11c175" +checksum = "19eadf6fea87bd67d9d4c372caa3c2bed33cd91cdc235ce86210d7bc513ae0a4" dependencies = [ "quote", - "syn 2.0.79", + "syn", ] [[package]] name = "rattler_networking" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ada69629cc3ea204055f4d13604b32cb108fca456cc87d97d4280f041ac5708" +checksum = "89bc7a2698db24e4849a527528ec2ccb8c5c8c88c4e821e46c9124530b89c407" dependencies = [ "anyhow", "async-trait", @@ -4118,11 +4016,12 @@ dependencies = [ "fslock", "getrandom", "google-cloud-auth", - "http 1.1.0", + "google-cloud-token", + "http", "itertools 0.13.0", "keyring", "netrc-rs", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "retry-policies 0.4.0", "serde", @@ -4134,9 +4033,9 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.10" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac020482d1e8eac6aa1114bc87f2af426a8c719e56b7798afe331354a41d1e5e" +checksum = "b31f201486e1fb6baec82edc39ccb87c75f00750357535031e261b11a091e738" dependencies = [ "bzip2", "chrono", @@ -4146,7 +4045,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_redaction", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "serde_json", "tar", @@ -4162,20 +4061,20 @@ dependencies = [ [[package]] name = "rattler_redaction" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b3a430398cc4ecd0350204087377bc31d977dfd897d3b6930f195f39c515b" +checksum = "aa822f7a897914ff30e372814234047d556c98f3813fad616c93147b38dab7e7" dependencies = [ - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "url", ] [[package]] name = "rattler_repodata_gateway" -version = "0.21.18" +version = "0.21.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05726dde3ce7a7f46d67b9b41c6515af96219453043f0ba61359df40fbcff4db" +checksum = "f8193bd9d22c286dd30226fe49590d51e2f1391112480f513d9a037b3df54eee" dependencies = [ "anyhow", "async-compression", @@ -4188,10 +4087,10 @@ dependencies = [ "dashmap", "dirs", "file_url", - "fs-err", + "fs-err 3.0.0", "futures", "hex", - "http 1.1.0", + "http", "http-cache-semantics", "humansize", "humantime", @@ -4208,7 +4107,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_redaction", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "rmp-serde", "serde", @@ -4222,17 +4121,18 @@ dependencies = [ "tokio-util", "tracing", "url", - "windows-sys 0.52.0", + "windows-sys 0.59.0", "zstd", ] [[package]] name = "rattler_shell" -version = "0.22.4" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab12a632b2a9641c4935d160ac181564a66ca56767780bf6ffa9814161dd5" +checksum = "c7bbe53732a38f9f60f88e90dc2daed73d487e02693d7326e6562cf58a484377" dependencies = [ "enum_dispatch", + "fs-err 3.0.0", "indexmap 2.6.0", "itertools 0.13.0", "rattler_conda_types", @@ -4246,9 +4146,9 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.1.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726c21f9119981b47fab512da5d94ddd139617a45ed2863aa709958badc26510" +checksum = "84aaa6a08621e4850aabf242e67ce5ee68f12137c1a6e9f976c00d93c3c7891a" dependencies = [ "chrono", "futures", @@ -4265,9 +4165,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d62812b0b3050fb63ebb3368dd1b64eac3a4d6eb2509bae04d49200b036c5" +checksum = "a0b824df805e5b5fd581f93770fba032cf6d2f95a7e8249972a6fcf5f464f46a" dependencies = [ "archspec", "libloading", @@ -4356,7 +4256,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -4372,9 +4272,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4422,119 +4322,57 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "rend" -version = "0.4.2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215" dependencies = [ "bytecheck", ] -[[package]] -name = "requirements-txt" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" -dependencies = [ - "distribution-types", - "fs-err", - "pep508_rs", - "pypi-types", - "regex", - "thiserror", - "tracing", - "unscanny", - "url", - "uv-client", - "uv-configuration", - "uv-fs", - "uv-normalize", - "uv-warnings", -] - -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.31", - "hyper-rustls 0.24.2", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "async-compression", "base64 0.22.1", "bytes", + "encoding_rs", "futures-channel", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", - "http-body 1.0.1", + "h2", + "http", + "http-body", "http-body-util", - "hyper 1.5.0", - "hyper-rustls 0.27.3", - "hyper-tls 0.6.0", + "hyper", + "hyper-rustls", + "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.14", + "rustls", "rustls-native-certs", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", - "system-configuration 0.6.1", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.26.0", + "tokio-rustls", + "tokio-socks", "tokio-util", "tower-service", "url", @@ -4542,19 +4380,19 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.5", - "windows-registry", + "webpki-roots", + "windows-registry 0.2.0", ] [[package]] name = "reqwest-middleware" version = "0.3.3" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121" dependencies = [ "anyhow", "async-trait", - "http 1.1.0", - "reqwest 0.12.8", + "http", + "reqwest", "serde", "thiserror", "tower-service", @@ -4571,10 +4409,10 @@ dependencies = [ "chrono", "futures", "getrandom", - "http 1.1.0", - "hyper 1.5.0", + "http", + "hyper", "parking_lot 0.11.2", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "retry-policies 0.3.0", "tokio", @@ -4585,16 +4423,16 @@ dependencies = [ [[package]] name = "reqwest-retry" version = "0.7.1" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121" dependencies = [ "anyhow", "async-trait", "futures", "getrandom", - "http 1.1.0", - "hyper 1.5.0", + "http", + "hyper", "parking_lot 0.11.2", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "retry-policies 0.4.0", "thiserror", @@ -4605,11 +4443,11 @@ dependencies = [ [[package]] name = "resolvo" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1621ce52e3ff36c8f55f0017f1e4909f59514af8f852ee943997760bf12c7c15" +checksum = "03fdd3aa47ae0816ce4ec203eba1330e7c96a6760cbfbee5f1d2ca6e768b50f7" dependencies = [ - "ahash 0.8.11", + "ahash", "bitvec", "elsa", "event-listener", @@ -4657,31 +4495,32 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "395027076c569819ea6035ee62e664f5e03d74e281744f55261dd1afd939212b" dependencies = [ - "bitvec", "bytecheck", "bytes", - "hashbrown 0.12.3", + "hashbrown 0.14.5", + "indexmap 2.6.0", + "munge", "ptr_meta", + "rancor", "rend", "rkyv_derive", - "seahash", "tinyvec", "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "09cb82b74b4810f07e460852c32f522e979787691b0b7b7439fe473e49d49b2f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -4740,16 +4579,17 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.79", + "syn", "unicode-ident", ] [[package]] name = "rust-netrc" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32662f97cbfdbad9d5f78f1338116f06871e7dae4fd37e9f59a0f57cf2044868" +checksum = "7e98097f62769f92dbf95fb51f71c0a68ec18a4ee2e70e0d3e4f47ac005d63e9" dependencies = [ + "shellexpand", "thiserror", ] @@ -4787,18 +4627,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.23.14" @@ -4808,7 +4636,7 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "subtle", "zeroize", ] @@ -4820,19 +4648,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "rustls-pki-types", "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", + "security-framework 2.11.1", ] [[package]] @@ -4850,16 +4669,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.102.8" @@ -4923,7 +4732,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.79", + "syn", ] [[package]] @@ -4949,17 +4758,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", + "syn", ] [[package]] @@ -4994,7 +4793,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -5002,9 +4814,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -5029,9 +4841,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] @@ -5047,15 +4859,25 @@ dependencies = [ "typeid", ] +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -5066,7 +4888,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -5080,9 +4902,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap 2.6.0", "itoa", @@ -5099,7 +4921,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -5150,7 +4972,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -5220,6 +5042,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "bstr", + "dirs", + "os_str_bytes", +] + [[package]] name = "shlex" version = "1.3.0" @@ -5253,9 +5086,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simd-json" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5500f67df6466a45c6f83d1aada89fe0f7e9b17afec424ea06feee0906549" +checksum = "b1df0290e9bfe79ddd5ff8798ca887cd107b75353d2957efe9777296e17f26b5" dependencies = [ "getrandom", "halfbrown", @@ -5419,7 +5252,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn", ] [[package]] @@ -5457,32 +5290,15 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn" -version = "2.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.1" @@ -5518,28 +5334,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", "rayon", - "windows 0.52.0", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys 0.5.0", + "windows 0.57.0", ] [[package]] @@ -5549,18 +5353,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.6.0", - "core-foundation", - "system-configuration-sys 0.6.0", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", + "core-foundation 0.9.4", + "system-configuration-sys", ] [[package]] @@ -5579,7 +5373,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a327282c4f64f6dc37e3bba4c2b6842cc3a992f204fa58d917696a89f691e5f6" dependencies = [ - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -5646,27 +5440,27 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -5732,9 +5526,9 @@ source = "git+https://github.com/charliermarsh/tl.git?rev=6e25b2ee2513d75385101a [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -5756,7 +5550,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -5771,22 +5565,24 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.21.12", + "rustls", + "rustls-pki-types", "tokio", ] [[package]] -name = "tokio-rustls" -version = "0.26.0" +name = "tokio-socks" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" dependencies = [ - "rustls 0.23.14", - "rustls-pki-types", + "either", + "futures-util", + "thiserror", "tokio", ] @@ -5802,21 +5598,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tar" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" -dependencies = [ - "filetime", - "futures-core", - "libc", - "redox_syscall 0.3.5", - "tokio", - "tokio-stream", - "xattr", -] - [[package]] name = "tokio-util" version = "0.7.12" @@ -5890,7 +5671,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -6009,6 +5790,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -6029,9 +5816,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -6070,15 +5857,14 @@ dependencies = [ [[package]] name = "uv-auth" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", "async-trait", "base64 0.22.1", "futures", - "http 1.1.0", - "once-map", - "reqwest 0.12.8", + "http", + "reqwest", "reqwest-middleware", "rust-netrc", "rustc-hash", @@ -6086,21 +5872,21 @@ dependencies = [ "tracing", "url", "urlencoding", + "uv-once-map", + "uv-static", ] [[package]] -name = "uv-build" +name = "uv-build-frontend" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ + "anstream", "anyhow", - "distribution-types", - "fs-err", + "fs-err 2.11.0", "indoc", "itertools 0.13.0", - "pep440_rs", - "pep508_rs", - "pypi-types", + "owo-colors", "regex", "rustc-hash", "serde", @@ -6108,11 +5894,17 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml", + "toml_edit", "tracing", "uv-configuration", + "uv-distribution", + "uv-distribution-types", "uv-fs", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", + "uv-static", "uv-types", "uv-virtualenv", ] @@ -6120,50 +5912,67 @@ dependencies = [ [[package]] name = "uv-cache" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ - "cache-key", - "directories", - "distribution-types", - "etcetera", - "fs-err", + "fs-err 2.11.0", "nanoid", - "pypi-types", "rmp-serde", "rustc-hash", "serde", "tempfile", "tracing", "url", + "uv-cache-info", + "uv-cache-key", + "uv-dirs", + "uv-distribution-types", "uv-fs", "uv-normalize", + "uv-pypi-types", + "uv-static", "walkdir", ] +[[package]] +name = "uv-cache-info" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "fs-err 2.11.0", + "globwalk", + "serde", + "thiserror", + "toml", + "tracing", +] + +[[package]] +name = "uv-cache-key" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "hex", + "seahash", + "url", +] + [[package]] name = "uv-client" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", "async-trait", "async_http_range_reader", "async_zip", - "cache-key", - "distribution-filename", - "distribution-types", - "fs-err", + "bytecheck", + "fs-err 2.11.0", "futures", "html-escape", - "http 1.1.0", - "install-wheel-rs", + "http", "itertools 0.13.0", "jiff", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "reqwest-retry 0.7.1", "rkyv", @@ -6180,9 +5989,18 @@ dependencies = [ "urlencoding", "uv-auth", "uv-cache", + "uv-cache-key", "uv-configuration", + "uv-distribution-filename", + "uv-distribution-types", "uv-fs", + "uv-metadata", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", + "uv-static", "uv-version", "uv-warnings", ] @@ -6190,44 +6008,69 @@ dependencies = [ [[package]] name = "uv-configuration" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ - "distribution-types", "either", - "pep508_rs", - "platform-tags", - "pypi-types", + "fs-err 2.11.0", "rustc-hash", "serde", + "serde-untagged", "serde_json", "thiserror", "tracing", "url", "uv-auth", "uv-cache", + "uv-cache-info", + "uv-cache-key", "uv-normalize", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", + "uv-static", + "which", +] + +[[package]] +name = "uv-console" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "console", + "ctrlc", +] + +[[package]] +name = "uv-dirs" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "directories", + "dirs-sys", + "etcetera", + "uv-static", ] [[package]] name = "uv-dispatch" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", - "distribution-types", "futures", - "install-wheel-rs", "itertools 0.13.0", - "pypi-types", "rustc-hash", "tracing", - "uv-build", + "uv-build-frontend", "uv-cache", "uv-client", "uv-configuration", "uv-distribution", + "uv-distribution-types", "uv-git", + "uv-install-wheel", "uv-installer", + "uv-pypi-types", "uv-python", "uv-resolver", "uv-types", @@ -6236,20 +6079,15 @@ dependencies = [ [[package]] name = "uv-distribution" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", - "distribution-filename", - "distribution-types", - "fs-err", + "either", + "fs-err 2.11.0", "futures", - "install-wheel-rs", "nanoid", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", - "reqwest 0.12.8", + "owo-colors", + "reqwest", "reqwest-middleware", "rmp-serde", "rustc-hash", @@ -6261,39 +6099,94 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", + "uv-cache-key", "uv-client", "uv-configuration", + "uv-distribution-filename", + "uv-distribution-types", "uv-extract", "uv-fs", "uv-git", + "uv-metadata", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-types", "uv-warnings", "uv-workspace", + "walkdir", "zip 0.6.6", ] +[[package]] +name = "uv-distribution-filename" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "rkyv", + "serde", + "thiserror", + "url", + "uv-normalize", + "uv-pep440", + "uv-platform-tags", +] + +[[package]] +name = "uv-distribution-types" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "anyhow", + "bitflags 2.6.0", + "fs-err 2.11.0", + "itertools 0.13.0", + "jiff", + "rkyv", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "urlencoding", + "uv-auth", + "uv-cache-info", + "uv-cache-key", + "uv-distribution-filename", + "uv-fs", + "uv-git", + "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", +] + [[package]] name = "uv-extract" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "async-compression", "async_zip", - "distribution-filename", - "fs-err", + "fs-err 2.11.0", "futures", + "krata-tokio-tar", "md-5", - "pypi-types", "rayon", - "reqwest 0.12.8", + "reqwest", "rustc-hash", "sha2", "thiserror", "tokio", - "tokio-tar", "tokio-util", "tracing", + "uv-distribution-filename", + "uv-pypi-types", "xz2", "zip 0.6.6", ] @@ -6301,35 +6194,37 @@ dependencies = [ [[package]] name = "uv-fs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "backoff", "cachedir", "dunce", "either", "encoding_rs_io", - "fs-err", + "fs-err 2.11.0", "fs2", "junction", "path-slash", + "rustix", + "schemars", "serde", "tempfile", + "tokio", "tracing", "urlencoding", - "uv-warnings", + "winsafe 0.0.22", ] [[package]] name = "uv-git" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", - "cache-key", "cargo-util", "dashmap", - "fs-err", - "reqwest 0.12.8", + "fs-err 2.11.0", + "reqwest", "reqwest-middleware", "serde", "thiserror", @@ -6337,26 +6232,55 @@ dependencies = [ "tracing", "url", "uv-auth", + "uv-cache-key", "uv-fs", + "uv-static", + "which", +] + +[[package]] +name = "uv-install-wheel" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "configparser", + "csv", + "data-encoding", + "fs-err 2.11.0", + "mailparse", + "pathdiff", + "platform-info", + "reflink-copy", + "regex", + "rustc-hash", + "serde", + "serde_json", + "sha2", + "tempfile", + "thiserror", + "tracing", + "uv-cache-info", + "uv-distribution-filename", + "uv-fs", + "uv-normalize", + "uv-pep440", + "uv-platform-tags", + "uv-pypi-types", + "uv-trampoline-builder", + "uv-warnings", + "walkdir", + "zip 0.6.6", ] [[package]] name = "uv-installer" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", "async-channel", - "cache-key", - "distribution-filename", - "distribution-types", - "fs-err", + "fs-err 2.11.0", "futures", - "install-wheel-rs", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", "rayon", "rustc-hash", "same-file", @@ -6366,13 +6290,21 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", + "uv-cache-key", "uv-configuration", "uv-distribution", + "uv-distribution-types", "uv-extract", "uv-fs", - "uv-git", + "uv-install-wheel", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-python", + "uv-static", "uv-types", "uv-warnings", "walkdir", @@ -6381,66 +6313,146 @@ dependencies = [ [[package]] name = "uv-macros" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", "textwrap", ] +[[package]] +name = "uv-metadata" +version = "0.1.0" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "async_zip", + "fs-err 2.11.0", + "futures", + "thiserror", + "tokio", + "tokio-util", + "uv-distribution-filename", + "uv-normalize", + "uv-pypi-types", + "zip 0.6.6", +] + [[package]] name = "uv-normalize" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "rkyv", "serde", ] +[[package]] +name = "uv-once-map" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "dashmap", + "futures", + "tokio", +] + [[package]] name = "uv-options-metadata" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "serde", +] + +[[package]] +name = "uv-pep440" +version = "0.7.0" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "rkyv", + "serde", + "tracing", + "unicode-width 0.1.14", + "unscanny", + "version-ranges 0.1.0 (git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79)", +] + +[[package]] +name = "uv-pep508" +version = "0.6.0" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "boxcar", + "indexmap 2.6.0", + "itertools 0.13.0", + "regex", + "rustc-hash", + "schemars", + "serde", + "smallvec", + "thiserror", + "unicode-width 0.1.14", + "url", + "uv-fs", + "uv-normalize", + "uv-pep440", + "version-ranges 0.1.0 (git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79)", +] + +[[package]] +name = "uv-platform-tags" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ + "rustc-hash", "serde", + "thiserror", ] [[package]] -name = "uv-pubgrub" +name = "uv-pypi-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ + "indexmap 2.6.0", "itertools 0.13.0", - "pep440_rs", - "pubgrub", + "jiff", + "mailparse", + "regex", + "rkyv", + "serde", + "serde-untagged", "thiserror", + "toml", + "toml_edit", + "tracing", + "url", + "uv-distribution-filename", + "uv-fs", + "uv-git", + "uv-normalize", + "uv-pep440", + "uv-pep508", ] [[package]] name = "uv-python" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", - "cache-key", "configparser", - "distribution-filename", - "fs-err", + "fs-err 2.11.0", "futures", "goblin", - "install-wheel-rs", "itertools 0.13.0", "owo-colors", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", + "procfs", "regex", - "reqwest 0.12.8", + "reqwest", "reqwest-middleware", "rmp-serde", - "rustix", "same-file", "serde", "serde_json", @@ -6452,42 +6464,102 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", + "uv-cache-key", "uv-client", + "uv-dirs", + "uv-distribution-filename", "uv-extract", "uv-fs", + "uv-install-wheel", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-state", + "uv-static", + "uv-trampoline-builder", "uv-warnings", "which", + "windows-registry 0.3.0", + "windows-result 0.2.0", "windows-sys 0.59.0", - "winsafe 0.0.22", +] + +[[package]] +name = "uv-requirements" +version = "0.1.0" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "anyhow", + "configparser", + "console", + "fs-err 2.11.0", + "futures", + "rustc-hash", + "serde", + "thiserror", + "toml", + "tracing", + "url", + "uv-cache-key", + "uv-client", + "uv-configuration", + "uv-console", + "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", + "uv-fs", + "uv-git", + "uv-normalize", + "uv-pep508", + "uv-pypi-types", + "uv-requirements-txt", + "uv-resolver", + "uv-types", + "uv-warnings", + "uv-workspace", +] + +[[package]] +name = "uv-requirements-txt" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "fs-err 2.11.0", + "regex", + "reqwest", + "reqwest-middleware", + "thiserror", + "tracing", + "unscanny", + "url", + "uv-client", + "uv-configuration", + "uv-distribution-types", + "uv-fs", + "uv-normalize", + "uv-pep508", + "uv-pypi-types", + "uv-warnings", ] [[package]] name = "uv-resolver" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", - "cache-key", + "clap", "dashmap", - "derivative", - "distribution-filename", - "distribution-types", "either", "futures", "indexmap 2.6.0", - "install-wheel-rs", "itertools 0.13.0", "jiff", - "once-map", "owo-colors", - "pep440_rs", - "pep508_rs", "petgraph", - "platform-tags", "pubgrub", - "pypi-types", - "requirements-txt", "rkyv", "rustc-hash", "same-file", @@ -6500,14 +6572,24 @@ dependencies = [ "toml_edit", "tracing", "url", + "uv-cache-key", "uv-client", "uv-configuration", "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", "uv-fs", "uv-git", + "uv-metadata", "uv-normalize", - "uv-pubgrub", + "uv-once-map", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-python", + "uv-requirements-txt", + "uv-static", "uv-types", "uv-warnings", "uv-workspace", @@ -6516,53 +6598,71 @@ dependencies = [ [[package]] name = "uv-state" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ - "directories", - "etcetera", - "fs-err", + "fs-err 2.11.0", "tempfile", + "uv-dirs", +] + +[[package]] +name = "uv-static" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "uv-macros", +] + +[[package]] +name = "uv-trampoline-builder" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" +dependencies = [ + "fs-err 2.11.0", + "thiserror", + "uv-fs", + "zip 0.6.6", ] [[package]] name = "uv-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anyhow", - "distribution-types", - "once-map", - "pep440_rs", - "pep508_rs", - "pypi-types", "rustc-hash", "thiserror", "url", "uv-cache", "uv-configuration", + "uv-distribution-types", "uv-git", "uv-normalize", + "uv-once-map", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", ] [[package]] name = "uv-version" -version = "0.4.0" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +version = "0.4.30" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" [[package]] name = "uv-virtualenv" version = "0.0.4" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ - "fs-err", + "fs-err 2.11.0", "itertools 0.13.0", "pathdiff", - "platform-tags", - "pypi-types", "thiserror", "tracing", "uv-fs", + "uv-platform-tags", + "uv-pypi-types", "uv-python", "uv-version", ] @@ -6570,7 +6670,7 @@ dependencies = [ [[package]] name = "uv-warnings" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ "anstream", "owo-colors", @@ -6580,15 +6680,14 @@ dependencies = [ [[package]] name = "uv-workspace" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +source = "git+https://github.com/astral-sh/uv?tag=0.4.30#61ed2a236ade13703fd6cd3271e2c4d627398f38" dependencies = [ - "either", - "fs-err", + "fs-err 2.11.0", "glob", - "pep440_rs", - "pep508_rs", - "pypi-types", + "itertools 0.13.0", + "owo-colors", "rustc-hash", + "same-file", "serde", "thiserror", "tokio", @@ -6596,11 +6695,17 @@ dependencies = [ "toml_edit", "tracing", "url", + "uv-cache-key", + "uv-distribution-types", "uv-fs", "uv-git", "uv-macros", "uv-normalize", "uv-options-metadata", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", + "uv-static", "uv-warnings", ] @@ -6628,6 +6733,14 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version-ranges" +version = "0.1.0" +source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79" +dependencies = [ + "smallvec", +] + [[package]] name = "version_check" version = "0.9.5" @@ -6680,7 +6793,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn", "wasm-bindgen-shared", ] @@ -6714,7 +6827,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6763,12 +6876,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.5" @@ -6780,9 +6887,9 @@ dependencies = [ [[package]] name = "which" -version = "6.0.2" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" +checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b" dependencies = [ "either", "home", @@ -6824,11 +6931,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core 0.52.0", + "windows-core 0.57.0", "windows-targets 0.52.6", ] @@ -6851,19 +6958,42 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-implement" version = "0.58.0" @@ -6872,7 +7002,18 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -6883,7 +7024,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -6892,8 +7033,28 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ - "windows-result", - "windows-strings", + "windows-result 0.2.0", + "windows-strings 0.1.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a" +dependencies = [ + "windows-result 0.2.0", + "windows-strings 0.2.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ "windows-targets 0.52.6", ] @@ -6912,7 +7073,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-result", + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663" +dependencies = [ "windows-targets 0.52.6", ] @@ -7073,16 +7243,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "winsafe" version = "0.0.19" @@ -7193,7 +7353,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.79", + "syn", "zvariant_utils", ] @@ -7226,7 +7386,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] [[package]] @@ -7329,7 +7489,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.79", + "syn", "zvariant_utils", ] @@ -7341,5 +7501,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn", ] diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index b82ae5bb76ab9..951f571b80b78 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -1,35 +1,40 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, openssl -, installShellFiles -, darwin -, testers -, pixi +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + openssl, + installShellFiles, + testers, + pixi, }: rustPlatform.buildRustPackage rec { pname = "pixi"; - version = "0.34.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; rev = "v${version}"; - hash = "sha256-pXJna0WuosQ21u+ImIc70OaG63xVODLaWFkuYqxUc/Y="; + hash = "sha256-F15GDw6zolaa4IheKyJ9kdmdiLazUiDUhnUM8gH/hgk="; }; + postPatch = '' + # There are multiple `version-ranges` entries which is not supported by buildRustPackage. + cp -f ${./Cargo.lock} Cargo.lock + ''; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss="; - "cache-key-0.0.1" = "sha256-JEGcX4dT/cVLb07n2Y0nai17jW0tXpV18qaYVnoEpew="; - "pubgrub-0.2.1" = "sha256-pU+F6hwqy+r6tz5OBoB6gU0+vdH6F3ikUaPrcvYRX2c="; - "reqwest-middleware-0.3.3" = "sha256-csQN7jZTifliSTsOm6YrjPVgsXBOfelY7LkHD1HkNGQ="; + "pubgrub-0.2.1" = "sha256-8TrOQ6fYJrYgFNuqiqnGztnHOqFIEDi2MFZEBA+oks4="; + "reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM="; "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ="; + "uv-auth-0.0.1" = "sha256-xy/fgy3+YvSdfq5ngPVbAmRpYyJH27Cft5QxBwFQumU="; }; }; @@ -41,9 +46,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ] - ); + ]; env = { LIBGIT2_NO_VENDOR = 1; @@ -64,11 +67,14 @@ rustPlatform.buildRustPackage rec { package = pixi; }; - meta = with lib; { + meta = { description = "Package management made easy"; homepage = "https://pixi.sh/"; - license = licenses.bsd3; - maintainers = with maintainers; [ aaronjheng edmundmiller ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + aaronjheng + edmundmiller + ]; mainProgram = "pixi"; }; } diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index 2d28b20475142..eeeb1cdf6c200 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -60,12 +60,12 @@ let ]; in stdenv.mkDerivation (finalAttrs: { - version = "6.3.0"; + version = "6.3.1"; pname = "staruml"; src = fetchurl { url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-G63MxjefAJ0J40HzrI9j/sRkHLIdUzBf0GSbw6fAFoI="; + sha256 = "sha256-HJCQZr3vphxLeuHVkq6fSZai8PfJKyhuaooFeOUGxSI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix index 25010cc0cc677..c2529025ff8d6 100644 --- a/pkgs/by-name/zt/ztags/package.nix +++ b/pkgs/by-name/zt/ztags/package.nix @@ -1,36 +1,43 @@ -{ lib -, stdenv -, fetchFromGitHub -, scdoc -, zig_0_11 +{ + lib, + stdenv, + fetchFromGitHub, + scdoc, + zig_0_13, + apple-sdk_11, }: -stdenv.mkDerivation { +let + zig = zig_0_13; +in +stdenv.mkDerivation (finalAttrs: { pname = "ztags"; - version = "unstable-2023-09-07"; + version = "1.0.1"; src = fetchFromGitHub { owner = "gpanders"; repo = "ztags"; - rev = "6cdbd6dcdeda0d1ab9ad30261000e3d21b2407e6"; - hash = "sha256-lff5L7MG8RJdJM/YebJKDkKfkG4oumC0HytiCUOUG5Q="; + rev = "v${finalAttrs.version}"; + hash = "sha256-XDwHuQ+UwScolxyxCHJUmxxG+OgKvZmNGQEZlfywV2s="; }; nativeBuildInputs = [ scdoc - zig_0_11.hook + zig.hook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; + postInstall = '' zig build docs --prefix $out ''; - meta = with lib; { + meta = { description = "Generate tags files for Zig projects"; homepage = "https://github.com/gpanders/ztags"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "ztags"; - inherit (zig_0_11.meta) platforms; + inherit (zig.meta) platforms; }; -} +}) diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index a9bed1b2a12fb..77489597a8769 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -97,8 +97,8 @@ in serif = makeSuperOTC { family = "serif"; description = "serif"; - rev = "2.001R"; - hash = "sha256-ULdrtPLtzsgfZEHWkr4ebC/FSROHBWJJVD+PzdIJ6Og="; + rev = "2.003R"; + hash = "sha256-buaJq1eJSuNa9gSnPpXDcr2gMGYQ/6F5pHCOjNR6eV8="; zip = ".zip"; prefix = "01_"; }; @@ -126,15 +126,15 @@ in serif-vf-otf = makeVariable { family = "serif"; - version = "2.002"; - hash = "sha256-8sD4bU6w7HBm4vBuPAjcjpxN2rtEJugAw+X0bAOcmjA="; + version = "2.003"; + hash = "sha256-a6295Ukha9QY5ByMr2FUy13j5gZ1itnezvfJWmJjqt0="; format = "otf"; }; serif-vf-ttf = makeVariable { family = "serif"; - version = "2.002"; - hash = "sha256-dmTZFRsD55WCOg2+sqd8bkmTSnSNn5xUYf0PgzIvzww="; + version = "2.003"; + hash = "sha256-F+FUQunfyAEBVV10lZxC3dzGTWhHgHzpTO8CjC3n4WY="; format = "ttf"; }; } diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index ddb25c8db88b8..9a2cd72879c2c 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -3,11 +3,10 @@ lib, php, fetchFromGitHub, - fetchpatch, }: let - version = "6.0.2"; + version = "6.1.0"; in buildPecl { inherit version; @@ -17,29 +16,9 @@ buildPecl { repo = "phpredis"; owner = "phpredis"; rev = version; - hash = "sha256-Ie31zak6Rqxm2+jGXWg6KN4czHe9e+190jZRQ5VoB+M="; + hash = "sha256-zuvdWBJl6vBDnIAR0txfar1+c06VqGnwtobZnxok2uU="; }; - patches = [ - # Fix build with PHP 8.4. - (fetchpatch { - url = "https://github.com/phpredis/phpredis/commit/a51215ce2b22bcd1f506780c35b6833471e0b8cb.patch"; - hash = "sha256-DoGPMyuI/IZdF+8jG5faoyG2aM+WDz0obH6S7HoOMX8="; - }) - - # Fix warning on Darwin. - (fetchpatch { - url = "https://github.com/phpredis/phpredis/commit/7de29d57d919f835f902f87a83312ed2549c1a13.patch"; - hash = "sha256-INsSQTwcHQhQiqplAYQGS4zAtaIHWABG61MxnPCsrUM="; - }) - - # Fix build on Darwin. - (fetchpatch { - url = "https://github.com/phpredis/phpredis/commit/c139de3abac1dd33b97ef0de5af41b6e3a78f7ab.patch"; - hash = "sha256-jM9N4ktGU5KAk81sZZJQmzV7y//39nVnfc52KqIvfpU="; - }) - ]; - internalDeps = with php.extensions; [ session ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix index 6c99394c31a39..c9a2212a0715b 100644 --- a/pkgs/development/python-modules/pyaprilaire/default.nix +++ b/pkgs/development/python-modules/pyaprilaire/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyaprilaire"; - version = "0.7.4"; + version = "0.7.6"; pyproject = true; src = fetchFromGitHub { owner = "chamberlain2007"; repo = "pyaprilaire"; - rev = "refs/tags/${version}"; - hash = "sha256-+/yQO0JF2nkxaM71iNj6ODB8raM9s4qiLLi6/borcr4="; + tag = version; + hash = "sha256-7jTV0F7g6IMsBUYk1GMakyvQ66k7glOUNWv6tdKjdnQ="; }; build-system = [ setuptools ];