From 3ff5540a6d526b3b2333a9ead6d20942026e7376 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Mon, 29 Jun 2026 11:07:14 +0200 Subject: [PATCH 1/7] feat: Bump rattler, introduce offline mode for pixi-unpack --- Cargo.lock | 563 ++++++++++++++++++++------------------------------ Cargo.toml | 18 +- src/pack.rs | 4 +- src/unpack.rs | 11 +- 4 files changed, 240 insertions(+), 356 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3e4b1b4..0cb9acb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,6 +126,17 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +[[package]] +name = "apple-native-keyring-store" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7be2f067ccd8d4b4d4a66ddafe0f32a5dff31732f32dbff85fefc40929b1f72" +dependencies = [ + "keyring-core", + "log", + "security-framework 3.7.0", +] + [[package]] name = "arcstr" version = "1.2.0" @@ -282,24 +293,9 @@ dependencies = [ [[package]] name = "astral_async_zip" -version = "0.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab72a761e6085828cc8f0e05ed332b2554701368c5dc54de551bfaec466518ba" -dependencies = [ - "async-compression", - "crc32fast", - "futures-lite", - "pin-project", - "thiserror 1.0.69", - "tokio", - "tokio-util", -] - -[[package]] -name = "astral_async_zip" -version = "0.0.18-rc4" +version = "0.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d523231a4339307c7699aa5d9492fe6873906afefc9d7853b5e7ffbfee3c7f1" +checksum = "c15fc5b591f19dfbbbce736615908d74f1d9252bb34b231873cb995f2a997ffb" dependencies = [ "async-compression", "crc32fast", @@ -377,17 +373,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" -dependencies = [ - "async-lock", - "blocking", - "futures-lite", -] - [[package]] name = "async-global-executor" version = "2.4.1" @@ -438,24 +423,6 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" -[[package]] -name = "async-process" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" -dependencies = [ - "async-channel 2.5.0", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.4.1", - "futures-lite", - "rustix", -] - [[package]] name = "async-recursion" version = "1.1.1" @@ -467,24 +434,6 @@ dependencies = [ "syn", ] -[[package]] -name = "async-signal" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.61.2", -] - [[package]] name = "async-spooled-tempfile" version = "0.1.0" @@ -821,7 +770,7 @@ dependencies = [ "hex", "http 0.2.12", "http-body 0.4.6", - "md-5", + "md-5 0.10.6", "pin-project-lite", "sha1", "sha2 0.10.9", @@ -1065,9 +1014,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.10.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "blake2" @@ -1078,6 +1027,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "blake2" +version = "0.11.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690" +dependencies = [ + "digest 0.11.3", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -1264,7 +1222,7 @@ dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex", + "shlex 1.3.0", ] [[package]] @@ -1392,6 +1350,12 @@ dependencies = [ "cc", ] +[[package]] +name = "cmov" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" + [[package]] name = "colorchoice" version = "1.0.4" @@ -1653,6 +1617,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "ctutils" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" +dependencies = [ + "cmov", +] + [[package]] name = "cyclonedx-bom" version = "0.8.1" @@ -1767,10 +1740,21 @@ dependencies = [ "hkdf", "num", "once_cell", + "openssl", "sha2 0.10.9", "zeroize", ] +[[package]] +name = "dbus-secret-service-keyring-store" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d8f54da401bb5eb2a4d873ac4b359f4a599df2ca8634bb5b8c045e5ee78757" +dependencies = [ + "dbus-secret-service", + "keyring-core", +] + [[package]] name = "der" version = "0.6.1" @@ -1837,6 +1821,7 @@ dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", "crypto-common 0.2.1", + "ctutils", ] [[package]] @@ -2099,9 +2084,9 @@ dependencies = [ [[package]] name = "fancy-regex" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8" +checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277" dependencies = [ "bit-set", "regex-automata", @@ -2720,6 +2705,15 @@ dependencies = [ "itoa", ] +[[package]] +name = "http-auth" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "150fa4a9462ef926824cf4519c84ed652ca8f4fbae34cb8af045b5cbcaf98822" +dependencies = [ + "memchr", +] + [[package]] name = "http-body" version = "0.4.6" @@ -3272,20 +3266,12 @@ dependencies = [ ] [[package]] -name = "keyring" -version = "3.6.3" +name = "keyring-core" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c" +checksum = "fb1e621458ca9c51aa110bd0339d4751a056b9576bf1253aee1aa560dda0fc9d" dependencies = [ - "byteorder", - "dbus-secret-service", "log", - "secret-service 4.0.0", - "security-framework 2.11.1", - "security-framework 3.5.1", - "windows-sys 0.60.2", - "zbus 4.4.0", - "zeroize", ] [[package]] @@ -3362,6 +3348,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cbe856efeb50e4681f010e9aaa2bf0a644e10139e54cde10fc83a307c23bd9f" dependencies = [ + "cc", "pkg-config", ] @@ -3477,6 +3464,16 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "md-5" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" +dependencies = [ + "cfg-if", + "digest 0.11.3", +] + [[package]] name = "mea" version = "0.6.3" @@ -3605,19 +3602,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2970fbbc8c785e8246234a7bd004ed66cd1ed1a35ec73669a92545e419b836" -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.30.1" @@ -3809,9 +3793,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "opendal" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b31d3d8e99a85d83b73ec26647f5607b80578ed9375810b6e44ffa3590a236" +checksum = "96c9c85ce253ff87225e7669979d877a20c98a06604ec9d6dd5f4473e08f1ae1" dependencies = [ "opendal-core", "opendal-layer-retry", @@ -3821,9 +3805,9 @@ dependencies = [ [[package]] name = "opendal-core" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1849dd2687e173e776d3af5fce1ba3ae47b9dd37a09d1c4deba850ef45fe00ca" +checksum = "c4f8607c90e2c963a91467f50fb49fbc7fb3d573f88cea219ca59ccd3740b309" dependencies = [ "anyhow", "base64", @@ -3833,10 +3817,10 @@ dependencies = [ "http-body 1.0.1", "jiff", "log", - "md-5", + "md-5 0.11.0", "mea", "percent-encoding", - "quick-xml 0.38.4", + "quick-xml 0.39.4", "reqsign-core", "reqwest", "serde", @@ -3849,9 +3833,9 @@ dependencies = [ [[package]] name = "opendal-layer-retry" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eac134ffa4ddda6131a640a84a5315996424b9416c85052f8c64c1a33b70ad4" +checksum = "7b2a25a718afb81fad81cb9a0580a1cb989221fa2317f888c6a37f8dad408eb7" dependencies = [ "backon", "log", @@ -3860,9 +3844,9 @@ dependencies = [ [[package]] name = "opendal-service-fs" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0be0417abeeb0053376d816b90fceb9ca98f20dfb54ebf1f2a282729f83663" +checksum = "22e89a665fef0e6bd249cf5ea47fc174b7ba892159bee4b9382528b1ca873a2c" dependencies = [ "bytes", "log", @@ -3874,18 +3858,18 @@ dependencies = [ [[package]] name = "opendal-service-s3" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dadddeb9bb50b0d30927dd914c298c4ddca47e4c1cfa7674d311f0cf9b051c8" +checksum = "313d46c9f5ae70bca26b7c3e3fbb9b639292625f28af73aa016f47e788af9deb" dependencies = [ "base64", "bytes", "crc32c", "http 1.4.0", "log", - "md-5", + "md-5 0.11.0", "opendal-core", - "quick-xml 0.38.4", + "quick-xml 0.39.4", "reqsign-aws-v4", "reqsign-core", "reqsign-file-read-tokio", @@ -3930,6 +3914,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +[[package]] +name = "openssl-src" +version = "300.6.1+3.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46eb8fb9fb3b61ce1c0f8a026c4c1a0714d3a9e138e7fbde78753ce2babc3846" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.116" @@ -3938,6 +3931,7 @@ checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -4073,9 +4067,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] name = "path_resolver" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9f07f388f2a58768a34000c2b956bbc44f51630aa39d84f1d362c6785075a1" +checksum = "83a6d8be98ef9723e752c20eef948d3195d4e1314bc3cc033a8ff26b4e31d660" dependencies = [ "ahash", "fs-err", @@ -4543,7 +4537,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" dependencies = [ "memchr", - "serde", ] [[package]] @@ -4735,20 +4728,23 @@ dependencies = [ [[package]] name = "rattler" -version = "0.43.2" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "188a5ce39ea764f92fb4868ac74a722e27d33a52f3aba18be8ec705fba911cbd" +checksum = "67961cc1ccb170208f10169542752dbe730353a874a13cb0749c13b960d72d5b" dependencies = [ "anyhow", "astral-reqwest-middleware", - "digest 0.10.7", + "base64", + "digest 0.11.3", "dirs", "filetime", "fs-err", "futures", + "hex", "humantime", "indexmap 2.14.0", "itertools 0.14.0", + "jiff", "memchr", "memmap2", "once_cell", @@ -4779,19 +4775,20 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.8.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2aa78ff1be938e28fdcdb9837f90da858d090ec1147a00a2aab8490c077f557" +checksum = "24205a6af611e71f346e5e170c32f00ce1a9b49077f699f18d8404e711dc2209" dependencies = [ "ahash", "anyhow", "astral-reqwest-middleware", "dashmap", - "digest 0.10.7", + "digest 0.11.3", "dirs", "fs-err", "fs4", "futures", + "hex", "itertools 0.14.0", "parking_lot", "rattler_conda_types", @@ -4812,12 +4809,11 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.46.4" +version = "0.47.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6018a34d7edb8a6b97c971ba935e59d217a0986376d14f4d515fb238b28bdf02" +checksum = "385575f3cfb4b9ce40c13d90b37964c80d8b527b62514118e4783ae0717b3ebd" dependencies = [ "ahash", - "chrono", "core-foundation 0.10.1", "dirs", "fancy-regex", @@ -4827,6 +4823,7 @@ dependencies = [ "hex", "indexmap 2.14.0", "itertools 0.14.0", + "jiff", "lazy-regex", "memmap2", "nom 8.0.0", @@ -4855,9 +4852,9 @@ dependencies = [ [[package]] name = "rattler_config" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61e6eba72c2e8cc59f8fe7bd120eee4f0d34ed141ae1985ac5bd8c107261ecd" +checksum = "0afcf9763975148e4cc805653de9146ff3542535895e37cdb1a06b2dd3d681af" dependencies = [ "console", "fs-err", @@ -4866,48 +4863,49 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", - "toml 0.9.8", + "toml", "tracing", "url", ] [[package]] name = "rattler_digest" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c44304c9353802e910fac1dbdf6e16df44c341d07b1850bc1fd8b03912cbaab" +checksum = "2e4af3c4e8b0cf496e66a5f2e7244364409a20cd4338ad9b331bd7247de32b69" dependencies = [ - "blake2", - "digest 0.10.7", + "blake2 0.11.0-rc.6", + "digest 0.11.3", "generic-array", "hex", - "md-5", + "md-5 0.11.0", "serde", "serde-untagged", "serde_bytes", "serde_with", - "sha2 0.10.9", + "sha2 0.11.0", "tokio", "url", ] [[package]] name = "rattler_index" -version = "0.30.1" +version = "0.30.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8bafd1bc5ad33a81d97a57fee3668406ad37b5f526a3658b019b34b72aa8ca" +checksum = "26d078770093f35bfdd275aa0c34689ef989b76dcd37d4e3b31a668e98852e61" dependencies = [ "ahash", "anyhow", "bytes", - "chrono", "clap", "clap-verbosity-flag", "console", "fs-err", "futures", + "hex", "indexmap 2.14.0", "indicatif", + "jiff", "opendal", "rattler_conda_types", "rattler_config", @@ -4920,7 +4918,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.11.0", "tar", "thiserror 2.0.18", "tokio", @@ -4932,15 +4930,15 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.30.3" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c0fe27729fd9081d25eb1a23d94f49f23ee93a75d59bac0ae3e304bda04aae" +checksum = "4ec8b22e87f14a9ca2e55061f71b1d51d2dfb4aa1766babb95f06f6218d6733a" dependencies = [ "ahash", - "chrono", "file_url", "indexmap 2.14.0", "itertools 0.14.0", + "jiff", "pep440_rs", "pep508_rs", "rattler_conda_types", @@ -4961,9 +4959,9 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d44a87a904057524e32dc8beeb50197016cec467d487bce9d64e044adbcaeb5" +checksum = "ac3d93067b745b200dd741e872f4160de24d1b972ee63db65e8a2cf6a447f1ff" dependencies = [ "quote", "syn", @@ -4971,14 +4969,14 @@ dependencies = [ [[package]] name = "rattler_menuinst" -version = "0.2.62" +version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ac99b44fac7a9e6cb4bd65cee12c3ec281db52284f6c85fc929b1d1b775cea8" +checksum = "957dbd0e8fb9ed66dce0bd6922914fb8bf795a4334d92e2190f34314a0b1f170" dependencies = [ - "chrono", "configparser", "dirs", "fs-err", + "hex", "indexmap 2.14.0", "known-folders", "once_cell", @@ -4989,8 +4987,8 @@ dependencies = [ "regex", "serde", "serde_json", - "sha2 0.10.9", - "shlex", + "sha2 0.11.0", + "shlex 2.0.1", "tempfile", "thiserror 2.0.18", "tracing", @@ -5002,12 +5000,13 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19984b40494bdbaf785525ba36fdb1fa487fe44a36b4214851af4428c69ecf27" +checksum = "5014e4f5aedcbe01a83a5be0e8669b305adc82cc10985fc83f51c5fe07e0d198" dependencies = [ "ambient-id", "anyhow", + "apple-native-keyring-store", "astral-reqwest-middleware", "async-once-cell", "async-trait", @@ -5015,13 +5014,16 @@ dependencies = [ "aws-sdk-s3", "aws-smithy-http-client", "base64", + "dbus-secret-service-keyring-store", "dirs", "fs-err", + "futures", "getrandom 0.4.2", "google-cloud-auth", "http 1.4.0", + "http-auth", "itertools 0.14.0", - "keyring", + "keyring-core", "netrc-rs", "rattler_config", "reqwest", @@ -5033,28 +5035,31 @@ dependencies = [ "tokio", "tracing", "url", + "windows-native-keyring-store", ] [[package]] name = "rattler_package_streaming" -version = "0.26.2" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eefa295dc7b49aa0b67d125400561d2b45b754c66c0f7a19e8fc375b1056bfa9" +checksum = "2b4440ad7368a66ddd370a8160d8fb2a4d0a825b7a050f9c421dac350b37bed2" dependencies = [ "astral-reqwest-middleware", "astral-tokio-tar", "astral_async_http_range_reader", - "astral_async_zip 0.0.17", + "astral_async_zip", "async-compression", "async-spooled-tempfile", "bzip2 0.6.1", - "chrono", + "filetime", "fs-err", "futures", "futures-util", "getrandom 0.2.16", "getrandom 0.4.2", + "hex", "http 1.4.0", + "jiff", "num_cpus", "rattler_conda_types", "rattler_digest", @@ -5076,9 +5081,9 @@ dependencies = [ [[package]] name = "rattler_pty" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30f42171f331905af5752aeba3bd1a539b73a35d0754b7db9f7d06a314ad913e" +checksum = "d19145200e8c578be6dca325fbacf375a57f86d4a7ccf85d2d8ee193ddfb10dd" dependencies = [ "libc", "nix 0.30.1", @@ -5099,9 +5104,9 @@ dependencies = [ [[package]] name = "rattler_s3" -version = "0.2.2" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58be09fc22d312cce5ac8158dd94950bb6ba080b23b352b4aa6d53a8dbec8fd4" +checksum = "3e2a55757ecde8f53a17bc176d13061dda08485e3d1197dd7d9338e04ec7a3ca" dependencies = [ "aws-config", "aws-credential-types", @@ -5116,9 +5121,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.27.2" +version = "0.27.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57f7b11f6e6d0ef88e5d93b3ba5ea1c0cedeaa58195ec4e75680b465f38dc43" +checksum = "9794276d154c19579fe7982ab2c1e9a960f0d51e5e56cd8d9fafe36373a71dd3" dependencies = [ "anyhow", "enum_dispatch", @@ -5128,7 +5133,7 @@ dependencies = [ "rattler_conda_types", "rattler_pty", "serde_json", - "shlex", + "shlex 2.0.1", "tempfile", "thiserror 2.0.18", "tokio", @@ -5137,13 +5142,13 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "7.1.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef2142527283596cad4f0b89f4fa0c87a2e20831bf8ef51422d72c9fc6bc316" +checksum = "0a9bbdbf299cc4f9b363bd54a4e315be7e96c7645f0a75df5853405d0189ead6" dependencies = [ - "chrono", - "humantime", + "hex", "itertools 0.14.0", + "jiff", "rattler_conda_types", "rattler_digest", "serde", @@ -5238,9 +5243,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -5678,7 +5683,7 @@ dependencies = [ "openssl-probe 0.2.1", "rustls-pki-types", "schannel", - "security-framework 3.5.1", + "security-framework 3.7.0", ] [[package]] @@ -5706,7 +5711,7 @@ dependencies = [ "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 3.5.1", + "security-framework 3.7.0", "security-framework-sys", "webpki-root-certs", "windows-sys 0.61.2", @@ -5914,25 +5919,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secret-service" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" -dependencies = [ - "aes", - "cbc", - "futures-util", - "generic-array", - "hkdf", - "num", - "once_cell", - "rand 0.8.6", - "serde", - "sha2 0.10.9", - "zbus 4.4.0", -] - [[package]] name = "secret-service" version = "5.1.0" @@ -5949,7 +5935,7 @@ dependencies = [ "once_cell", "serde", "sha2 0.10.9", - "zbus 5.12.0", + "zbus", ] [[package]] @@ -5967,9 +5953,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.5.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ "bitflags", "core-foundation 0.10.1", @@ -5980,9 +5966,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.15.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", @@ -6259,6 +6245,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + [[package]] name = "signal-hook" version = "0.3.18" @@ -6775,21 +6767,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" -dependencies = [ - "indexmap 2.14.0", - "serde_core", - "serde_spanned", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "toml_writer", - "winnow 0.7.13", -] - [[package]] name = "toml" version = "1.1.2+spec-1.1.0" @@ -7162,7 +7139,7 @@ dependencies = [ "serde_json", "thiserror 2.0.18", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-cache-key", @@ -7186,7 +7163,7 @@ checksum = "69e5c5e26b82a4d3face8c9de19904f85aba2f487444385a6f87eddc0c1a6e65" dependencies = [ "astral-tokio-tar", "astral-version-ranges", - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "base64", "csv", "flate2", @@ -7204,7 +7181,7 @@ dependencies = [ "tempfile", "thiserror 2.0.18", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "uv-distribution-filename", "uv-fs", @@ -7299,7 +7276,7 @@ dependencies = [ "schemars 1.1.0", "serde", "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "uv-fs", "walkdir", @@ -7330,7 +7307,7 @@ dependencies = [ "astral-reqwest-retry", "astral-tl", "astral_async_http_range_reader", - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "async-trait", "bytecheck", "fs-err", @@ -7489,7 +7466,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-util", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-auth", @@ -7586,13 +7563,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ff5f57741c87e532b6ffea3554a5d2a86ca996d4fddd015a43aa2c616829a0" dependencies = [ "astral-tokio-tar", - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "async-compression", - "blake2", + "blake2 0.10.6", "flate2", "fs-err", "futures", - "md-5", + "md-5 0.10.6", "rayon", "regex", "reqwest", @@ -7809,8 +7786,8 @@ checksum = "e64e3fa05c83eb576cc9ab6aa0b8ff334e21a40f06781f4659e16697ec1271bf" dependencies = [ "async-trait", "byteorder", - "secret-service 5.1.0", - "security-framework 3.5.1", + "secret-service", + "security-framework 3.7.0", "thiserror 2.0.18", "tokio", "windows", @@ -7835,7 +7812,7 @@ version = "0.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fcde081232815f09c214606323a9f2c44777eae13f6cc8a566c7b5233f84ca5" dependencies = [ - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "fs-err", "futures", "thiserror 2.0.18", @@ -8096,7 +8073,7 @@ dependencies = [ "futures", "rustc-hash", "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-cache-key", @@ -8177,7 +8154,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-stream", - "toml 1.1.2+spec-1.1.0", + "toml", "toml_edit 0.25.11+spec-1.1.0", "tracing", "url", @@ -8224,7 +8201,7 @@ dependencies = [ "regex", "serde", "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-configuration", @@ -8250,7 +8227,7 @@ dependencies = [ "serde", "textwrap", "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-cache-info", @@ -8366,7 +8343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a73d7cb80ffa866b96ddd591255a47f3bc84d3052476bd9c37cceb9e57ee40d7" dependencies = [ "anyhow", - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "fs-err", "futures-lite", "goblin", @@ -8466,7 +8443,7 @@ dependencies = [ "serde", "thiserror 2.0.18", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml", "toml_edit 0.25.11+spec-1.1.0", "tracing", "uv-build-backend", @@ -8857,6 +8834,19 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-native-keyring-store" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063426e76fdec7438d56bb777f67e318a84a25c707b07e575cb8b78e10c028f8" +dependencies = [ + "byteorder", + "keyring-core", + "regex", + "windows-sys 0.61.2", + "zeroize", +] + [[package]] name = "windows-numerics" version = "0.2.0" @@ -9259,16 +9249,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "xml-rs" version = "0.8.28" @@ -9319,44 +9299,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zbus" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener 5.4.1", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.29.0", - "ordered-stream", - "rand 0.8.6", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.4.0", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - [[package]] name = "zbus" version = "5.12.0" @@ -9381,22 +9323,9 @@ dependencies = [ "uuid", "windows-sys 0.61.2", "winnow 0.7.13", - "zbus_macros 5.12.0", - "zbus_names 4.2.0", - "zvariant 5.8.0", -] - -[[package]] -name = "zbus_macros" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", - "zvariant_utils 2.1.0", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] @@ -9409,20 +9338,9 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zbus_names 4.2.0", - "zvariant 5.8.0", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.2.0", + "zbus_names", + "zvariant", + "zvariant_utils", ] [[package]] @@ -9434,7 +9352,7 @@ dependencies = [ "serde", "static_assertions", "winnow 0.7.13", - "zvariant 5.8.0", + "zvariant", ] [[package]] @@ -9598,19 +9516,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "zvariant" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive 4.2.0", -] - [[package]] name = "zvariant" version = "5.8.0" @@ -9621,21 +9526,8 @@ dependencies = [ "enumflags2", "serde", "winnow 0.7.13", - "zvariant_derive 5.8.0", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zvariant_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", - "zvariant_utils 2.1.0", + "zvariant_derive", + "zvariant_utils", ] [[package]] @@ -9648,18 +9540,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zvariant_utils" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "zvariant_utils", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 9eec497..96fcb4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,19 +33,19 @@ clap_complete = "4.6.5" clap-verbosity-flag = { version = "3.0.4", features = ["tracing"] } futures = "0.3.32" indicatif = "0.18.4" -rattler = { version = "0.43.2", default-features = false } -rattler_config = "0.4.1" -rattler_digest = { version = "1.3.0", features = ["tokio"] } -rattler_conda_types = "0.46.4" -rattler_index = "0.30.1" -rattler_lock = "0.30.3" -rattler_networking = { version = "0.27.2", default-features = false, features = [ +rattler = { version = "0.46.0", default-features = false } +rattler_config = "0.5.2" +rattler_digest = { version = "1.3.1", features = ["tokio"] } +rattler_conda_types = "0.47.2" +rattler_index = "0.30.7" +rattler_lock = "0.31.3" +rattler_networking = { version = "0.30.0", default-features = false, features = [ "s3", "gcs", "rattler_config", ] } -rattler_package_streaming = { version = "0.26.2", default-features = false } -rattler_shell = "0.27.2" +rattler_package_streaming = { version = "0.26.6", default-features = false } +rattler_shell = "0.27.8" reqwest = { version = "0.13.3", default-features = false, features = ["http2"] } reqwest-middleware = { package = "astral-reqwest-middleware", version = "0.5.1" } serde = { version = "1.0.228", features = ["derive"] } diff --git a/src/pack.rs b/src/pack.rs index ca881e3..7de64ad 100644 --- a/src/pack.rs +++ b/src/pack.rs @@ -952,12 +952,12 @@ async fn create_repodata_files( info: Some(ChannelInfo { subdir: Some(subdir.clone()), base_url: None, - repodata_revisions: Vec::new(), + repodata_revisions: Default::default(), channel_relations: None, }), packages: Default::default(), conda_packages, - experimental_v3: Default::default(), + v3: Default::default(), removed: Default::default(), version: Some(2), }; diff --git a/src/unpack.rs b/src/unpack.rs index 12494e2..9a06afa 100644 --- a/src/unpack.rs +++ b/src/unpack.rs @@ -28,7 +28,7 @@ use tar::Archive; use tokio::fs; use tokio_stream::wrappers::ReadDirStream; use url::Url; -use uv_client::{BaseClientBuilder, RegistryClientBuilder}; +use uv_client::{BaseClientBuilder, Connectivity, RegistryClientBuilder}; use uv_configuration::{BuildOptions, NoBinary, NoBuild, initialize_rayon_once}; use uv_distribution::DistributionDatabase; use uv_distribution_filename::{DistExtension, WheelFilename}; @@ -394,9 +394,12 @@ async fn install_pypi_packages( venv.root().display(), ); - let client = RegistryClientBuilder::new(BaseClientBuilder::default(), pypi_cache.clone()) - .build() - .map_err(|e| anyhow!("Could not build registry client: {}", e))?; + let client = RegistryClientBuilder::new( + BaseClientBuilder::default().connectivity(Connectivity::Offline), + pypi_cache.clone(), + ) + .build() + .map_err(|e| anyhow!("Could not build registry client: {}", e))?; let context = PixiPackBuildContext::new(pypi_cache.clone()); let downloads_semaphore = Arc::new(tokio::sync::Semaphore::new(1)); let distribute_database = DistributionDatabase::new(&client, &context, downloads_semaphore); From 50ba706966c36e4c823e27bdb14c0324ecb17740 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 3 Jul 2026 15:36:19 +0200 Subject: [PATCH 2/7] WIP --- Cargo.lock | 927 +++++++++++++++++++++++++++++------------------------ 1 file changed, 504 insertions(+), 423 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0cb9acb..fe1331d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,17 +126,6 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" -[[package]] -name = "apple-native-keyring-store" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7be2f067ccd8d4b4d4a66ddafe0f32a5dff31732f32dbff85fefc40929b1f72" -dependencies = [ - "keyring-core", - "log", - "security-framework 3.7.0", -] - [[package]] name = "arcstr" version = "1.2.0" @@ -293,9 +282,24 @@ dependencies = [ [[package]] name = "astral_async_zip" -version = "0.0.18" +version = "0.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15fc5b591f19dfbbbce736615908d74f1d9252bb34b231873cb995f2a997ffb" +checksum = "ab72a761e6085828cc8f0e05ed332b2554701368c5dc54de551bfaec466518ba" +dependencies = [ + "async-compression", + "crc32fast", + "futures-lite", + "pin-project", + "thiserror 1.0.69", + "tokio", + "tokio-util", +] + +[[package]] +name = "astral_async_zip" +version = "0.0.18-rc4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d523231a4339307c7699aa5d9492fe6873906afefc9d7853b5e7ffbfee3c7f1" dependencies = [ "async-compression", "crc32fast", @@ -373,6 +377,17 @@ dependencies = [ "slab", ] +[[package]] +name = "async-fs" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + [[package]] name = "async-global-executor" version = "2.4.1" @@ -423,6 +438,24 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" +[[package]] +name = "async-process" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" +dependencies = [ + "async-channel 2.5.0", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.4.1", + "futures-lite", + "rustix", +] + [[package]] name = "async-recursion" version = "1.1.1" @@ -434,6 +467,24 @@ dependencies = [ "syn", ] +[[package]] +name = "async-signal" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.61.2", +] + [[package]] name = "async-spooled-tempfile" version = "0.1.0" @@ -770,7 +821,7 @@ dependencies = [ "hex", "http 0.2.12", "http-body 0.4.6", - "md-5 0.10.6", + "md-5", "pin-project-lite", "sha1", "sha2 0.10.9", @@ -1014,9 +1065,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.13.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "blake2" @@ -1027,15 +1078,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "blake2" -version = "0.11.0-rc.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690" -dependencies = [ - "digest 0.11.3", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -1222,7 +1264,7 @@ dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex 1.3.0", + "shlex", ] [[package]] @@ -1350,12 +1392,6 @@ dependencies = [ "cc", ] -[[package]] -name = "cmov" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" - [[package]] name = "colorchoice" version = "1.0.4" @@ -1617,15 +1653,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ctutils" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" -dependencies = [ - "cmov", -] - [[package]] name = "cyclonedx-bom" version = "0.8.1" @@ -1740,21 +1767,10 @@ dependencies = [ "hkdf", "num", "once_cell", - "openssl", "sha2 0.10.9", "zeroize", ] -[[package]] -name = "dbus-secret-service-keyring-store" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d8f54da401bb5eb2a4d873ac4b359f4a599df2ca8634bb5b8c045e5ee78757" -dependencies = [ - "dbus-secret-service", - "keyring-core", -] - [[package]] name = "der" version = "0.6.1" @@ -1821,7 +1837,6 @@ dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", "crypto-common 0.2.1", - "ctutils", ] [[package]] @@ -2084,9 +2099,9 @@ dependencies = [ [[package]] name = "fancy-regex" -version = "0.18.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277" +checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8" dependencies = [ "bit-set", "regex-automata", @@ -2705,15 +2720,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http-auth" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150fa4a9462ef926824cf4519c84ed652ca8f4fbae34cb8af045b5cbcaf98822" -dependencies = [ - "memchr", -] - [[package]] name = "http-body" version = "0.4.6" @@ -2853,7 +2859,7 @@ dependencies = [ "tokio", "tower-service", "tracing", - "windows-registry 0.6.1", + "windows-registry", ] [[package]] @@ -3067,9 +3073,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.47.2" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4a6248eb93a4401ed2f37dfe8ea592d3cf05b7cf4f8efa867b6895af7e094e" +checksum = "86f0f8fee8c926415c58d6ae43a08523a26faccb2323f5e6b644fe7dd4ef6b82" dependencies = [ "console", "once_cell", @@ -3266,12 +3272,20 @@ dependencies = [ ] [[package]] -name = "keyring-core" -version = "1.0.0" +name = "keyring" +version = "3.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e621458ca9c51aa110bd0339d4751a056b9576bf1253aee1aa560dda0fc9d" +checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c" dependencies = [ + "byteorder", + "dbus-secret-service", "log", + "secret-service 4.0.0", + "security-framework 2.11.1", + "security-framework 3.5.1", + "windows-sys 0.60.2", + "zbus 4.4.0", + "zeroize", ] [[package]] @@ -3348,7 +3362,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cbe856efeb50e4681f010e9aaa2bf0a644e10139e54cde10fc83a307c23bd9f" dependencies = [ - "cc", "pkg-config", ] @@ -3464,16 +3477,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "md-5" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" -dependencies = [ - "cfg-if", - "digest 0.11.3", -] - [[package]] name = "mea" version = "0.6.3" @@ -3581,17 +3584,17 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.14" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" dependencies = [ "libc", "log", "openssl", - "openssl-probe 0.1.6", + "openssl-probe", "openssl-sys", "schannel", - "security-framework 2.11.1", + "security-framework 3.5.1", "security-framework-sys", "tempfile", ] @@ -3602,6 +3605,19 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2970fbbc8c785e8246234a7bd004ed66cd1ed1a35ec73669a92545e419b836" +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + [[package]] name = "nix" version = "0.30.1" @@ -3793,9 +3809,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "opendal" -version = "0.57.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c9c85ce253ff87225e7669979d877a20c98a06604ec9d6dd5f4473e08f1ae1" +checksum = "97b31d3d8e99a85d83b73ec26647f5607b80578ed9375810b6e44ffa3590a236" dependencies = [ "opendal-core", "opendal-layer-retry", @@ -3805,9 +3821,9 @@ dependencies = [ [[package]] name = "opendal-core" -version = "0.57.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f8607c90e2c963a91467f50fb49fbc7fb3d573f88cea219ca59ccd3740b309" +checksum = "1849dd2687e173e776d3af5fce1ba3ae47b9dd37a09d1c4deba850ef45fe00ca" dependencies = [ "anyhow", "base64", @@ -3817,10 +3833,10 @@ dependencies = [ "http-body 1.0.1", "jiff", "log", - "md-5 0.11.0", + "md-5", "mea", "percent-encoding", - "quick-xml 0.39.4", + "quick-xml 0.38.4", "reqsign-core", "reqwest", "serde", @@ -3833,9 +3849,9 @@ dependencies = [ [[package]] name = "opendal-layer-retry" -version = "0.57.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2a25a718afb81fad81cb9a0580a1cb989221fa2317f888c6a37f8dad408eb7" +checksum = "4eac134ffa4ddda6131a640a84a5315996424b9416c85052f8c64c1a33b70ad4" dependencies = [ "backon", "log", @@ -3844,9 +3860,9 @@ dependencies = [ [[package]] name = "opendal-service-fs" -version = "0.57.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e89a665fef0e6bd249cf5ea47fc174b7ba892159bee4b9382528b1ca873a2c" +checksum = "cf0be0417abeeb0053376d816b90fceb9ca98f20dfb54ebf1f2a282729f83663" dependencies = [ "bytes", "log", @@ -3858,18 +3874,18 @@ dependencies = [ [[package]] name = "opendal-service-s3" -version = "0.57.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313d46c9f5ae70bca26b7c3e3fbb9b639292625f28af73aa016f47e788af9deb" +checksum = "9dadddeb9bb50b0d30927dd914c298c4ddca47e4c1cfa7674d311f0cf9b051c8" dependencies = [ "base64", "bytes", "crc32c", "http 1.4.0", "log", - "md-5 0.11.0", + "md-5", "opendal-core", - "quick-xml 0.39.4", + "quick-xml 0.38.4", "reqsign-aws-v4", "reqsign-core", "reqsign-file-read-tokio", @@ -3902,27 +3918,12 @@ dependencies = [ "syn", ] -[[package]] -name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - [[package]] name = "openssl-probe" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" -[[package]] -name = "openssl-src" -version = "300.6.1+3.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46eb8fb9fb3b61ce1c0f8a026c4c1a0714d3a9e138e7fbde78753ce2babc3846" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.116" @@ -3931,7 +3932,6 @@ checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -4067,9 +4067,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] name = "path_resolver" -version = "0.2.11" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a6d8be98ef9723e752c20eef948d3195d4e1314bc3cc033a8ff26b4e31d660" +checksum = "2a9f07f388f2a58768a34000c2b956bbc44f51630aa39d84f1d362c6785075a1" dependencies = [ "ahash", "fs-err", @@ -4537,6 +4537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" dependencies = [ "memchr", + "serde", ] [[package]] @@ -4728,23 +4729,20 @@ dependencies = [ [[package]] name = "rattler" -version = "0.46.0" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67961cc1ccb170208f10169542752dbe730353a874a13cb0749c13b960d72d5b" +checksum = "188a5ce39ea764f92fb4868ac74a722e27d33a52f3aba18be8ec705fba911cbd" dependencies = [ "anyhow", "astral-reqwest-middleware", - "base64", - "digest 0.11.3", + "digest 0.10.7", "dirs", "filetime", "fs-err", "futures", - "hex", "humantime", "indexmap 2.14.0", "itertools 0.14.0", - "jiff", "memchr", "memmap2", "once_cell", @@ -4775,20 +4773,19 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.10.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24205a6af611e71f346e5e170c32f00ce1a9b49077f699f18d8404e711dc2209" +checksum = "c2aa78ff1be938e28fdcdb9837f90da858d090ec1147a00a2aab8490c077f557" dependencies = [ "ahash", "anyhow", "astral-reqwest-middleware", "dashmap", - "digest 0.11.3", + "digest 0.10.7", "dirs", "fs-err", "fs4", "futures", - "hex", "itertools 0.14.0", "parking_lot", "rattler_conda_types", @@ -4809,11 +4806,12 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.47.2" +version = "0.46.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385575f3cfb4b9ce40c13d90b37964c80d8b527b62514118e4783ae0717b3ebd" +checksum = "6018a34d7edb8a6b97c971ba935e59d217a0986376d14f4d515fb238b28bdf02" dependencies = [ "ahash", + "chrono", "core-foundation 0.10.1", "dirs", "fancy-regex", @@ -4823,7 +4821,6 @@ dependencies = [ "hex", "indexmap 2.14.0", "itertools 0.14.0", - "jiff", "lazy-regex", "memmap2", "nom 8.0.0", @@ -4852,9 +4849,9 @@ dependencies = [ [[package]] name = "rattler_config" -version = "0.5.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0afcf9763975148e4cc805653de9146ff3542535895e37cdb1a06b2dd3d681af" +checksum = "e61e6eba72c2e8cc59f8fe7bd120eee4f0d34ed141ae1985ac5bd8c107261ecd" dependencies = [ "console", "fs-err", @@ -4863,49 +4860,48 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", - "toml", + "toml 0.9.8", "tracing", "url", ] [[package]] name = "rattler_digest" -version = "1.3.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4af3c4e8b0cf496e66a5f2e7244364409a20cd4338ad9b331bd7247de32b69" +checksum = "3c44304c9353802e910fac1dbdf6e16df44c341d07b1850bc1fd8b03912cbaab" dependencies = [ - "blake2 0.11.0-rc.6", - "digest 0.11.3", + "blake2", + "digest 0.10.7", "generic-array", "hex", - "md-5 0.11.0", + "md-5", "serde", "serde-untagged", "serde_bytes", "serde_with", - "sha2 0.11.0", + "sha2 0.10.9", "tokio", "url", ] [[package]] name = "rattler_index" -version = "0.30.7" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d078770093f35bfdd275aa0c34689ef989b76dcd37d4e3b31a668e98852e61" +checksum = "5a8bafd1bc5ad33a81d97a57fee3668406ad37b5f526a3658b019b34b72aa8ca" dependencies = [ "ahash", "anyhow", "bytes", + "chrono", "clap", "clap-verbosity-flag", "console", "fs-err", "futures", - "hex", "indexmap 2.14.0", "indicatif", - "jiff", "opendal", "rattler_conda_types", "rattler_config", @@ -4918,7 +4914,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", - "sha2 0.11.0", + "sha2 0.10.9", "tar", "thiserror 2.0.18", "tokio", @@ -4930,15 +4926,15 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.31.3" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec8b22e87f14a9ca2e55061f71b1d51d2dfb4aa1766babb95f06f6218d6733a" +checksum = "a0c0fe27729fd9081d25eb1a23d94f49f23ee93a75d59bac0ae3e304bda04aae" dependencies = [ "ahash", + "chrono", "file_url", "indexmap 2.14.0", "itertools 0.14.0", - "jiff", "pep440_rs", "pep508_rs", "rattler_conda_types", @@ -4959,9 +4955,9 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3d93067b745b200dd741e872f4160de24d1b972ee63db65e8a2cf6a447f1ff" +checksum = "9d44a87a904057524e32dc8beeb50197016cec467d487bce9d64e044adbcaeb5" dependencies = [ "quote", "syn", @@ -4969,14 +4965,14 @@ dependencies = [ [[package]] name = "rattler_menuinst" -version = "0.2.68" +version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957dbd0e8fb9ed66dce0bd6922914fb8bf795a4334d92e2190f34314a0b1f170" +checksum = "0ac99b44fac7a9e6cb4bd65cee12c3ec281db52284f6c85fc929b1d1b775cea8" dependencies = [ + "chrono", "configparser", "dirs", "fs-err", - "hex", "indexmap 2.14.0", "known-folders", "once_cell", @@ -4987,26 +4983,25 @@ dependencies = [ "regex", "serde", "serde_json", - "sha2 0.11.0", - "shlex 2.0.1", + "sha2 0.10.9", + "shlex", "tempfile", "thiserror 2.0.18", "tracing", "unicode-normalization", "which", "windows", - "windows-registry 0.5.3", + "windows-registry", ] [[package]] name = "rattler_networking" -version = "0.30.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5014e4f5aedcbe01a83a5be0e8669b305adc82cc10985fc83f51c5fe07e0d198" +checksum = "19984b40494bdbaf785525ba36fdb1fa487fe44a36b4214851af4428c69ecf27" dependencies = [ "ambient-id", "anyhow", - "apple-native-keyring-store", "astral-reqwest-middleware", "async-once-cell", "async-trait", @@ -5014,16 +5009,13 @@ dependencies = [ "aws-sdk-s3", "aws-smithy-http-client", "base64", - "dbus-secret-service-keyring-store", "dirs", "fs-err", - "futures", "getrandom 0.4.2", "google-cloud-auth", "http 1.4.0", - "http-auth", "itertools 0.14.0", - "keyring-core", + "keyring", "netrc-rs", "rattler_config", "reqwest", @@ -5035,31 +5027,28 @@ dependencies = [ "tokio", "tracing", "url", - "windows-native-keyring-store", ] [[package]] name = "rattler_package_streaming" -version = "0.26.6" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b4440ad7368a66ddd370a8160d8fb2a4d0a825b7a050f9c421dac350b37bed2" +checksum = "eefa295dc7b49aa0b67d125400561d2b45b754c66c0f7a19e8fc375b1056bfa9" dependencies = [ "astral-reqwest-middleware", "astral-tokio-tar", "astral_async_http_range_reader", - "astral_async_zip", + "astral_async_zip 0.0.17", "async-compression", "async-spooled-tempfile", "bzip2 0.6.1", - "filetime", + "chrono", "fs-err", "futures", "futures-util", "getrandom 0.2.16", "getrandom 0.4.2", - "hex", "http 1.4.0", - "jiff", "num_cpus", "rattler_conda_types", "rattler_digest", @@ -5081,9 +5070,9 @@ dependencies = [ [[package]] name = "rattler_pty" -version = "0.2.14" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19145200e8c578be6dca325fbacf375a57f86d4a7ccf85d2d8ee193ddfb10dd" +checksum = "30f42171f331905af5752aeba3bd1a539b73a35d0754b7db9f7d06a314ad913e" dependencies = [ "libc", "nix 0.30.1", @@ -5104,9 +5093,9 @@ dependencies = [ [[package]] name = "rattler_s3" -version = "0.2.6" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2a55757ecde8f53a17bc176d13061dda08485e3d1197dd7d9338e04ec7a3ca" +checksum = "58be09fc22d312cce5ac8158dd94950bb6ba080b23b352b4aa6d53a8dbec8fd4" dependencies = [ "aws-config", "aws-credential-types", @@ -5121,9 +5110,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.27.8" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9794276d154c19579fe7982ab2c1e9a960f0d51e5e56cd8d9fafe36373a71dd3" +checksum = "b57f7b11f6e6d0ef88e5d93b3ba5ea1c0cedeaa58195ec4e75680b465f38dc43" dependencies = [ "anyhow", "enum_dispatch", @@ -5133,7 +5122,7 @@ dependencies = [ "rattler_conda_types", "rattler_pty", "serde_json", - "shlex 2.0.1", + "shlex", "tempfile", "thiserror 2.0.18", "tokio", @@ -5142,13 +5131,13 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "7.2.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9bbdbf299cc4f9b363bd54a4e315be7e96c7645f0a75df5853405d0189ead6" +checksum = "eef2142527283596cad4f0b89f4fa0c87a2e20831bf8ef51422d72c9fc6bc316" dependencies = [ - "hex", + "chrono", + "humantime", "itertools 0.14.0", - "jiff", "rattler_conda_types", "rattler_digest", "serde", @@ -5243,9 +5232,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -5418,14 +5407,13 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0" +checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" dependencies = [ "base64", "bytes", "encoding_rs", - "futures-channel", "futures-core", "futures-util", "h2", @@ -5680,10 +5668,10 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ - "openssl-probe 0.2.1", + "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.7.0", + "security-framework 3.5.1", ] [[package]] @@ -5711,7 +5699,7 @@ dependencies = [ "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 3.7.0", + "security-framework 3.5.1", "security-framework-sys", "webpki-root-certs", "windows-sys 0.61.2", @@ -5777,15 +5765,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scc" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" -dependencies = [ - "sdd", -] - [[package]] name = "schannel" version = "0.1.28" @@ -5870,12 +5849,6 @@ dependencies = [ "sha2 0.10.9", ] -[[package]] -name = "sdd" -version = "3.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" - [[package]] name = "seahash" version = "4.1.0" @@ -5919,6 +5892,25 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secret-service" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" +dependencies = [ + "aes", + "cbc", + "futures-util", + "generic-array", + "hkdf", + "num", + "once_cell", + "rand 0.8.6", + "serde", + "sha2 0.10.9", + "zbus 4.4.0", +] + [[package]] name = "secret-service" version = "5.1.0" @@ -5935,7 +5927,7 @@ dependencies = [ "once_cell", "serde", "sha2 0.10.9", - "zbus", + "zbus 5.12.0", ] [[package]] @@ -5953,9 +5945,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.7.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ "bitflags", "core-foundation 0.10.1", @@ -5966,9 +5958,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.17.0" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -6066,9 +6058,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "indexmap 2.14.0", "itoa", @@ -6156,24 +6148,23 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911bd979bf1070a3f3aa7b691a3b3e9968f339ceeec89e08c280a8a22207a32f" +checksum = "699f4197115b8a7e7ff19c9a315a4bd6fffec26cc4626ef45ecaea389e081c6d" dependencies = [ "futures-executor", "futures-util", "log", "once_cell", "parking_lot", - "scc", "serial_test_derive", ] [[package]] name = "serial_test_derive" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7d91949b85b0d2fb687445e448b40d322b6b3e4af6b44a29b21d9a5f33e6d9" +checksum = "94e153fc76e1c6a068703d6d29c508a0b15c061c4b7e43da59cc097bc342673c" dependencies = [ "proc-macro2", "quote", @@ -6245,12 +6236,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "shlex" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" - [[package]] name = "signal-hook" version = "0.3.18" @@ -6767,6 +6752,21 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +dependencies = [ + "indexmap 2.14.0", + "serde_core", + "serde_spanned", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "toml_writer", + "winnow 0.7.13", +] + [[package]] name = "toml" version = "1.1.2+spec-1.1.0" @@ -7116,9 +7116,9 @@ dependencies = [ [[package]] name = "uv-auth" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c98b986380ba7b1674f408a8b3e34d278dc778e3b98388e3e7e0ba70c2744c3" +checksum = "be76cc89c2c82f9d46d7673642d212f9946226222b7f4107cdd9be0e78c31361" dependencies = [ "anyhow", "arcstr", @@ -7134,12 +7134,11 @@ dependencies = [ "reqsign", "reqwest", "rustc-hash", - "schemars 1.1.0", "serde", "serde_json", "thiserror 2.0.18", "tokio", - "toml", + "toml 1.1.2+spec-1.1.0", "tracing", "url", "uv-cache-key", @@ -7157,13 +7156,13 @@ dependencies = [ [[package]] name = "uv-build-backend" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e5c5e26b82a4d3face8c9de19904f85aba2f487444385a6f87eddc0c1a6e65" +checksum = "4da5ce0335b9bddce75e4765ac4a6aa6ca95d1a5b52c69a8daa22f8edf36fb87" dependencies = [ "astral-tokio-tar", "astral-version-ranges", - "astral_async_zip", + "astral_async_zip 0.0.18-rc4", "base64", "csv", "flate2", @@ -7181,9 +7180,10 @@ dependencies = [ "tempfile", "thiserror 2.0.18", "tokio", - "toml", + "toml 1.1.2+spec-1.1.0", "tracing", "uv-distribution-filename", + "uv-errors", "uv-fs", "uv-globfilter", "uv-macros", @@ -7202,9 +7202,9 @@ dependencies = [ [[package]] name = "uv-build-frontend" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "971b920b1d29aeb2cc14fe9158e0ee472c5bfd808029a101d8b1f1e1c7076f39" +checksum = "21c5c59ff4508facec34bbbcbbd6cdb1f395e262bc4c89991eb66ab66a49408d" dependencies = [ "anstream", "fs-err", @@ -7225,6 +7225,7 @@ dependencies = [ "uv-configuration", "uv-distribution", "uv-distribution-types", + "uv-errors", "uv-fs", "uv-normalize", "uv-pep440", @@ -7240,9 +7241,9 @@ dependencies = [ [[package]] name = "uv-cache" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e84e2babd3c69ce2718b3eaf87f2c10b42302ff5295794c767fc17f953f29ba7" +checksum = "84a71d2267b1b2f48780c4debe0f6ed7dca713f0581d5eab4a9d81079df56e2d" dependencies = [ "fs-err", "rmp-serde", @@ -7267,16 +7268,15 @@ dependencies = [ [[package]] name = "uv-cache-info" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4f82887751992d036204165d3e6b3103dcd294891e45495e8ea501d63c3de4" +checksum = "4e5c32d6c63e8f994036057f1479db15675489db912535697800a2f6afcceb99" dependencies = [ "fs-err", "globwalk", - "schemars 1.1.0", "serde", "thiserror 2.0.18", - "toml", + "toml 1.1.2+spec-1.1.0", "tracing", "uv-fs", "walkdir", @@ -7284,9 +7284,9 @@ dependencies = [ [[package]] name = "uv-cache-key" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeffea7d28d50879321b9576e61f7c6a3bcfaffe5834adb3bc60ca606cf22daf" +checksum = "8acc6d0807eccd9e82bf92308b4c135e10cfe7666c9ddb142f4ce8f60649467c" dependencies = [ "hex", "memchr", @@ -7298,16 +7298,16 @@ dependencies = [ [[package]] name = "uv-client" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a0bf1d5b1a8b593da052c301319c9bbd86763a234d0aa52f65a4940bbfba01" +checksum = "632d45b007c63ac3231f39f002479cc7cb0a2da5208b62ee1383aac4eb52a32a" dependencies = [ "anyhow", "astral-reqwest-middleware", "astral-reqwest-retry", "astral-tl", "astral_async_http_range_reader", - "astral_async_zip", + "astral_async_zip 0.0.18-rc4", "async-trait", "bytecheck", "fs-err", @@ -7339,6 +7339,7 @@ dependencies = [ "uv-distribution-filename", "uv-distribution-types", "uv-fs", + "uv-git", "uv-metadata", "uv-normalize", "uv-pep440", @@ -7359,9 +7360,9 @@ dependencies = [ [[package]] name = "uv-configuration" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece73a7fae99712e6e6478d7092a58ac520bd844d46ab0b40a2fb119c5588914" +checksum = "f43013d9ee6e133ba5ff278c4bb32512743096319e78ba749727656b7bf2f5af" dependencies = [ "clap", "either", @@ -7370,7 +7371,6 @@ dependencies = [ "reqwest", "rustc-hash", "same-file", - "schemars 1.1.0", "serde", "serde-untagged", "thiserror 2.0.18", @@ -7392,18 +7392,18 @@ dependencies = [ [[package]] name = "uv-console" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d0c1a219033c165b8e09c9b6871f8055379cdecb954066cd5f95c64877aeac" +checksum = "bcd2aa6b7730dd174171d30c2a86475ade0d2920a40d973314db63598a643946" dependencies = [ "console", ] [[package]] name = "uv-dirs" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2f35745647aef0c2f8342a74b5952b8f4901d8f228b3a119bafa6bd5f288b4" +checksum = "8ab2c7f83cd0d1ad4a8c3d2a617e8a85f629762896c19cd7b2830cefdfa81be1" dependencies = [ "etcetera", "fs-err", @@ -7413,9 +7413,9 @@ dependencies = [ [[package]] name = "uv-dispatch" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87be1345aac37937cfdabc52d24aa11c9f4d7c3967af82da659bd988395736fd" +checksum = "e69419d95443276ddd7d00c000530bae6f22c7ace7f25269eeffe4aeebcea670" dependencies = [ "anyhow", "futures", @@ -7432,6 +7432,7 @@ dependencies = [ "uv-distribution", "uv-distribution-filename", "uv-distribution-types", + "uv-errors", "uv-git", "uv-install-wheel", "uv-installer", @@ -7448,9 +7449,9 @@ dependencies = [ [[package]] name = "uv-distribution" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e45808e7063aae098be61f20793769f8f34bccd22c539239fbe5ffb2b66bd7b" +checksum = "42e7604f7e01cd90ae87e3f849e3575a803f748cd5a123365b04575b19229c3b" dependencies = [ "anyhow", "astral-reqwest-middleware", @@ -7466,7 +7467,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-util", - "toml", + "toml 1.1.2+spec-1.1.0", "tracing", "url", "uv-auth", @@ -7476,6 +7477,7 @@ dependencies = [ "uv-configuration", "uv-distribution-filename", "uv-distribution-types", + "uv-errors", "uv-extract", "uv-fastid", "uv-flags", @@ -7499,9 +7501,9 @@ dependencies = [ [[package]] name = "uv-distribution-filename" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8333b7032812b6c0c31e3cc1bce3ca021105cdf95650e9d174a364b0c288ad" +checksum = "2c3d9cdeab5495bd1bc4bc1d4e99ce49e81c17d8424b73346e6bf6bc3345be5c" dependencies = [ "memchr", "rkyv", @@ -7517,9 +7519,9 @@ dependencies = [ [[package]] name = "uv-distribution-types" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "192b18b9d7dbf27b27f7c845245eb078d84afc98a9b1ce1808a343e412f895c7" +checksum = "d7ca00bc558be5be332faae5685a56cb624a71fc9f4d430e9eb244772cba0875" dependencies = [ "arcstr", "astral-version-ranges", @@ -7533,7 +7535,6 @@ dependencies = [ "petgraph", "rkyv", "rustc-hash", - "schemars 1.1.0", "serde", "serde_json", "thiserror 2.0.18", @@ -7543,6 +7544,7 @@ dependencies = [ "uv-cache-info", "uv-cache-key", "uv-distribution-filename", + "uv-errors", "uv-fs", "uv-git-types", "uv-install-wheel", @@ -7556,20 +7558,33 @@ dependencies = [ "uv-warnings", ] +[[package]] +name = "uv-errors" +version = "0.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d4d71e3d8bb0489532ed8f2551117313ff1f1c7afcffb80d05fbd0cb777a35" +dependencies = [ + "anstream", + "owo-colors", + "terminal_size", + "textwrap", + "uv-static", +] + [[package]] name = "uv-extract" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ff5f57741c87e532b6ffea3554a5d2a86ca996d4fddd015a43aa2c616829a0" +checksum = "4fd1f7e28dad36179a1ef585e29bb68aa063560404d26f631b4a1f03accfbaa2" dependencies = [ "astral-tokio-tar", - "astral_async_zip", + "astral_async_zip 0.0.18-rc4", "async-compression", - "blake2 0.10.6", + "blake2", "flate2", "fs-err", "futures", - "md-5 0.10.6", + "md-5", "rayon", "regex", "reqwest", @@ -7589,9 +7604,9 @@ dependencies = [ [[package]] name = "uv-fastid" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647e136cd94eafe0897b7a2f9da441e7e5b99025bafc85aa244fb64895fb7b69" +checksum = "cad1b0118d25592ab6943b5bd0719037f179689402e0ef4731b0b84911494d7a" dependencies = [ "fastrand", "rand 0.9.4", @@ -7600,18 +7615,18 @@ dependencies = [ [[package]] name = "uv-flags" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b0b3d44cf27c21f442e66215a34220d373b4bea9c4c3c3e501a7e3a8ea0967" +checksum = "cf6ee7843c3190bb0f0a84fff98a2bdfcf5b649435271b059a159134b667d6d1" dependencies = [ "bitflags", ] [[package]] name = "uv-fs" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fefb3092aabb21035a13dea9b47abfcd3efd8a6cc73d7abd01cbe880f34a8f9" +checksum = "230e5c00ca3e4f1869462446d90dc9033e300a6dea22c65464bd50737cfc4f5a" dependencies = [ "backon", "clap", @@ -7626,7 +7641,6 @@ dependencies = [ "rustc-hash", "rustix", "same-file", - "schemars 1.1.0", "self-replace", "serde", "tempfile", @@ -7642,9 +7656,9 @@ dependencies = [ [[package]] name = "uv-git" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5161b54077f38c15daacb3ecb109169a19df91db143ea48544e621612c812fbd" +checksum = "afdf4d917e0606843aefba269a9868e88a2dcecc4f0541bc4a1d20a91aeabb96" dependencies = [ "anyhow", "astral-reqwest-middleware", @@ -7670,9 +7684,9 @@ dependencies = [ [[package]] name = "uv-git-types" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f645d67afba62135a26b3d9bdbe5d1c66e634c9388f450454b011fe6a4c246f" +checksum = "f3062dcd74521ab80782f566dee9a49e56ac2bcdedd28c7d4bb4167505bef196" dependencies = [ "percent-encoding", "serde", @@ -7686,24 +7700,24 @@ dependencies = [ [[package]] name = "uv-globfilter" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53f2b2d514f9f522eb50cfe68463ebc4dcbf4b55da08c7b32ab33fe9a9e9b1a" +checksum = "c42bb4d93d9b8271a0c853c6e3f1c79b6feebc43c9ecc3b31368394f78480884" dependencies = [ "globset", - "owo-colors", "regex", "regex-automata", "thiserror 2.0.18", "tracing", + "uv-errors", "walkdir", ] [[package]] name = "uv-install-wheel" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17927a0482093012f28aa8fae71a0391e9af877014a54fc884280cb9b7c6c671" +checksum = "16e8cf66aa16254404bf1b41accc6016ff8731a767284be8ce4876ea73a4bbcd" dependencies = [ "configparser", "csv", @@ -7737,9 +7751,9 @@ dependencies = [ [[package]] name = "uv-installer" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca4d27a627f53b675eedf82d9816318634a4f0c21a0ee3631c476d5cfaf920e" +checksum = "f1863e9a1040fa5cf9c9da3a2cf479025c88937c4eed40de218f3ebc912709d3" dependencies = [ "anyhow", "async-channel 2.5.0", @@ -7761,6 +7775,7 @@ dependencies = [ "uv-distribution", "uv-distribution-filename", "uv-distribution-types", + "uv-errors", "uv-fs", "uv-git-types", "uv-install-wheel", @@ -7780,14 +7795,14 @@ dependencies = [ [[package]] name = "uv-keyring" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e3fa05c83eb576cc9ab6aa0b8ff334e21a40f06781f4659e16697ec1271bf" +checksum = "e69f7b75a1fad0374f546a66045d84e02db84a11c9a993a1bba42f830f0d23c6" dependencies = [ "async-trait", "byteorder", - "secret-service", - "security-framework 3.7.0", + "secret-service 5.1.0", + "security-framework 3.5.1", "thiserror 2.0.18", "tokio", "windows", @@ -7796,9 +7811,9 @@ dependencies = [ [[package]] name = "uv-macros" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66a2dfd65330f530b3732596b4b825e8117df9c729160e60740be0e41bda131" +checksum = "aa961f313d021f66cfd169bc352161840261cebef88de0b6a63a731a135f7fac" dependencies = [ "proc-macro2", "quote", @@ -7808,11 +7823,11 @@ dependencies = [ [[package]] name = "uv-metadata" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fcde081232815f09c214606323a9f2c44777eae13f6cc8a566c7b5233f84ca5" +checksum = "5f7a3ab30606767b8fa94be855a4be1c5a0c31d1eadd09e9c8335adf087fcf28" dependencies = [ - "astral_async_zip", + "astral_async_zip 0.0.18-rc4", "fs-err", "futures", "thiserror 2.0.18", @@ -7826,9 +7841,9 @@ dependencies = [ [[package]] name = "uv-netrc" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ad9278f5561f3c3517e6897bce7159644865092c8e0bbc9c4b41d43e861d91" +checksum = "46136cae5e4ebf52b32e6730964ca83884012a7678260ed2062ad15e51548516" dependencies = [ "shellexpand", "thiserror 2.0.18", @@ -7836,9 +7851,9 @@ dependencies = [ [[package]] name = "uv-normalize" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257f6be4651d3174c102e90928ae09eff4d2733a357eed134927c76766803dcb" +checksum = "bd224ce80f17a08d0914a49a3bb140cefb212d696ceba625fee02e96f813faba" dependencies = [ "rkyv", "schemars 1.1.0", @@ -7848,9 +7863,9 @@ dependencies = [ [[package]] name = "uv-once-map" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d996e72f442854bc95f1de5c3fb1a14c423466ece29a2d09f71390d57a0fc9a6" +checksum = "86ab9c242d34bbb226be86201b67df6ee89bf7f7ef806240b933236ea00500f4" dependencies = [ "dashmap", "futures", @@ -7859,18 +7874,18 @@ dependencies = [ [[package]] name = "uv-options-metadata" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcffbbb1da88180ceae3237ff2c24b8226d86e987e613821cb23abe151673611" +checksum = "33d38fe998dbe938697b6b60615bbc856c16979c977c415ead72a43b89b0499c" dependencies = [ "serde", ] [[package]] name = "uv-pep440" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2adf7c92e996c612f1424a068fbe4dc5892aefab5d48e273f4be3a24527af1d" +checksum = "db407041874c2883667b5ecadd3c351046140e0f422cb634ae954072f1bb59a6" dependencies = [ "astral-version-ranges", "rkyv", @@ -7883,9 +7898,9 @@ dependencies = [ [[package]] name = "uv-pep508" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ae0e80ac467653e7f806ef66a8f1cd426fc0e6252861c58dfe008bd4995ef4" +checksum = "41d1412bf5df15d1aff640129337b0b9f96b470a1c43bbf2ad6e4d40059ad166" dependencies = [ "arcstr", "astral-version-ranges", @@ -7895,7 +7910,6 @@ dependencies = [ "regex", "rkyv", "rustc-hash", - "schemars 1.1.0", "serde", "smallvec", "temp-env", @@ -7911,9 +7925,9 @@ dependencies = [ [[package]] name = "uv-platform" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e626a22654f22960ecd76fcb70133e64a37cf72a9a905aa8b9cc24fa4510ee" +checksum = "ec535243fc1303c67c6eb791f1f1d603a43c9b1585c9a8c3b6e5a132f40480f0" dependencies = [ "fs-err", "goblin", @@ -7931,9 +7945,9 @@ dependencies = [ [[package]] name = "uv-platform-tags" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4992362880ac98d7079ca666482702579da10048f86c4866195bb2f3017c779f" +checksum = "490ffe2515b436b6db04292ecc95ec56ebb8f8a8e9997a9eea09d21f5d02d2ce" dependencies = [ "bitflags", "memchr", @@ -7946,9 +7960,9 @@ dependencies = [ [[package]] name = "uv-preview" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fb209e89efe055db64a00d77e088183a2e42cf36c559cd40d36829ca12725e" +checksum = "281222ba2fd6d185219b4b73639de147b87950a8d33ec5db7715281ff0d5f88e" dependencies = [ "enumflags2", "itertools 0.14.0", @@ -7958,9 +7972,9 @@ dependencies = [ [[package]] name = "uv-pypi-types" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a9bd15515fa59d87620e6d60c66886fc55dc32be419b7f4ab6bfd05fb39855" +checksum = "6e0742269570c9336526b6ab2a159d8f395a8c70f1e8d6fe08e4687b8856ddd7" dependencies = [ "hashbrown 0.17.1", "indexmap 2.14.0", @@ -7990,9 +8004,9 @@ dependencies = [ [[package]] name = "uv-python" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eeb9fe0750db4b2bd2c56348f9a2f1b24774e1f3e1e608a080b220fae266722" +checksum = "1f685d95987ba46ecd512d69a5aefbaedc0606ecb1aa7dc50f15d657295f17d1" dependencies = [ "anyhow", "astral-reqwest-middleware", @@ -8011,7 +8025,6 @@ dependencies = [ "rmp-serde", "rustc-hash", "same-file", - "schemars 1.1.0", "serde", "serde_json", "target-lexicon", @@ -8028,6 +8041,7 @@ dependencies = [ "uv-dirs", "uv-distribution-filename", "uv-distribution-types", + "uv-errors", "uv-extract", "uv-fs", "uv-install-wheel", @@ -8044,17 +8058,16 @@ dependencies = [ "uv-warnings", "which", "windows", - "windows-registry 0.5.3", + "windows-registry", ] [[package]] name = "uv-redacted" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a45b9fa1de375d748e1849beeb36bb998c90f608d5b28e00ec566ee251966e4" +checksum = "be81d771c6d8f604a830f2fa53033f43ee1cc7a8ef192b1be0007270ddc24f72" dependencies = [ "ref-cast", - "schemars 1.1.0", "serde", "thiserror 2.0.18", "url", @@ -8062,9 +8075,9 @@ dependencies = [ [[package]] name = "uv-requirements" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4ee308f2bc5b00124897e77d66bd63e63101c1fcfe883688bfdef12117a8ad" +checksum = "2f440d3bc7e7ade2f3c794a110209a82bf87cd52b9df5fc1f190fa4392422f47" dependencies = [ "anyhow", "configparser", @@ -8073,7 +8086,7 @@ dependencies = [ "futures", "rustc-hash", "thiserror 2.0.18", - "toml", + "toml 1.1.2+spec-1.1.0", "tracing", "url", "uv-cache-key", @@ -8098,9 +8111,9 @@ dependencies = [ [[package]] name = "uv-requirements-txt" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcadc5206a707995e6a4f5c01e108a76bbca0817531ea72bfb643e9f37cdfe5" +checksum = "eed3484410faab1c4efd43c7a60d430329df2b471a039c3b96b7f2566e4cb02a" dependencies = [ "astral-reqwest-middleware", "fs-err", @@ -8124,9 +8137,9 @@ dependencies = [ [[package]] name = "uv-resolver" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8334c6c2cef9eb2e76b56b72969543c2bcd1d5cd861f6ba081a0c2c2558e9" +checksum = "ff2d5402931a0ec12bc2b8518cd5a8d74bdc49abaabcdb995c2f4898e44b78ca" dependencies = [ "arcstr", "astral-pubgrub", @@ -8146,7 +8159,6 @@ dependencies = [ "rkyv", "rustc-hash", "same-file", - "schemars 1.1.0", "serde", "serde_json", "smallvec", @@ -8154,7 +8166,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-stream", - "toml", + "toml 1.1.2+spec-1.1.0", "toml_edit 0.25.11+spec-1.1.0", "tracing", "url", @@ -8165,6 +8177,7 @@ dependencies = [ "uv-distribution", "uv-distribution-filename", "uv-distribution-types", + "uv-errors", "uv-flags", "uv-fs", "uv-git", @@ -8191,9 +8204,9 @@ dependencies = [ [[package]] name = "uv-scripts" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da91770814e557d56a6df4259cdffdb6aa88dd2bf43872c06487ccf1c662fd01" +checksum = "a260207428b8e6464fa66f98cc692d3ed5ac0067784bb0a5a213021cabff38c5" dependencies = [ "fs-err", "indoc", @@ -8201,7 +8214,7 @@ dependencies = [ "regex", "serde", "thiserror 2.0.18", - "toml", + "toml 1.1.2+spec-1.1.0", "tracing", "url", "uv-configuration", @@ -8218,16 +8231,16 @@ dependencies = [ [[package]] name = "uv-settings" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0aba4d9f0ccaf036d837bacbb71d9317f11387ec01fc8954299b1240fee512" +checksum = "c77fe46c6d77e2458405fee9ab2fbd62eb63891f19076c9c1946105b11c52ee2" dependencies = [ "clap", "fs-err", "serde", "textwrap", "thiserror 2.0.18", - "toml", + "toml 1.1.2+spec-1.1.0", "tracing", "url", "uv-cache-info", @@ -8256,9 +8269,9 @@ dependencies = [ [[package]] name = "uv-shell" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "319f60953f2967e332e9eeb1ce6a289b79e0638364449ef35bb9ead804783894" +checksum = "86842bd97d969c958af97d1b2d47912098944c43040560a186f81cd395a344b9" dependencies = [ "anyhow", "fs-err", @@ -8268,14 +8281,14 @@ dependencies = [ "uv-fs", "uv-static", "windows", - "windows-registry 0.5.3", + "windows-registry", ] [[package]] name = "uv-small-str" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f65ceeb6548043baaa9c55df71569c545c4aad99c0eaa0c42e1acfa6c49e4d" +checksum = "48ba35f523f03b846bdd108d6d55d7230ab0dfca44a4ca933c2e335d5c6bb19f" dependencies = [ "arcstr", "rkyv", @@ -8285,20 +8298,19 @@ dependencies = [ [[package]] name = "uv-state" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2b7648aadfe0163c521155e2ea63b250f2f8b6133dfb52c575ad74e9deb644" +checksum = "a00c20444f3acdb4b86d0a40232481b52139ebf90bb093c5c64abcd958f4a7c9" dependencies = [ - "fs-err", "tempfile", "uv-dirs", ] [[package]] name = "uv-static" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08033c6ff8e05446d95cdaf4c41049fb17a5d58768b45c77e3b74ef6225e9962" +checksum = "615a750b1802854004654829f442cd681aaf4e75f9743bc59b41c0452911cc6e" dependencies = [ "thiserror 2.0.18", "uv-macros", @@ -8306,9 +8318,9 @@ dependencies = [ [[package]] name = "uv-toml" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77fbddce56a09a8f3225d0826a0c6ce8e663e3cc043f042f722ad6ce982bad0e" +checksum = "087ee7d61eef0301e84e92f32c2c1f136440ff75bce62e1b7b23997bf2962bb0" dependencies = [ "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", @@ -8316,14 +8328,13 @@ dependencies = [ [[package]] name = "uv-torch" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5889017314bf98523e03851b3693615d413b9c1080a44a0b931c796898696b85" +checksum = "26e3da71664497d517c734dcbc37d0e20ade88db6ea3eb599e7bd19777dcb552" dependencies = [ "clap", "either", "fs-err", - "schemars 1.1.0", "serde", "thiserror 2.0.18", "tracing", @@ -8338,12 +8349,12 @@ dependencies = [ [[package]] name = "uv-trampoline-builder" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a73d7cb80ffa866b96ddd591255a47f3bc84d3052476bd9c37cceb9e57ee40d7" +checksum = "667f3ed35d68b86720ba733ac96df3e97912478acda9164cf49332084ed61d7d" dependencies = [ "anyhow", - "astral_async_zip", + "astral_async_zip 0.0.18-rc4", "fs-err", "futures-lite", "goblin", @@ -8355,9 +8366,9 @@ dependencies = [ [[package]] name = "uv-types" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7b220e63f6b9a88d78a2f109362ecb516bcdaada6497c7bcd4727ea262d585" +checksum = "dfa0bfd1a25af75f67e29ed08c34b70ffa763c14e3d2417444c05ef92eacd9b6" dependencies = [ "anyhow", "dashmap", @@ -8367,6 +8378,7 @@ dependencies = [ "uv-configuration", "uv-distribution-filename", "uv-distribution-types", + "uv-errors", "uv-git", "uv-normalize", "uv-once-map", @@ -8379,15 +8391,15 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.11.15" +version = "0.11.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c5635618e743422a654e1c165dfd2ace841520cac50ce404460bd32681ef7b" +checksum = "27a94a07d0edd765c515b53357f612918367ff0ddad61869b04b48f3a602c08d" [[package]] name = "uv-virtualenv" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c317e140a95da9878211fa47590590d1d3d159a0b2ec86ec6c2cf3fb621ba539" +checksum = "d07968fe9955557ebfffaba211a4afbf2e500251d67fd865962d4d86b0e63c0d" dependencies = [ "console", "fs-err", @@ -8397,30 +8409,33 @@ dependencies = [ "thiserror 2.0.18", "tracing", "uv-console", + "uv-errors", "uv-fs", "uv-platform-tags", "uv-pypi-types", "uv-python", "uv-shell", "uv-version", + "uv-warnings", ] [[package]] name = "uv-warnings" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d724bd29c136a9628d728e33002f1794d54313bb0ecfa45890dbb60b5c5ecafa" +checksum = "3a1f5fcf07a64527dcbe3d04d25b1844d3ed9d09596ac93f4f7e14c49b63f98f" dependencies = [ "anstream", "owo-colors", "rustc-hash", + "uv-errors", ] [[package]] name = "uv-windows" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f24f06e0562a34ca019552750261f9c02d14d1df891aba3745ba572b5a0875" +checksum = "64d4019c928a6789fb747c6fbbe4a28b14cafc91fa123df1cba9beb596c401e6" dependencies = [ "arrayvec", "windows", @@ -8428,28 +8443,27 @@ dependencies = [ [[package]] name = "uv-workspace" -version = "0.0.48" +version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b02b407a337e75d8d96f83723a2699abf7e5dbdc7c9c3feec08e3c25ce564f" +checksum = "d2f1785ca5e44bd49cf463a35e4c14dfb5b9dcff89aca3e7f0a7988750a10c8e" dependencies = [ "clap", "fs-err", "glob", "ignore", "itertools 0.14.0", - "owo-colors", "rustc-hash", - "schemars 1.1.0", "serde", "thiserror 2.0.18", "tokio", - "toml", + "toml 1.1.2+spec-1.1.0", "toml_edit 0.25.11+spec-1.1.0", "tracing", "uv-build-backend", "uv-cache-key", "uv-configuration", "uv-distribution-types", + "uv-errors", "uv-fs", "uv-git-types", "uv-macros", @@ -8785,8 +8799,8 @@ dependencies = [ "windows-implement", "windows-interface", "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", + "windows-result", + "windows-strings", ] [[package]] @@ -8834,19 +8848,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-native-keyring-store" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063426e76fdec7438d56bb777f67e318a84a25c707b07e575cb8b78e10c028f8" -dependencies = [ - "byteorder", - "keyring-core", - "regex", - "windows-sys 0.61.2", - "zeroize", -] - [[package]] name = "windows-numerics" version = "0.2.0" @@ -8864,19 +8865,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" dependencies = [ "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -dependencies = [ - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-result", + "windows-strings", ] [[package]] @@ -8888,15 +8878,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link 0.2.1", -] - [[package]] name = "windows-strings" version = "0.4.2" @@ -8906,15 +8887,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link 0.2.1", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -9249,6 +9221,16 @@ dependencies = [ "rustix", ] +[[package]] +name = "xdg-home" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "xml-rs" version = "0.8.28" @@ -9299,6 +9281,44 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zbus" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.4.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.29.0", + "ordered-stream", + "rand 0.8.6", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.4.0", + "zbus_names 3.0.0", + "zvariant 4.2.0", +] + [[package]] name = "zbus" version = "5.12.0" @@ -9323,9 +9343,22 @@ dependencies = [ "uuid", "windows-sys 0.61.2", "winnow 0.7.13", - "zbus_macros", - "zbus_names", - "zvariant", + "zbus_macros 5.12.0", + "zbus_names 4.2.0", + "zvariant 5.8.0", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils 2.1.0", ] [[package]] @@ -9338,9 +9371,20 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zbus_names", - "zvariant", - "zvariant_utils", + "zbus_names 4.2.0", + "zvariant 5.8.0", + "zvariant_utils 3.2.1", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.2.0", ] [[package]] @@ -9352,7 +9396,7 @@ dependencies = [ "serde", "static_assertions", "winnow 0.7.13", - "zvariant", + "zvariant 5.8.0", ] [[package]] @@ -9516,6 +9560,19 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "zvariant" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive 4.2.0", +] + [[package]] name = "zvariant" version = "5.8.0" @@ -9526,8 +9583,21 @@ dependencies = [ "enumflags2", "serde", "winnow 0.7.13", - "zvariant_derive", - "zvariant_utils", + "zvariant_derive 5.8.0", + "zvariant_utils 3.2.1", +] + +[[package]] +name = "zvariant_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils 2.1.0", ] [[package]] @@ -9540,7 +9610,18 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zvariant_utils", + "zvariant_utils 3.2.1", +] + +[[package]] +name = "zvariant_utils" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] From 6b9932db44e5565aaaa537cca9dfc55f94110ba7 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 3 Jul 2026 15:36:34 +0200 Subject: [PATCH 3/7] WIP --- Cargo.lock | 578 +++++++++++++++++++++-------------------------------- 1 file changed, 223 insertions(+), 355 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe1331d..f567ee2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,6 +126,17 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +[[package]] +name = "apple-native-keyring-store" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7be2f067ccd8d4b4d4a66ddafe0f32a5dff31732f32dbff85fefc40929b1f72" +dependencies = [ + "keyring-core", + "log", + "security-framework", +] + [[package]] name = "arcstr" version = "1.2.0" @@ -282,24 +293,9 @@ dependencies = [ [[package]] name = "astral_async_zip" -version = "0.0.17" +version = "0.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab72a761e6085828cc8f0e05ed332b2554701368c5dc54de551bfaec466518ba" -dependencies = [ - "async-compression", - "crc32fast", - "futures-lite", - "pin-project", - "thiserror 1.0.69", - "tokio", - "tokio-util", -] - -[[package]] -name = "astral_async_zip" -version = "0.0.18-rc4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d523231a4339307c7699aa5d9492fe6873906afefc9d7853b5e7ffbfee3c7f1" +checksum = "c15fc5b591f19dfbbbce736615908d74f1d9252bb34b231873cb995f2a997ffb" dependencies = [ "async-compression", "crc32fast", @@ -377,17 +373,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" -dependencies = [ - "async-lock", - "blocking", - "futures-lite", -] - [[package]] name = "async-global-executor" version = "2.4.1" @@ -438,24 +423,6 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" -[[package]] -name = "async-process" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" -dependencies = [ - "async-channel 2.5.0", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.4.1", - "futures-lite", - "rustix", -] - [[package]] name = "async-recursion" version = "1.1.1" @@ -467,24 +434,6 @@ dependencies = [ "syn", ] -[[package]] -name = "async-signal" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.61.2", -] - [[package]] name = "async-spooled-tempfile" version = "0.1.0" @@ -821,7 +770,7 @@ dependencies = [ "hex", "http 0.2.12", "http-body 0.4.6", - "md-5", + "md-5 0.10.6", "pin-project-lite", "sha1", "sha2 0.10.9", @@ -1065,9 +1014,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.10.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "blake2" @@ -1078,6 +1027,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "blake2" +version = "0.11.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690" +dependencies = [ + "digest 0.11.3", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -1264,7 +1222,7 @@ dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex", + "shlex 1.3.0", ] [[package]] @@ -1392,6 +1350,12 @@ dependencies = [ "cc", ] +[[package]] +name = "cmov" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" + [[package]] name = "colorchoice" version = "1.0.4" @@ -1653,6 +1617,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "ctutils" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" +dependencies = [ + "cmov", +] + [[package]] name = "cyclonedx-bom" version = "0.8.1" @@ -1767,10 +1740,21 @@ dependencies = [ "hkdf", "num", "once_cell", + "openssl", "sha2 0.10.9", "zeroize", ] +[[package]] +name = "dbus-secret-service-keyring-store" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d8f54da401bb5eb2a4d873ac4b359f4a599df2ca8634bb5b8c045e5ee78757" +dependencies = [ + "dbus-secret-service", + "keyring-core", +] + [[package]] name = "der" version = "0.6.1" @@ -1837,6 +1821,7 @@ dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", "crypto-common 0.2.1", + "ctutils", ] [[package]] @@ -2099,9 +2084,9 @@ dependencies = [ [[package]] name = "fancy-regex" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8" +checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277" dependencies = [ "bit-set", "regex-automata", @@ -2720,6 +2705,15 @@ dependencies = [ "itoa", ] +[[package]] +name = "http-auth" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "150fa4a9462ef926824cf4519c84ed652ca8f4fbae34cb8af045b5cbcaf98822" +dependencies = [ + "memchr", +] + [[package]] name = "http-body" version = "0.4.6" @@ -3272,20 +3266,12 @@ dependencies = [ ] [[package]] -name = "keyring" -version = "3.6.3" +name = "keyring-core" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c" +checksum = "fb1e621458ca9c51aa110bd0339d4751a056b9576bf1253aee1aa560dda0fc9d" dependencies = [ - "byteorder", - "dbus-secret-service", "log", - "secret-service 4.0.0", - "security-framework 2.11.1", - "security-framework 3.5.1", - "windows-sys 0.60.2", - "zbus 4.4.0", - "zeroize", ] [[package]] @@ -3362,6 +3348,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cbe856efeb50e4681f010e9aaa2bf0a644e10139e54cde10fc83a307c23bd9f" dependencies = [ + "cc", "pkg-config", ] @@ -3477,6 +3464,16 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "md-5" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" +dependencies = [ + "cfg-if", + "digest 0.11.3", +] + [[package]] name = "mea" version = "0.6.3" @@ -3594,7 +3591,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework 3.5.1", + "security-framework", "security-framework-sys", "tempfile", ] @@ -3605,19 +3602,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2970fbbc8c785e8246234a7bd004ed66cd1ed1a35ec73669a92545e419b836" -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.30.1" @@ -3809,9 +3793,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "opendal" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b31d3d8e99a85d83b73ec26647f5607b80578ed9375810b6e44ffa3590a236" +checksum = "96c9c85ce253ff87225e7669979d877a20c98a06604ec9d6dd5f4473e08f1ae1" dependencies = [ "opendal-core", "opendal-layer-retry", @@ -3821,9 +3805,9 @@ dependencies = [ [[package]] name = "opendal-core" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1849dd2687e173e776d3af5fce1ba3ae47b9dd37a09d1c4deba850ef45fe00ca" +checksum = "c4f8607c90e2c963a91467f50fb49fbc7fb3d573f88cea219ca59ccd3740b309" dependencies = [ "anyhow", "base64", @@ -3833,10 +3817,10 @@ dependencies = [ "http-body 1.0.1", "jiff", "log", - "md-5", + "md-5 0.11.0", "mea", "percent-encoding", - "quick-xml 0.38.4", + "quick-xml 0.39.4", "reqsign-core", "reqwest", "serde", @@ -3849,9 +3833,9 @@ dependencies = [ [[package]] name = "opendal-layer-retry" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eac134ffa4ddda6131a640a84a5315996424b9416c85052f8c64c1a33b70ad4" +checksum = "7b2a25a718afb81fad81cb9a0580a1cb989221fa2317f888c6a37f8dad408eb7" dependencies = [ "backon", "log", @@ -3860,9 +3844,9 @@ dependencies = [ [[package]] name = "opendal-service-fs" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0be0417abeeb0053376d816b90fceb9ca98f20dfb54ebf1f2a282729f83663" +checksum = "22e89a665fef0e6bd249cf5ea47fc174b7ba892159bee4b9382528b1ca873a2c" dependencies = [ "bytes", "log", @@ -3874,18 +3858,18 @@ dependencies = [ [[package]] name = "opendal-service-s3" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dadddeb9bb50b0d30927dd914c298c4ddca47e4c1cfa7674d311f0cf9b051c8" +checksum = "313d46c9f5ae70bca26b7c3e3fbb9b639292625f28af73aa016f47e788af9deb" dependencies = [ "base64", "bytes", "crc32c", "http 1.4.0", "log", - "md-5", + "md-5 0.11.0", "opendal-core", - "quick-xml 0.38.4", + "quick-xml 0.39.4", "reqsign-aws-v4", "reqsign-core", "reqsign-file-read-tokio", @@ -3924,6 +3908,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +[[package]] +name = "openssl-src" +version = "300.6.1+3.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46eb8fb9fb3b61ce1c0f8a026c4c1a0714d3a9e138e7fbde78753ce2babc3846" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.116" @@ -3932,6 +3925,7 @@ checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -4067,9 +4061,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] name = "path_resolver" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9f07f388f2a58768a34000c2b956bbc44f51630aa39d84f1d362c6785075a1" +checksum = "83a6d8be98ef9723e752c20eef948d3195d4e1314bc3cc033a8ff26b4e31d660" dependencies = [ "ahash", "fs-err", @@ -4537,7 +4531,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" dependencies = [ "memchr", - "serde", ] [[package]] @@ -4729,20 +4722,23 @@ dependencies = [ [[package]] name = "rattler" -version = "0.43.2" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "188a5ce39ea764f92fb4868ac74a722e27d33a52f3aba18be8ec705fba911cbd" +checksum = "67961cc1ccb170208f10169542752dbe730353a874a13cb0749c13b960d72d5b" dependencies = [ "anyhow", "astral-reqwest-middleware", - "digest 0.10.7", + "base64", + "digest 0.11.3", "dirs", "filetime", "fs-err", "futures", + "hex", "humantime", "indexmap 2.14.0", "itertools 0.14.0", + "jiff", "memchr", "memmap2", "once_cell", @@ -4773,19 +4769,20 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.8.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2aa78ff1be938e28fdcdb9837f90da858d090ec1147a00a2aab8490c077f557" +checksum = "24205a6af611e71f346e5e170c32f00ce1a9b49077f699f18d8404e711dc2209" dependencies = [ "ahash", "anyhow", "astral-reqwest-middleware", "dashmap", - "digest 0.10.7", + "digest 0.11.3", "dirs", "fs-err", "fs4", "futures", + "hex", "itertools 0.14.0", "parking_lot", "rattler_conda_types", @@ -4806,12 +4803,11 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.46.4" +version = "0.47.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6018a34d7edb8a6b97c971ba935e59d217a0986376d14f4d515fb238b28bdf02" +checksum = "385575f3cfb4b9ce40c13d90b37964c80d8b527b62514118e4783ae0717b3ebd" dependencies = [ "ahash", - "chrono", "core-foundation 0.10.1", "dirs", "fancy-regex", @@ -4821,6 +4817,7 @@ dependencies = [ "hex", "indexmap 2.14.0", "itertools 0.14.0", + "jiff", "lazy-regex", "memmap2", "nom 8.0.0", @@ -4849,9 +4846,9 @@ dependencies = [ [[package]] name = "rattler_config" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61e6eba72c2e8cc59f8fe7bd120eee4f0d34ed141ae1985ac5bd8c107261ecd" +checksum = "0afcf9763975148e4cc805653de9146ff3542535895e37cdb1a06b2dd3d681af" dependencies = [ "console", "fs-err", @@ -4860,48 +4857,49 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", - "toml 0.9.8", + "toml", "tracing", "url", ] [[package]] name = "rattler_digest" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c44304c9353802e910fac1dbdf6e16df44c341d07b1850bc1fd8b03912cbaab" +checksum = "2e4af3c4e8b0cf496e66a5f2e7244364409a20cd4338ad9b331bd7247de32b69" dependencies = [ - "blake2", - "digest 0.10.7", + "blake2 0.11.0-rc.6", + "digest 0.11.3", "generic-array", "hex", - "md-5", + "md-5 0.11.0", "serde", "serde-untagged", "serde_bytes", "serde_with", - "sha2 0.10.9", + "sha2 0.11.0", "tokio", "url", ] [[package]] name = "rattler_index" -version = "0.30.1" +version = "0.30.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8bafd1bc5ad33a81d97a57fee3668406ad37b5f526a3658b019b34b72aa8ca" +checksum = "26d078770093f35bfdd275aa0c34689ef989b76dcd37d4e3b31a668e98852e61" dependencies = [ "ahash", "anyhow", "bytes", - "chrono", "clap", "clap-verbosity-flag", "console", "fs-err", "futures", + "hex", "indexmap 2.14.0", "indicatif", + "jiff", "opendal", "rattler_conda_types", "rattler_config", @@ -4914,7 +4912,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", - "sha2 0.10.9", + "sha2 0.11.0", "tar", "thiserror 2.0.18", "tokio", @@ -4926,15 +4924,15 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.30.3" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c0fe27729fd9081d25eb1a23d94f49f23ee93a75d59bac0ae3e304bda04aae" +checksum = "4ec8b22e87f14a9ca2e55061f71b1d51d2dfb4aa1766babb95f06f6218d6733a" dependencies = [ "ahash", - "chrono", "file_url", "indexmap 2.14.0", "itertools 0.14.0", + "jiff", "pep440_rs", "pep508_rs", "rattler_conda_types", @@ -4955,9 +4953,9 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d44a87a904057524e32dc8beeb50197016cec467d487bce9d64e044adbcaeb5" +checksum = "ac3d93067b745b200dd741e872f4160de24d1b972ee63db65e8a2cf6a447f1ff" dependencies = [ "quote", "syn", @@ -4965,14 +4963,14 @@ dependencies = [ [[package]] name = "rattler_menuinst" -version = "0.2.62" +version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ac99b44fac7a9e6cb4bd65cee12c3ec281db52284f6c85fc929b1d1b775cea8" +checksum = "957dbd0e8fb9ed66dce0bd6922914fb8bf795a4334d92e2190f34314a0b1f170" dependencies = [ - "chrono", "configparser", "dirs", "fs-err", + "hex", "indexmap 2.14.0", "known-folders", "once_cell", @@ -4983,8 +4981,8 @@ dependencies = [ "regex", "serde", "serde_json", - "sha2 0.10.9", - "shlex", + "sha2 0.11.0", + "shlex 2.0.1", "tempfile", "thiserror 2.0.18", "tracing", @@ -4996,12 +4994,13 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19984b40494bdbaf785525ba36fdb1fa487fe44a36b4214851af4428c69ecf27" +checksum = "5014e4f5aedcbe01a83a5be0e8669b305adc82cc10985fc83f51c5fe07e0d198" dependencies = [ "ambient-id", "anyhow", + "apple-native-keyring-store", "astral-reqwest-middleware", "async-once-cell", "async-trait", @@ -5009,13 +5008,16 @@ dependencies = [ "aws-sdk-s3", "aws-smithy-http-client", "base64", + "dbus-secret-service-keyring-store", "dirs", "fs-err", + "futures", "getrandom 0.4.2", "google-cloud-auth", "http 1.4.0", + "http-auth", "itertools 0.14.0", - "keyring", + "keyring-core", "netrc-rs", "rattler_config", "reqwest", @@ -5027,28 +5029,31 @@ dependencies = [ "tokio", "tracing", "url", + "windows-native-keyring-store", ] [[package]] name = "rattler_package_streaming" -version = "0.26.2" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eefa295dc7b49aa0b67d125400561d2b45b754c66c0f7a19e8fc375b1056bfa9" +checksum = "2b4440ad7368a66ddd370a8160d8fb2a4d0a825b7a050f9c421dac350b37bed2" dependencies = [ "astral-reqwest-middleware", "astral-tokio-tar", "astral_async_http_range_reader", - "astral_async_zip 0.0.17", + "astral_async_zip", "async-compression", "async-spooled-tempfile", "bzip2 0.6.1", - "chrono", + "filetime", "fs-err", "futures", "futures-util", "getrandom 0.2.16", "getrandom 0.4.2", + "hex", "http 1.4.0", + "jiff", "num_cpus", "rattler_conda_types", "rattler_digest", @@ -5070,9 +5075,9 @@ dependencies = [ [[package]] name = "rattler_pty" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30f42171f331905af5752aeba3bd1a539b73a35d0754b7db9f7d06a314ad913e" +checksum = "d19145200e8c578be6dca325fbacf375a57f86d4a7ccf85d2d8ee193ddfb10dd" dependencies = [ "libc", "nix 0.30.1", @@ -5093,9 +5098,9 @@ dependencies = [ [[package]] name = "rattler_s3" -version = "0.2.2" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58be09fc22d312cce5ac8158dd94950bb6ba080b23b352b4aa6d53a8dbec8fd4" +checksum = "3e2a55757ecde8f53a17bc176d13061dda08485e3d1197dd7d9338e04ec7a3ca" dependencies = [ "aws-config", "aws-credential-types", @@ -5110,9 +5115,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.27.2" +version = "0.27.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57f7b11f6e6d0ef88e5d93b3ba5ea1c0cedeaa58195ec4e75680b465f38dc43" +checksum = "9794276d154c19579fe7982ab2c1e9a960f0d51e5e56cd8d9fafe36373a71dd3" dependencies = [ "anyhow", "enum_dispatch", @@ -5122,7 +5127,7 @@ dependencies = [ "rattler_conda_types", "rattler_pty", "serde_json", - "shlex", + "shlex 2.0.1", "tempfile", "thiserror 2.0.18", "tokio", @@ -5131,13 +5136,13 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "7.1.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef2142527283596cad4f0b89f4fa0c87a2e20831bf8ef51422d72c9fc6bc316" +checksum = "0a9bbdbf299cc4f9b363bd54a4e315be7e96c7645f0a75df5853405d0189ead6" dependencies = [ - "chrono", - "humantime", + "hex", "itertools 0.14.0", + "jiff", "rattler_conda_types", "rattler_digest", "serde", @@ -5232,9 +5237,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -5671,7 +5676,7 @@ dependencies = [ "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.5.1", + "security-framework", ] [[package]] @@ -5699,7 +5704,7 @@ dependencies = [ "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 3.5.1", + "security-framework", "security-framework-sys", "webpki-root-certs", "windows-sys 0.61.2", @@ -5892,25 +5897,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secret-service" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" -dependencies = [ - "aes", - "cbc", - "futures-util", - "generic-array", - "hkdf", - "num", - "once_cell", - "rand 0.8.6", - "serde", - "sha2 0.10.9", - "zbus 4.4.0", -] - [[package]] name = "secret-service" version = "5.1.0" @@ -5927,27 +5913,14 @@ dependencies = [ "once_cell", "serde", "sha2 0.10.9", - "zbus 5.12.0", + "zbus", ] [[package]] name = "security-framework" -version = "2.11.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ "bitflags", "core-foundation 0.10.1", @@ -5958,9 +5931,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.15.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", @@ -6236,6 +6209,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + [[package]] name = "signal-hook" version = "0.3.18" @@ -6752,21 +6731,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" -dependencies = [ - "indexmap 2.14.0", - "serde_core", - "serde_spanned", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "toml_writer", - "winnow 0.7.13", -] - [[package]] name = "toml" version = "1.1.2+spec-1.1.0" @@ -7138,7 +7102,7 @@ dependencies = [ "serde_json", "thiserror 2.0.18", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-cache-key", @@ -7162,7 +7126,7 @@ checksum = "4da5ce0335b9bddce75e4765ac4a6aa6ca95d1a5b52c69a8daa22f8edf36fb87" dependencies = [ "astral-tokio-tar", "astral-version-ranges", - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "base64", "csv", "flate2", @@ -7180,7 +7144,7 @@ dependencies = [ "tempfile", "thiserror 2.0.18", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "uv-distribution-filename", "uv-errors", @@ -7276,7 +7240,7 @@ dependencies = [ "globwalk", "serde", "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "uv-fs", "walkdir", @@ -7307,7 +7271,7 @@ dependencies = [ "astral-reqwest-retry", "astral-tl", "astral_async_http_range_reader", - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "async-trait", "bytecheck", "fs-err", @@ -7467,7 +7431,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-util", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-auth", @@ -7578,13 +7542,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fd1f7e28dad36179a1ef585e29bb68aa063560404d26f631b4a1f03accfbaa2" dependencies = [ "astral-tokio-tar", - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "async-compression", - "blake2", + "blake2 0.10.6", "flate2", "fs-err", "futures", - "md-5", + "md-5 0.10.6", "rayon", "regex", "reqwest", @@ -7801,8 +7765,8 @@ checksum = "e69f7b75a1fad0374f546a66045d84e02db84a11c9a993a1bba42f830f0d23c6" dependencies = [ "async-trait", "byteorder", - "secret-service 5.1.0", - "security-framework 3.5.1", + "secret-service", + "security-framework", "thiserror 2.0.18", "tokio", "windows", @@ -7827,7 +7791,7 @@ version = "0.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f7a3ab30606767b8fa94be855a4be1c5a0c31d1eadd09e9c8335adf087fcf28" dependencies = [ - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "fs-err", "futures", "thiserror 2.0.18", @@ -8086,7 +8050,7 @@ dependencies = [ "futures", "rustc-hash", "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-cache-key", @@ -8166,7 +8130,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-stream", - "toml 1.1.2+spec-1.1.0", + "toml", "toml_edit 0.25.11+spec-1.1.0", "tracing", "url", @@ -8214,7 +8178,7 @@ dependencies = [ "regex", "serde", "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-configuration", @@ -8240,7 +8204,7 @@ dependencies = [ "serde", "textwrap", "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "toml", "tracing", "url", "uv-cache-info", @@ -8354,7 +8318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "667f3ed35d68b86720ba733ac96df3e97912478acda9164cf49332084ed61d7d" dependencies = [ "anyhow", - "astral_async_zip 0.0.18-rc4", + "astral_async_zip", "fs-err", "futures-lite", "goblin", @@ -8456,7 +8420,7 @@ dependencies = [ "serde", "thiserror 2.0.18", "tokio", - "toml 1.1.2+spec-1.1.0", + "toml", "toml_edit 0.25.11+spec-1.1.0", "tracing", "uv-build-backend", @@ -8848,6 +8812,19 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-native-keyring-store" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063426e76fdec7438d56bb777f67e318a84a25c707b07e575cb8b78e10c028f8" +dependencies = [ + "byteorder", + "keyring-core", + "regex", + "windows-sys 0.61.2", + "zeroize", +] + [[package]] name = "windows-numerics" version = "0.2.0" @@ -9221,16 +9198,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "xml-rs" version = "0.8.28" @@ -9281,44 +9248,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zbus" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener 5.4.1", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.29.0", - "ordered-stream", - "rand 0.8.6", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.4.0", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - [[package]] name = "zbus" version = "5.12.0" @@ -9343,22 +9272,9 @@ dependencies = [ "uuid", "windows-sys 0.61.2", "winnow 0.7.13", - "zbus_macros 5.12.0", - "zbus_names 4.2.0", - "zvariant 5.8.0", -] - -[[package]] -name = "zbus_macros" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", - "zvariant_utils 2.1.0", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] @@ -9371,20 +9287,9 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zbus_names 4.2.0", - "zvariant 5.8.0", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.2.0", + "zbus_names", + "zvariant", + "zvariant_utils", ] [[package]] @@ -9396,7 +9301,7 @@ dependencies = [ "serde", "static_assertions", "winnow 0.7.13", - "zvariant 5.8.0", + "zvariant", ] [[package]] @@ -9560,19 +9465,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "zvariant" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive 4.2.0", -] - [[package]] name = "zvariant" version = "5.8.0" @@ -9583,21 +9475,8 @@ dependencies = [ "enumflags2", "serde", "winnow 0.7.13", - "zvariant_derive 5.8.0", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zvariant_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", - "zvariant_utils 2.1.0", + "zvariant_derive", + "zvariant_utils", ] [[package]] @@ -9610,18 +9489,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zvariant_utils" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "zvariant_utils", ] [[package]] From b88cb44bb810c57d0f55d0955327c8dbc2c0bff5 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 3 Jul 2026 15:42:43 +0200 Subject: [PATCH 4/7] fix build? --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c68ecae..92b700c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,6 +72,12 @@ jobs: key: build-${{ matrix.target }}-${{ matrix.os }} - name: Build + env: + # GCC on aarch64 defaults to outline atomics, emitting calls to + # __aarch64_*_sync helpers that live in libgcc. Static musl builds link + # with -nodefaultlibs, so those symbols are unresolved (libdbus-sys, a C + # dependency of rattler's keyring backend, hits this). Inline the atomics. + CFLAGS_aarch64_unknown_linux_musl: -mno-outline-atomics run: | cargo build --profile release --locked --color always${{ endsWith(matrix.target, 'musl') && ' --no-default-features --features rustls-tls' || '' }} --target ${{ matrix.target }} --bins mv target/${{ matrix.target }}/release/pixi-pack${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }} pixi-pack-${{ matrix.target }}${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }} From bb7fdb812231b8de517d3233014b059832ad5afe Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 3 Jul 2026 15:44:44 +0200 Subject: [PATCH 5/7] enable feature --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 36b70c5..c8a046c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,6 +43,7 @@ rattler_networking = { version = "0.30.0", default-features = false, features = "s3", "gcs", "rattler_config", + "system-integration", ] } rattler_package_streaming = { version = "0.26.6", default-features = false } rattler_shell = "0.27.8" From a8043dbc3246f319478b601b901982e523ea8e0f Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 3 Jul 2026 15:45:46 +0200 Subject: [PATCH 6/7] .. --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c8a046c..b3f6b17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,10 +16,10 @@ default = ["native-tls"] native-tls = [ "reqwest/native-tls", "rattler/native-tls", - "rattler_networking/rustls", - "rattler_package_streaming/rustls", + "rattler_networking/native-tls", + "rattler_package_streaming/native-tls", ] -rustls-tls = [ +rustls = [ "reqwest/rustls", "rattler/rustls", "rattler_networking/rustls", From aa59b93af069e9e9504588a9c7a2a72c6761a97a Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Fri, 3 Jul 2026 15:46:57 +0200 Subject: [PATCH 7/7] fix --- .github/workflows/build.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92b700c..b3ec0ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,7 +79,7 @@ jobs: # dependency of rattler's keyring backend, hits this). Inline the atomics. CFLAGS_aarch64_unknown_linux_musl: -mno-outline-atomics run: | - cargo build --profile release --locked --color always${{ endsWith(matrix.target, 'musl') && ' --no-default-features --features rustls-tls' || '' }} --target ${{ matrix.target }} --bins + cargo build --profile release --locked --color always${{ endsWith(matrix.target, 'musl') && ' --no-default-features --features rustls' || '' }} --target ${{ matrix.target }} --bins mv target/${{ matrix.target }}/release/pixi-pack${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }} pixi-pack-${{ matrix.target }}${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }} mv target/${{ matrix.target }}/release/pixi-unpack${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }} pixi-unpack-${{ matrix.target }}${{ endsWith(matrix.target, 'windows-msvc') && '.exe' || '' }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72784d7..901f6c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,4 +69,4 @@ jobs: with: key: tests - name: Run test - run: pixi run test --color always${{ startsWith(matrix.os, 'ubuntu') && ' --no-default-features --features rustls-tls' || '' }} + run: pixi run test --color always${{ startsWith(matrix.os, 'ubuntu') && ' --no-default-features --features rustls' || '' }}