From d189ed6bfaa898f43573c56423107f988045fe14 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 25 Aug 2024 02:39:35 +0000 Subject: [PATCH] pixi: 0.27.1 -> 0.29.0 --- pkgs/by-name/pi/pixi/Cargo.lock | 1087 ++++++++++++++++-------------- pkgs/by-name/pi/pixi/package.nix | 17 +- 2 files changed, 589 insertions(+), 515 deletions(-) diff --git a/pkgs/by-name/pi/pixi/Cargo.lock b/pkgs/by-name/pi/pixi/Cargo.lock index 02f364b680c041b..30f38588a7d48b0 100644 --- a/pkgs/by-name/pi/pixi/Cargo.lock +++ b/pkgs/by-name/pi/pixi/Cargo.lock @@ -67,21 +67,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "allocator-api2" version = "0.2.18" @@ -189,12 +174,14 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] @@ -215,7 +202,6 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ - "brotli", "bzip2", "flate2", "futures-core", @@ -223,6 +209,7 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", + "xz2", "zstd", "zstd-safe", ] @@ -236,40 +223,34 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.1.0", - "futures-lite 2.3.0", + "futures-lite", "slab", ] [[package]] -name = "async-fs" -version = "1.6.0" +name = "async-fd-lock" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "7569377d7062165f6f7834d9cb3051974a2d141433cc201c2f94c149e993cccf" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", + "async-trait", + "cfg-if", + "pin-project", + "rustix", + "thiserror", + "tokio", + "windows-sys 0.52.0", ] [[package]] -name = "async-io" -version = "1.13.0" +name = "async-fs" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", + "async-lock", + "blocking", + "futures-lite", ] [[package]] @@ -278,35 +259,26 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.4.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", ] -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - [[package]] name = "async-lock" version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] @@ -319,19 +291,22 @@ checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", ] [[package]] @@ -351,13 +326,13 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ - "async-io 2.3.3", - "async-lock 3.4.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix", "signal-hook-registry", "slab", "windows-sys 0.52.0", @@ -371,9 +346,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", @@ -403,11 +378,11 @@ dependencies = [ [[package]] name = "async_zip" version = "0.0.17" -source = "git+https://github.com/charliermarsh/rs-async-zip?rev=1dcb40cfe1bf5325a6fd4bfcf9894db40241f585#1dcb40cfe1bf5325a6fd4bfcf9894db40241f585" +source = "git+https://github.com/charliermarsh/rs-async-zip?rev=011b24604fa7bc223daaad7712c0694bac8f0a87#011b24604fa7bc223daaad7712c0694bac8f0a87" dependencies = [ "async-compression", "crc32fast", - "futures-lite 2.3.0", + "futures-lite", "pin-project", "thiserror", "tokio", @@ -559,30 +534,15 @@ dependencies = [ "async-channel", "async-task", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "piper", ] [[package]] -name = "brotli" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "4.0.1" +name = "boxcar" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] +checksum = "510a90332002c1af3317ef6b712f0dab697f30bbe809b86965eac2923c0bca8e" [[package]] name = "bstr" @@ -685,7 +645,7 @@ dependencies = [ [[package]] name = "cache-key" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "hex", "seahash", @@ -1034,19 +994,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core 0.9.10", -] - [[package]] name = "dashmap" version = "6.0.1" @@ -1067,6 +1014,35 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-secret-service" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1caa0c241c01ad8d99a78d553567d38f873dd3ac16eca33a5370d650ab25584e" +dependencies = [ + "aes", + "block-padding", + "cbc", + "dbus", + "futures-util", + "hkdf", + "num", + "once_cell", + "rand", + "sha2", +] + [[package]] name = "deno_task_shell" version = "0.16.1" @@ -1184,7 +1160,7 @@ dependencies = [ [[package]] name = "distribution-filename" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "pep440_rs", "platform-tags", @@ -1198,14 +1174,14 @@ dependencies = [ [[package]] name = "distribution-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +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", - "once_cell", + "jiff", "pep440_rs", "pep508_rs", "platform-tags", @@ -1228,6 +1204,12 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "either" version = "1.13.0" @@ -1267,6 +1249,12 @@ dependencies = [ "encoding_rs", ] +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + [[package]] name = "enum-as-inner" version = "0.6.0" @@ -1339,20 +1327,14 @@ dependencies = [ ] [[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" +name = "etcetera" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", + "cfg-if", + "home", + "windows-sys 0.48.0", ] [[package]] @@ -1372,7 +1354,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.1", + "event-listener", "pin-project-lite", ] @@ -1405,15 +1387,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if", - "rustix 0.38.34", + "rustix", "windows-sys 0.52.0", ] [[package]] name = "file_url" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d1df57145d7cda57c95c44a2d64c24f579e2d50b8f4f7a779287293ad3adc0" +checksum = "5c4602b5420b868957e88e55b927d67e273c764ce9fb6def7369248862928230" dependencies = [ "itertools 0.13.0", "percent-encoding", @@ -1518,6 +1500,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "fs4" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de" +dependencies = [ + "fs-err", + "rustix", + "windows-sys 0.52.0", +] + [[package]] name = "fs_extra" version = "1.3.0" @@ -1588,21 +1581,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-lite" version = "2.3.0" @@ -1721,6 +1699,17 @@ dependencies = [ "regex-syntax 0.8.4", ] +[[package]] +name = "goblin" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47" +dependencies = [ + "log", + "plain", + "scroll", +] + [[package]] name = "google-cloud-auth" version = "0.13.2" @@ -2067,7 +2056,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower-service", "tracing", @@ -2169,7 +2158,7 @@ dependencies = [ "http-body 1.0.1", "hyper 1.4.1", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", "tower", "tower-service", @@ -2301,7 +2290,7 @@ dependencies = [ [[package]] name = "install-wheel-rs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "configparser", "csv", @@ -2309,7 +2298,6 @@ dependencies = [ "distribution-filename", "fs-err", "mailparse", - "once_cell", "pathdiff", "pep440_rs", "platform-info", @@ -2317,7 +2305,7 @@ dependencies = [ "pypi-types", "reflink-copy", "regex", - "rustc-hash 2.0.0", + "rustc-hash", "serde", "serde_json", "sha2", @@ -2326,6 +2314,7 @@ dependencies = [ "tracing", "uv-fs", "uv-normalize", + "uv-warnings", "walkdir", "zip 0.6.6", ] @@ -2342,17 +2331,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -2404,6 +2382,32 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jiff" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2b7379a75544c94b3da32821b0bf41f9062e9970e23b78cc577d0d89676d16" +dependencies = [ + "jiff-tzdb-platform", + "serde", + "windows-sys 0.59.0", +] + +[[package]] +name = "jiff-tzdb" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6" + +[[package]] +name = "jiff-tzdb-platform" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940" +dependencies = [ + "jiff-tzdb", +] + [[package]] name = "jobserver" version = "0.1.32" @@ -2472,16 +2476,16 @@ dependencies = [ [[package]] name = "keyring" -version = "2.3.3" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363387f0019d714aa60cc30ab4fe501a747f4c08fc58f069dd14be971bd495a0" +checksum = "73b9af47ded4df3067484d7d45758ca2b36bd083bf6d024c2952bbd8af1cdaa4" dependencies = [ "byteorder", - "lazy_static", - "linux-keyutils", + "dbus-secret-service", "secret-service", "security-framework", - "windows-sys 0.52.0", + "windows-sys 0.59.0", + "zbus", ] [[package]] @@ -2583,6 +2587,15 @@ version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + [[package]] name = "libloading" version = "0.8.5" @@ -2615,22 +2628,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-keyutils" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -2659,6 +2656,17 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "mailparse" version = "0.15.0" @@ -2713,15 +2721,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -2874,18 +2873,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2970fbbc8c785e8246234a7bd004ed66cd1ed1a35ec73669a92545e419b836" -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - [[package]] name = "nix" version = "0.29.0" @@ -2896,6 +2883,7 @@ dependencies = [ "cfg-if", "cfg_aliases", "libc", + "memoffset", ] [[package]] @@ -3034,9 +3022,9 @@ dependencies = [ [[package]] name = "once-map" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ - "dashmap 5.5.3", + "dashmap", "futures", "tokio", ] @@ -3214,15 +3202,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "path-absolutize" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" -dependencies = [ - "path-dedot", -] - [[package]] name = "path-dedot" version = "3.1.1" @@ -3257,9 +3236,8 @@ dependencies = [ [[package]] name = "pep440_rs" version = "0.6.0" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ - "once_cell", "rkyv", "serde", "unicode-width", @@ -3269,18 +3247,24 @@ dependencies = [ [[package]] name = "pep508_rs" version = "0.6.0" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ - "derivative", - "once_cell", + "boxcar", + "indexmap 2.3.0", + "itertools 0.13.0", "pep440_rs", + "pubgrub", "regex", + "rustc-hash", + "schemars", "serde", + "smallvec", "thiserror", "unicode-width", "url", "uv-fs", "uv-normalize", + "uv-pubgrub", ] [[package]] @@ -3388,11 +3372,12 @@ dependencies = [ [[package]] name = "pixi" -version = "0.27.1" +version = "0.29.0" dependencies = [ "ahash 0.8.11", "assert_matches", "async-once-cell", + "async-trait", "barrier_cell", "cfg-if", "chrono", @@ -3414,6 +3399,7 @@ dependencies = [ "flate2", "fs_extra", "futures", + "http 1.1.0", "http-cache-reqwest", "human_bytes", "humantime", @@ -3428,7 +3414,7 @@ dependencies = [ "libc", "miette 7.2.0", "minijinja", - "nix 0.29.0", + "nix", "once_cell", "parking_lot 0.12.3", "pep440_rs", @@ -3459,7 +3445,8 @@ dependencies = [ "regex", "reqwest 0.12.5", "reqwest-middleware", - "reqwest-retry", + "reqwest-retry 0.5.0", + "rlimit", "rstest", "self-replace", "serde", @@ -3467,7 +3454,6 @@ dependencies = [ "serde_json", "serde_with", "serde_yaml", - "serial_test", "shlex", "signal-hook", "strsim", @@ -3490,12 +3476,11 @@ dependencies = [ "uv-git", "uv-installer", "uv-normalize", + "uv-python", "uv-resolver", - "uv-toolchain", "uv-types", - "winapi", "xxhash-rust", - "zip 0.6.6", + "zip 2.2.0", ] [[package]] @@ -3512,6 +3497,7 @@ dependencies = [ "rattler", "rattler_conda_types", "rattler_repodata_gateway", + "reqwest-middleware", "rstest", "serde", "serde_ignored", @@ -3527,6 +3513,7 @@ version = "0.1.0" dependencies = [ "console", "lazy_static", + "rattler_cache", "url", ] @@ -3545,6 +3532,7 @@ dependencies = [ "console", "dunce", "fancy_display", + "glob", "indexmap 2.3.0", "insta", "itertools 0.13.0", @@ -3580,7 +3568,6 @@ version = "0.1.0" dependencies = [ "console", "indicatif", - "once_cell", "tokio", ] @@ -3589,7 +3576,7 @@ name = "pixi_pty" version = "0.1.0" dependencies = [ "libc", - "nix 0.29.0", + "nix", "signal-hook", ] @@ -3643,6 +3630,7 @@ dependencies = [ name = "pixi_uv_conversions" version = "0.1.0" dependencies = [ + "distribution-filename", "distribution-types", "dunce", "pep508_rs", @@ -3653,6 +3641,8 @@ dependencies = [ "url", "uv-git", "uv-normalize", + "uv-python", + "uv-types", ] [[package]] @@ -3661,6 +3651,12 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + [[package]] name = "platform-info" version = "2.0.3" @@ -3674,9 +3670,9 @@ dependencies = [ [[package]] name = "platform-tags" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ - "rustc-hash 2.0.0", + "rustc-hash", "serde", "thiserror", ] @@ -3696,33 +3692,17 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.4.0", "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -3759,12 +3739,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "toml_edit 0.21.1", ] [[package]] @@ -3812,12 +3791,12 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=b4435e2f3af10dab2336a0345b35dcd622699d06#b4435e2f3af10dab2336a0345b35dcd622699d06" +source = "git+https://github.com/astral-sh/pubgrub?rev=388685a8711092971930986644cfed152d1a1f6c#388685a8711092971930986644cfed152d1a1f6c" dependencies = [ "indexmap 2.3.0", "log", "priority-queue", - "rustc-hash 1.1.0", + "rustc-hash", "thiserror", ] @@ -3839,13 +3818,13 @@ dependencies = [ [[package]] name = "pypi-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ - "chrono", + "distribution-filename", "indexmap 2.3.0", "itertools 0.13.0", + "jiff", "mailparse", - "once_cell", "pep440_rs", "pep508_rs", "regex", @@ -3855,6 +3834,7 @@ dependencies = [ "toml", "tracing", "url", + "uv-fs", "uv-git", "uv-normalize", ] @@ -3871,11 +3851,12 @@ dependencies = [ "pep440_rs", "pep508_rs", "pixi_config", + "pixi_consts", "rattler_conda_types", "rattler_digest", "reqwest 0.12.5", "reqwest-middleware", - "reqwest-retry", + "reqwest-retry 0.5.0", "serde", "serde_json", "tokio", @@ -3926,9 +3907,9 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", + "rustc-hash", "rustls 0.23.12", - "socket2 0.5.7", + "socket2", "thiserror", "tokio", "tracing", @@ -3943,7 +3924,7 @@ dependencies = [ "bytes", "rand", "ring", - "rustc-hash 2.0.0", + "rustc-hash", "rustls 0.23.12", "slab", "thiserror", @@ -3959,7 +3940,7 @@ checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", - "socket2 0.5.7", + "socket2", "tracing", "windows-sys 0.52.0", ] @@ -4017,9 +3998,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.27.4" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a104e49f09b7e4b94a71b8cd84f42f30fc87160ed26c6144298b1582c65e260b" +checksum = "d303d2a031b01e327f6d0bf360a511cec3e3a5f2c17d6a95a19656a146cd29c0" dependencies = [ "anyhow", "clap", @@ -4058,13 +4039,16 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "565a1fc40c3558e35732981448daa26ac2deb9dd41224ca11e9bd0911cabb1dc" +checksum = "e590ca575f48acee45c0ad12fabccc1c9a0dd58e5200f9e536aabdfc033ce15d" dependencies = [ "anyhow", + "dashmap", "digest", "dirs", + "fs4", + "futures", "fxhash", "itertools 0.13.0", "parking_lot 0.12.3", @@ -4074,6 +4058,7 @@ dependencies = [ "rattler_package_streaming", "reqwest 0.12.5", "reqwest-middleware", + "simple_spawn_blocking", "thiserror", "tokio", "tracing", @@ -4082,9 +4067,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.27.1" +version = "0.27.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffb561817646d4c332761f782f9d30e134b46c7a94dfd170b5779e87d863dbe" +checksum = "04c75121d007d0f8bd86af41dbc393c03da28ec6dff0c09081e59e708f3e95ee" dependencies = [ "chrono", "dirs", @@ -4118,9 +4103,9 @@ dependencies = [ [[package]] name = "rattler_digest" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b747092584fbc2bfef5e4f7286a0b6f81aec1bf67b537ef9f1749cb7931ac7f" +checksum = "d699fe089907cc0ca66966f6b94e0dc04792a1451b2a60ba49c0abb75fba33da" dependencies = [ "blake2", "digest", @@ -4135,9 +4120,9 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.22.18" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f509b88f4eba1ca9451797dcc213c2eef9907f4026762a1673cc10f0504cff66" +checksum = "67d3cdbbd5159ed399c73ae56f0d1155e27540e1bcd0a6c0c522a259ec1a1762" dependencies = [ "chrono", "file_url", @@ -4158,9 +4143,9 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0b45deecbbeba352e61c57a304a1a149c6f8273655a338668d29899a22738d" +checksum = "18011e84fcc8dba03a4af5b70cbb99362968cdace525139df430b4f268ef58e0" dependencies = [ "quote", "syn 2.0.72", @@ -4168,9 +4153,9 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.21.0" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d3c289d390a421af42be0ecf5ad65d1a9659a23a971c153de8bcc60a7fdef" +checksum = "0a4c6c046bc414dd46f2f93ecbc78d661a06b9af123f836ea973e2080c62ee15" dependencies = [ "anyhow", "async-trait", @@ -4196,9 +4181,9 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.1" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fbe8c3d3820f0732ee49b0041144eb802cb0f44cd5629d15400dde344c6003" +checksum = "1c860f3eeb5d0bfe3ae0cbe8c6d1ef2f9711d72c558d9b9120db72fdb181c557" dependencies = [ "bzip2", "chrono", @@ -4218,15 +4203,15 @@ dependencies = [ "tokio-util", "tracing", "url", - "zip 2.1.6", + "zip 2.2.0", "zstd", ] [[package]] name = "rattler_redaction" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ffcd6377f7a292ea09f25d3111b4647f3f159fea310c3d78eeb0ad5894efe2" +checksum = "14b8739ebf209f017d70f4a27b2726358bade979cc3327b1765163c93a18d46f" dependencies = [ "reqwest 0.12.5", "reqwest-middleware", @@ -4235,18 +4220,19 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.5" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b228f2c2774f051d60bf4e364a9bbc57c44223afd57a31b495e92e7c76450d5b" +checksum = "b8410d7703a82330c90ed825ce1846bb8ebbc64a130f23c61ba6e7de6f1b82c2" dependencies = [ "anyhow", "async-compression", + "async-fd-lock", "async-trait", "blake2", "bytes", "cache_control", "chrono", - "dashmap 6.0.1", + "dashmap", "dirs", "file_url", "futures", @@ -4288,9 +4274,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.21.5" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4141b22e60ba23f174e65e88b0d3586367d9d9a2323441c1eca28a6939d74309" +checksum = "b63d167613b8c98aa9f337c6b3392a90ec21b29203b381d73e43a16321a87f22" dependencies = [ "enum_dispatch", "indexmap 2.3.0", @@ -4306,9 +4292,9 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93d5e60a3fd320a2e5eb199e5216ae440a46c270e662d1e61e9aa9dedbf6e6" +checksum = "8389dcf5c99f230122469552cd413895b5bf7bddc984be8a2ed000728d99484f" dependencies = [ "chrono", "futures", @@ -4325,9 +4311,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed06f9e0fbe5d11bcabaec23bb7c3c96ff3adce26c2b008fa68f37b19ea9afcd" +checksum = "025590e575da11dfe115387134dc1f347994111c7b117a64f0f941235dec63d5" dependencies = [ "archspec", "libloading", @@ -4435,7 +4421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6" dependencies = [ "cfg-if", - "rustix 0.38.34", + "rustix", "windows 0.58.0", ] @@ -4501,7 +4487,7 @@ dependencies = [ [[package]] name = "requirements-txt" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "distribution-types", "fs-err", @@ -4617,9 +4603,8 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268" +version = "0.3.3" +source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" dependencies = [ "anyhow", "async-trait", @@ -4652,16 +4637,37 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "reqwest-retry" +version = "0.7.1" +source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "getrandom", + "http 1.1.0", + "hyper 1.4.1", + "parking_lot 0.11.2", + "reqwest 0.12.5", + "reqwest-middleware", + "retry-policies 0.4.0", + "thiserror", + "tokio", + "tracing", + "wasm-timer", +] + [[package]] name = "resolvo" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f13bb82d6362074f2b2d858bb316dfb2a9940c7e33a9ccd0168ba4f6a247b2" +checksum = "014783b06e2d02bee01fe3c3247454fb34d0fc35765334e825034cdadec422fa" dependencies = [ "ahash 0.8.11", "bitvec", "elsa", - "event-listener 5.3.1", + "event-listener", "futures", "itertools 0.13.0", "petgraph", @@ -4732,6 +4738,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "rlimit" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" +dependencies = [ + "libc", +] + [[package]] name = "rmp" version = "0.8.14" @@ -4798,12 +4813,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.0.0" @@ -4819,20 +4828,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.34" @@ -4842,7 +4837,7 @@ dependencies = [ "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -4953,21 +4948,37 @@ dependencies = [ ] [[package]] -name = "scc" -version = "2.1.8" +name = "schannel" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d777f59627453628a9a5be1ee8d948745b94b1dfc2d0c3099cbd9e08ab89e7c" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "sdd", + "windows-sys 0.52.0", ] [[package]] -name = "schannel" -version = "0.1.23" +name = "schemars" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ - "windows-sys 0.52.0", + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.72", ] [[package]] @@ -4976,6 +4987,26 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "scroll" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "sct" version = "0.7.1" @@ -4986,12 +5017,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sdd" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177258b64c0faaa9ffd3c65cd3262c2bc7e2588dbbd9c1641d0346145c1bbda8" - [[package]] name = "seahash" version = "4.1.0" @@ -5000,9 +5025,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "secret-service" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5204d39df37f06d1944935232fd2dfe05008def7ca599bf28c0800366c8a8f9" +checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" dependencies = [ "aes", "cbc", @@ -5088,6 +5113,17 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "serde_ignored" version = "0.1.10" @@ -5185,31 +5221,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "serial_test" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" -dependencies = [ - "futures", - "log", - "once_cell", - "parking_lot 0.12.3", - "scc", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "sha-1" version = "0.10.1" @@ -5385,16 +5396,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.7" @@ -5645,7 +5646,7 @@ dependencies = [ "cfg-if", "fastrand 2.1.0", "once_cell", - "rustix 0.38.34", + "rustix", "windows-sys 0.52.0", ] @@ -5655,7 +5656,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.34", + "rustix", "windows-sys 0.48.0", ] @@ -5749,8 +5750,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tl" version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7" +source = "git+https://github.com/charliermarsh/tl.git?rev=6e25b2ee2513d75385101a8ff9f591ef51f314ec#6e25b2ee2513d75385101a8ff9f591ef51f314ec" [[package]] name = "tokio" @@ -5765,7 +5765,7 @@ dependencies = [ "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", "windows-sys 0.52.0", ] @@ -5876,9 +5876,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.3.0", "toml_datetime", @@ -6016,7 +6016,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.1", + "memoffset", "tempfile", "winapi", ] @@ -6124,7 +6124,7 @@ dependencies = [ [[package]] name = "uv-auth" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "async-trait", @@ -6132,10 +6132,10 @@ dependencies = [ "futures", "http 1.1.0", "once-map", - "once_cell", "reqwest 0.12.5", "reqwest-middleware", "rust-netrc", + "rustc-hash", "tokio", "tracing", "url", @@ -6145,19 +6145,18 @@ dependencies = [ [[package]] name = "uv-build" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "distribution-types", "fs-err", "indoc", "itertools 0.13.0", - "once_cell", "pep440_rs", "pep508_rs", "pypi-types", "regex", - "rustc-hash 2.0.0", + "rustc-hash", "serde", "serde_json", "tempfile", @@ -6167,7 +6166,7 @@ dependencies = [ "tracing", "uv-configuration", "uv-fs", - "uv-toolchain", + "uv-python", "uv-types", "uv-virtualenv", ] @@ -6175,16 +6174,17 @@ dependencies = [ [[package]] name = "uv-cache" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "cache-key", "directories", "distribution-types", + "etcetera", "fs-err", "nanoid", "pypi-types", "rmp-serde", - "rustc-hash 2.0.0", + "rustc-hash", "serde", "tempfile", "tracing", @@ -6197,14 +6197,13 @@ dependencies = [ [[package]] name = "uv-client" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "async-trait", "async_http_range_reader", "async_zip", "cache-key", - "chrono", "distribution-filename", "distribution-types", "fs-err", @@ -6213,13 +6212,14 @@ dependencies = [ "http 1.1.0", "install-wheel-rs", "itertools 0.13.0", + "jiff", "pep440_rs", "pep508_rs", "platform-tags", "pypi-types", "reqwest 0.12.5", "reqwest-middleware", - "reqwest-retry", + "reqwest-retry 0.7.1", "rkyv", "rmp-serde", "serde", @@ -6244,24 +6244,28 @@ dependencies = [ [[package]] name = "uv-configuration" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ + "distribution-types", "either", "pep508_rs", "platform-tags", "pypi-types", - "rustc-hash 2.0.0", + "rustc-hash", "serde", "serde_json", + "thiserror", "tracing", + "url", "uv-auth", + "uv-cache", "uv-normalize", ] [[package]] name = "uv-dispatch" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "distribution-types", @@ -6269,7 +6273,7 @@ dependencies = [ "install-wheel-rs", "itertools 0.13.0", "pypi-types", - "rustc-hash 2.0.0", + "rustc-hash", "tracing", "uv-build", "uv-cache", @@ -6278,27 +6282,23 @@ dependencies = [ "uv-distribution", "uv-git", "uv-installer", + "uv-python", "uv-resolver", - "uv-toolchain", "uv-types", ] [[package]] name = "uv-distribution" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "distribution-filename", "distribution-types", - "either", "fs-err", "futures", - "glob", "install-wheel-rs", "nanoid", - "once_cell", - "path-absolutize", "pep440_rs", "pep508_rs", "platform-tags", @@ -6306,14 +6306,12 @@ dependencies = [ "reqwest 0.12.5", "reqwest-middleware", "rmp-serde", - "rustc-hash 2.0.0", + "rustc-hash", "serde", "tempfile", "thiserror", "tokio", "tokio-util", - "toml", - "toml_edit 0.22.20", "tracing", "url", "uv-cache", @@ -6325,35 +6323,39 @@ dependencies = [ "uv-normalize", "uv-types", "uv-warnings", + "uv-workspace", "zip 0.6.6", ] [[package]] name = "uv-extract" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "async-compression", "async_zip", + "distribution-filename", "fs-err", "futures", "md-5", "pypi-types", "rayon", - "rustc-hash 2.0.0", + "reqwest 0.12.5", + "rustc-hash", "sha2", "thiserror", "tokio", "tokio-tar", "tokio-util", "tracing", + "xz2", "zip 0.6.6", ] [[package]] name = "uv-fs" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "backoff", "cachedir", @@ -6363,9 +6365,8 @@ dependencies = [ "fs-err", "fs2", "junction", - "once_cell", - "path-absolutize", "path-slash", + "serde", "tempfile", "tracing", "urlencoding", @@ -6375,26 +6376,28 @@ dependencies = [ [[package]] name = "uv-git" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "cache-key", "cargo-util", - "dashmap 5.5.3", + "dashmap", "fs-err", "reqwest 0.12.5", "reqwest-middleware", + "serde", "thiserror", "tokio", "tracing", "url", + "uv-auth", "uv-fs", ] [[package]] name = "uv-installer" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "async-channel", @@ -6409,13 +6412,11 @@ dependencies = [ "platform-tags", "pypi-types", "rayon", - "rustc-hash 2.0.0", + "rustc-hash", "same-file", - "serde", "tempfile", "thiserror", "tokio", - "toml", "tracing", "url", "uv-cache", @@ -6425,30 +6426,104 @@ dependencies = [ "uv-fs", "uv-git", "uv-normalize", - "uv-toolchain", + "uv-python", "uv-types", "uv-warnings", "walkdir", ] +[[package]] +name = "uv-macros" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", + "textwrap", +] + [[package]] name = "uv-normalize" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "rkyv", "serde", ] +[[package]] +name = "uv-options-metadata" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +dependencies = [ + "serde", +] + +[[package]] +name = "uv-pubgrub" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +dependencies = [ + "itertools 0.13.0", + "pep440_rs", + "pubgrub", + "thiserror", +] + +[[package]] +name = "uv-python" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +dependencies = [ + "anyhow", + "cache-key", + "configparser", + "distribution-filename", + "fs-err", + "futures", + "goblin", + "install-wheel-rs", + "itertools 0.13.0", + "owo-colors", + "pep440_rs", + "pep508_rs", + "platform-tags", + "pypi-types", + "regex", + "reqwest 0.12.5", + "reqwest-middleware", + "rmp-serde", + "rustix", + "same-file", + "serde", + "serde_json", + "target-lexicon", + "tempfile", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", + "uv-cache", + "uv-client", + "uv-extract", + "uv-fs", + "uv-state", + "uv-warnings", + "which", + "windows-sys 0.59.0", + "winsafe 0.0.22", +] + [[package]] name = "uv-resolver" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "cache-key", - "chrono", - "dashmap 5.5.3", + "dashmap", "derivative", "distribution-filename", "distribution-types", @@ -6457,9 +6532,9 @@ dependencies = [ "indexmap 2.3.0", "install-wheel-rs", "itertools 0.13.0", + "jiff", "once-map", "owo-colors", - "path-slash", "pep440_rs", "pep508_rs", "petgraph", @@ -6468,81 +6543,45 @@ dependencies = [ "pypi-types", "requirements-txt", "rkyv", - "rustc-hash 2.0.0", + "rustc-hash", "same-file", "serde", "textwrap", "thiserror", "tokio", "tokio-stream", + "toml", "toml_edit 0.22.20", "tracing", "url", "uv-client", "uv-configuration", "uv-distribution", + "uv-fs", "uv-git", "uv-normalize", - "uv-toolchain", + "uv-pubgrub", + "uv-python", "uv-types", "uv-warnings", + "uv-workspace", ] [[package]] name = "uv-state" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "directories", + "etcetera", "fs-err", "tempfile", ] -[[package]] -name = "uv-toolchain" -version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" -dependencies = [ - "anyhow", - "cache-key", - "configparser", - "fs-err", - "futures", - "install-wheel-rs", - "itertools 0.13.0", - "once_cell", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", - "regex", - "reqwest 0.12.5", - "reqwest-middleware", - "rmp-serde", - "same-file", - "serde", - "serde_json", - "target-lexicon", - "tempfile", - "thiserror", - "tokio-util", - "tracing", - "url", - "uv-cache", - "uv-client", - "uv-configuration", - "uv-extract", - "uv-fs", - "uv-state", - "uv-warnings", - "which", - "winapi", -] - [[package]] name = "uv-types" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anyhow", "distribution-types", @@ -6550,25 +6589,25 @@ dependencies = [ "pep440_rs", "pep508_rs", "pypi-types", - "rustc-hash 2.0.0", + "rustc-hash", "thiserror", "url", "uv-cache", "uv-configuration", "uv-git", "uv-normalize", - "uv-toolchain", + "uv-python", ] [[package]] name = "uv-version" -version = "0.2.18" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +version = "0.4.0" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" [[package]] name = "uv-virtualenv" version = "0.0.4" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "fs-err", "itertools 0.13.0", @@ -6578,19 +6617,45 @@ dependencies = [ "thiserror", "tracing", "uv-fs", - "uv-toolchain", + "uv-python", "uv-version", ] [[package]] name = "uv-warnings" version = "0.0.1" -source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "anstream", - "once_cell", "owo-colors", - "rustc-hash 2.0.0", + "rustc-hash", +] + +[[package]] +name = "uv-workspace" +version = "0.0.1" +source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" +dependencies = [ + "either", + "fs-err", + "glob", + "pep440_rs", + "pep508_rs", + "pypi-types", + "rustc-hash", + "serde", + "thiserror", + "tokio", + "toml", + "toml_edit 0.22.20", + "tracing", + "url", + "uv-fs", + "uv-git", + "uv-macros", + "uv-normalize", + "uv-options-metadata", + "uv-warnings", ] [[package]] @@ -6623,12 +6688,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - [[package]] name = "walkdir" version = "2.5.0" @@ -6781,8 +6840,9 @@ checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" dependencies = [ "either", "home", - "rustix 0.38.34", - "winsafe", + "regex", + "rustix", + "winsafe 0.0.19", ] [[package]] @@ -7091,6 +7151,12 @@ version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +[[package]] +name = "winsafe" +version = "0.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d6ad6cbd9c6e5144971e326303f0e453b61d82e4f72067fccf23106bccd8437" + [[package]] name = "wyz" version = "0.5.1" @@ -7107,8 +7173,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.34", + "linux-raw-sys", + "rustix", ] [[package]] @@ -7127,6 +7193,15 @@ version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + [[package]] name = "yansi" version = "1.0.1" @@ -7135,30 +7210,27 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "zbus" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix", "ordered-stream", "rand", "serde", @@ -7167,7 +7239,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -7176,23 +7248,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.72", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -7236,14 +7307,13 @@ dependencies = [ "crc32fast", "crossbeam-utils", "flate2", - "time", ] [[package]] name = "zip" -version = "2.1.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "arbitrary", "crc32fast", @@ -7301,13 +7371,12 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -7315,24 +7384,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 6c0ed9ebc0e205e..e8a8a47c31bf944 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -13,21 +13,23 @@ rustPlatform.buildRustPackage rec { pname = "pixi"; - version = "0.27.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; rev = "v${version}"; - hash = "sha256-37zVmPKAWCw58xA5lUb+WVAW8rRwPF7DZVXUZ8bwP5E="; + hash = "sha256-SIeGV6OkEqgm6j4sbL2eyhEFy840Pzups2lAScoqaaM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; - "cache-key-0.0.1" = "sha256-tg3zRakZsnf7xBjs5tSlkmhkhHp5HGs6dwrTmdZBTl4="; - "pubgrub-0.2.1" = "sha256-6tr+HATYSn1A1uVJwmz40S4yLDOJlX8vEokOOtdFG0M="; + "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="; + "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ="; }; }; @@ -54,6 +56,7 @@ rustPlatform.buildRustPackage rec { preCheck = '' export HOME="$(mktemp -d)" + export USER="$(whoami)" ''; checkFlags = [ @@ -63,6 +66,7 @@ rustPlatform.buildRustPackage rec { "--skip=add_functionality_os" "--skip=add_functionality_union" "--skip=add_pypi_functionality" + "--skip=add_unconstrainted_dependency" "--skip=add_with_channel" "--skip=test_alias" "--skip=test_cwd" @@ -76,11 +80,12 @@ rustPlatform.buildRustPackage rec { # `/usr/bin/env` is not available during build. # Error: /usr/bin/env: No such file or directory + "--skip=cli::shell_hook::tests::test_environment_json" + "--skip=task::executable_task::tests::test_get_task_env" "--skip=test_clean_env" "--skip=test_full_env_activation" "--skip=test_task_with_env" "--skip=test_pixi_only_env_activation" - "--skip=cli::shell_hook::tests::test_environment_json" ] ++ lib.optionals stdenv.isDarwin [ "--skip=task::task_environment::tests::test_find_ambiguous_task" "--skip=task::task_environment::tests::test_find_task_dual_defined"