diff --git a/Cargo.lock b/Cargo.lock index ef9aadfe1..5239b2b00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,20 +131,22 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.9.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener 3.1.0", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "bzip2", "flate2", @@ -162,11 +164,11 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 1.13.0", "slab", ] @@ -176,10 +178,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -188,11 +190,11 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", "polling 2.8.0", @@ -204,18 +206,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10da8f3146014722c89e7859e1d7bb97873125d7346d10ca642ffab794355828" +checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" dependencies = [ - "async-lock", + "async-lock 3.1.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite", + "futures-lite 2.0.1", "parking", "polling 3.3.0", - "rustix 0.38.21", + "rustix 0.38.24", "slab", "tracing", "waker-fn", @@ -231,6 +233,17 @@ dependencies = [ "event-listener 2.5.3", ] +[[package]] +name = "async-lock" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +dependencies = [ + "event-listener 3.1.0", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-process" version = "1.8.1" @@ -238,13 +251,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ "async-io 1.13.0", - "async-lock", + "async-lock 2.8.0", "async-signal", "blocking", "cfg-if", - "event-listener 3.0.1", - "futures-lite", - "rustix 0.38.21", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.24", "windows-sys 0.48.0", ] @@ -256,7 +269,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -265,13 +278,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.1.0", - "async-lock", + "async-io 2.2.0", + "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.21", + "rustix 0.38.24", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -291,7 +304,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -396,25 +409,25 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock", + "async-lock 3.1.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite", + "futures-lite 2.0.1", "piper", "tracing", ] [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -519,9 +532,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -539,9 +552,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -558,7 +571,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -736,7 +749,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -747,7 +760,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -854,7 +867,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -875,7 +888,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -886,9 +899,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -902,15 +915,25 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.1.0", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -1065,6 +1088,16 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.29" @@ -1073,7 +1106,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1133,9 +1166,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1182,9 +1215,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes 1.5.0", "fnv", @@ -1192,7 +1225,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -1252,9 +1285,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes 1.5.0", "fnv", @@ -1498,7 +1531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.21", + "rustix 0.38.24", "windows-sys 0.48.0", ] @@ -1517,6 +1550,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1569,9 +1611,9 @@ dependencies = [ [[package]] name = "lazy-regex" -version = "3.0.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e723bd417b2df60a0f6a2b6825f297ea04b245d4ba52b5a22cb679bdf58b05fa" +checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c" dependencies = [ "lazy-regex-proc_macros", "once_cell", @@ -1580,14 +1622,14 @@ dependencies = [ [[package]] name = "lazy-regex-proc_macros" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f" +checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1598,9 +1640,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" @@ -1618,6 +1660,17 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "line-wrap" version = "0.1.1" @@ -1651,9 +1704,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -1762,7 +1815,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1773,9 +1826,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minijinja" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f98b09920c8be9ff96a5625aca5b5db7a4f4ba025132ff7d7aacb72c0244a45" +checksum = "208758577ef2c86cf5dd3e85730d161413ec3284e2d73b2ef65d9a24d9971bcb" dependencies = [ "aho-corasick", "serde", @@ -1981,9 +2034,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.58" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dfc0783362704e97ef3bd24261995a699468440099ef95d869b4d9732f829a" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -2002,7 +2055,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2013,9 +2066,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.94" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f55da20b29f956fb01f0add8683eb26ee13ebe3ebd935e49898717c6b4b2830" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -2060,7 +2113,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2163,12 +2216,12 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "plist" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ "base64", - "indexmap 1.9.3", + "indexmap 2.1.0", "line-wrap", "quick-xml", "serde", @@ -2200,7 +2253,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.21", + "rustix 0.38.24", "tracing", "windows-sys 0.48.0", ] @@ -2268,9 +2321,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -2322,8 +2375,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9536d239746f35977a554914f6ff5ca3eef4136d7760e60d8acc9aefa4bfda03" dependencies = [ "anyhow", "async-compression", @@ -2334,7 +2388,7 @@ dependencies = [ "futures 0.3.29", "fxhash", "hex", - "itertools", + "itertools 0.11.0", "memchr", "memmap2", "nom", @@ -2380,7 +2434,7 @@ dependencies = [ "ignore", "indicatif", "insta", - "itertools", + "itertools 0.12.0", "linked-hash-map", "marked-yaml", "miette", @@ -2421,15 +2475,16 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dc52b94ac685c83537162befed0ab7514f764a5ee5d277f530342eb335f56ea" dependencies = [ "chrono", "fxhash", "glob", "hex", "indexmap 2.1.0", - "itertools", + "itertools 0.11.0", "lazy-regex", "nom", "rattler_digest", @@ -2449,8 +2504,9 @@ dependencies = [ [[package]] name = "rattler_digest" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "450a6b3b1faf486f1b9389f06abe08dacd2fb7fe5a40fd9562769debb34cfa42" dependencies = [ "blake2", "digest", @@ -2464,17 +2520,19 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24448132cde45c82bc2a1067ea9ff03ee410adc298775843b905d86570b05d43" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "rattler_networking" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f63becf3b45003ef2a033753599c9667c1a0374fcbee15cb7baef64aa74dbd6" dependencies = [ "anyhow", "dirs", @@ -2492,13 +2550,14 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3408e3e140f040a9e67438749c8857bc48927ac1d4d86b049b75f91d60312bc" dependencies = [ "bzip2", "chrono", "futures-util", - "itertools", + "itertools 0.11.0", "rattler_conda_types", "rattler_digest", "rattler_networking", @@ -2515,8 +2574,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308293d0577edd89e2815573ea4537c4604f5916c36dcd838dbfdce2d57f5788" dependencies = [ "anyhow", "async-compression", @@ -2527,7 +2587,7 @@ dependencies = [ "hex", "humansize", "humantime", - "itertools", + "itertools 0.11.0", "json-patch", "libc", "md-5", @@ -2553,12 +2613,13 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b4e9396c35302b611e9fa72b1d2261ab49b4ede56b020f77a7dd3ad6d785fa2" dependencies = [ "enum_dispatch", "indexmap 2.1.0", - "itertools", + "itertools 0.11.0", "rattler_conda_types", "serde_json", "shlex", @@ -2570,13 +2631,14 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447056088888f7fd2048129b0dcf34249a84e5cec28387d642817a8ceee3a00c" dependencies = [ "anyhow", "chrono", "hex", - "itertools", + "itertools 0.11.0", "rattler_conda_types", "rattler_digest", "resolvo", @@ -2589,8 +2651,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "0.11.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#b66d75344e0fccdbaf73d24a7628d17a7b42c3e7" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b844fcc49253aceb4ce2af0cfea1839535d1bc0cbcf996b8020e753f820ba338" dependencies = [ "cfg-if", "libloading", @@ -2624,15 +2687,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -2653,12 +2707,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -2760,13 +2814,13 @@ dependencies = [ [[package]] name = "resolvo" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dab30801b54723f1949c6453a35db09c89e2ce7e052dc63e715f32fb40e427c" +checksum = "554db165775d6858d17a9626c327b796d81db95db0a4cd6ca0efdfb7e7e3a264" dependencies = [ "bitvec", "elsa", - "itertools", + "itertools 0.11.0", "petgraph", "tracing", ] @@ -2821,7 +2875,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.38", + "syn 2.0.39", "unicode-ident", ] @@ -2830,7 +2884,7 @@ name = "rust-tests" version = "0.1.0" dependencies = [ "glob", - "itertools", + "itertools 0.12.0", "rattler_package_streaming", "serde_json", "sha1", @@ -2867,14 +2921,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] @@ -2892,9 +2946,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64", ] @@ -2968,7 +3022,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3031,22 +3085,22 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3069,7 +3123,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3110,7 +3164,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3189,9 +3243,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" dependencies = [ "serde", ] @@ -3274,7 +3328,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3330,9 +3384,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -3401,7 +3455,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.21", + "rustix 0.38.24", "windows-sys 0.48.0", ] @@ -3443,7 +3497,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3502,9 +3556,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes 1.5.0", @@ -3530,13 +3584,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3626,7 +3680,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3653,9 +3707,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -3664,9 +3718,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -3910,7 +3964,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] @@ -3944,7 +3998,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4158,9 +4212,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -4222,7 +4276,7 @@ dependencies = [ "async-executor", "async-fs", "async-io 1.13.0", - "async-lock", + "async-lock 2.8.0", "async-process", "async-recursion", "async-task", diff --git a/Cargo.toml b/Cargo.toml index 2d6562207..bbc4d1ed6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,41 +18,41 @@ native-tls = ['reqwest/native-tls', 'rattler/native-tls'] rustls-tls = ['reqwest/rustls-tls', 'rattler/rustls-tls'] [dependencies] -serde = { version = "1.0.190", features = ["derive"] } +serde = { version = "1.0.192", features = ["derive"] } serde_yaml = "0.9.27" -rattler = { version = "0.11.0", default-features = false } -rattler_conda_types = { version = "0.11.0", default-features = false } -rattler_digest = { version = "0.11.0", default-features = false } -rattler_networking = { version = "0.11.0", default-features = false } -rattler_repodata_gateway = { version = "0.11.0", default-features = false, features = [ +rattler = { version = "0.12.0", default-features = false } +rattler_conda_types = { version = "0.12.0", default-features = false } +rattler_digest = { version = "0.12.0", default-features = false } +rattler_networking = { version = "0.12.0", default-features = false } +rattler_repodata_gateway = { version = "0.12.0", default-features = false, features = [ "sparse", ] } -rattler_shell = { version = "0.11.0", default-features = false, features = [ +rattler_shell = { version = "0.12.0", default-features = false, features = [ "sysinfo", ] } -rattler_solve = { version = "0.11.0", default-features = false, features = [ +rattler_solve = { version = "0.12.0", default-features = false, features = [ "resolvo", ] } -rattler_virtual_packages = { version = "0.11.0", default-features = false } -rattler_package_streaming = { version = "0.11.0", default-features = false } +rattler_virtual_packages = { version = "0.12.0", default-features = false } +rattler_package_streaming = { version = "0.12.0", default-features = false } anyhow = "1.0.75" walkdir = "2.4.0" sha2 = "0.10.8" hex = "0.4.3" serde_json = "1.0.108" reqwest = "0.11.22" -tokio = { version = "1.33.0", features = ["rt", "macros", "rt-multi-thread"] } -itertools = "0.11.0" +tokio = { version = "1.34.0", features = ["rt", "macros", "rt-multi-thread"] } +itertools = "0.12.0" content_inspector = "0.2.4" serde_with = "3.4.0" url = "2.4.1" tracing = "0.1.40" -clap = { version = "4.4.7", features = ["derive", "env", "cargo"] } -minijinja = { version = "1.0.9", features = [ +clap = { version = "4.4.8", features = ["derive", "env", "cargo"] } +minijinja = { version = "1.0.10", features = [ "unstable_machinery", "custom_syntax", ] } -tracing-subscriber = { version = "0.3.17", features = [ +tracing-subscriber = { version = "0.3.18", features = [ "env-filter", "fmt", "ansi", @@ -97,15 +97,15 @@ pre-build = [ ] [patch.crates-io] -rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" } -rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" } -rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" } -rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" } -rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" } -rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" } -rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" } -rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" } -rattler_package_streaming = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" } +# rattler_package_streaming = { git = "https://github.com/mamba-org/rattler", branch = "main" } # rattler = { path = "../rattler/crates/rattler" } # rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" } diff --git a/rust-tests/Cargo.toml b/rust-tests/Cargo.toml index bf7753a6a..1d08f1810 100644 --- a/rust-tests/Cargo.toml +++ b/rust-tests/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] glob = "0.3.1" -itertools = "0.11.0" -rattler_package_streaming = { version = "0.11.0", default-features = false } +itertools = "0.12.0" +rattler_package_streaming = { version = "0.12.0", default-features = false } serde_json = "1.0.108" sha1 = "0.10.6" diff --git a/src/render/solver.rs b/src/render/solver.rs index 3801f4f4e..391d5ff89 100644 --- a/src/render/solver.rs +++ b/src/render/solver.rs @@ -145,7 +145,7 @@ pub async fn create_environment( // Get the package names from the matchspecs so we can only load the package records that we need. let package_names = specs.iter().filter_map(|spec| spec.name.clone()); let repodatas = wrap_in_progress("parsing repodata", move || { - SparseRepoData::load_records_recursive(&sparse_repo_datas, package_names, None, true) + SparseRepoData::load_records_recursive(&sparse_repo_datas, package_names, None) })?; // Determine virtual packages of the system. These packages define the capabilities of the