diff --git a/Cargo.lock b/Cargo.lock index c70469ec1..f1d4eef48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,30 +81,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -164,11 +164,11 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.1.2", + "async-lock 3.2.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "slab", ] @@ -210,14 +210,14 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" dependencies = [ - "async-lock 3.1.2", + "async-lock 3.2.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "parking", "polling 3.3.1", - "rustix 0.38.25", + "rustix 0.38.26", "slab", "tracing", "windows-sys 0.52.0", @@ -234,9 +234,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ "event-listener 4.0.0", "event-listener-strategy", @@ -256,7 +256,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.25", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -283,7 +283,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.25", + "rustix 0.38.26", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -413,11 +413,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock 3.1.2", + "async-lock 3.2.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "piper", "tracing", ] @@ -531,9 +531,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -551,9 +551,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -599,9 +599,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -630,9 +630,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -640,9 +640,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -764,9 +764,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", "serde", @@ -898,12 +898,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -961,14 +961,14 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -1032,6 +1032,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "funty" version = "2.0.0" @@ -1109,14 +1119,13 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" dependencies = [ "fastrand 2.0.1", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", ] @@ -1562,7 +1571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.25", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -1607,9 +1616,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1628,9 +1637,9 @@ dependencies = [ [[package]] name = "keyring" -version = "2.0.5" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9549a129bd08149e0a71b2d1ce2729780d47127991bfd0a78cc1df697ec72492" +checksum = "ec6488afbd1d8202dbd6e2dd38c0753d8c0adba9ac9985fc6f732a0d551f75e1" dependencies = [ "byteorder", "lazy_static", @@ -1699,7 +1708,7 @@ checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ "bitflags 2.4.1", "libc", - "redox_syscall 0.4.1", + "redox_syscall", ] [[package]] @@ -1735,9 +1744,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -2065,9 +2074,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -2097,9 +2106,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ "cc", "libc", @@ -2183,7 +2192,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -2328,7 +2337,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.25", + "rustix 0.38.26", "tracing", "windows-sys 0.52.0", ] @@ -2465,8 +2474,8 @@ dependencies = [ [[package]] name = "rattler" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "anyhow", "async-compression", @@ -2567,8 +2576,8 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "chrono", "fxhash", @@ -2596,8 +2605,8 @@ dependencies = [ [[package]] name = "rattler_digest" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "blake2", "digest", @@ -2611,8 +2620,8 @@ dependencies = [ [[package]] name = "rattler_macros" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "quote", "syn 2.0.39", @@ -2620,16 +2629,18 @@ dependencies = [ [[package]] name = "rattler_networking" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "anyhow", "dirs", + "fslock", "getrandom", "itertools 0.11.0", "keyring", "lazy_static", "libc", + "once_cell", "reqwest", "retry-policies", "serde", @@ -2641,8 +2652,8 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "bzip2", "chrono", @@ -2664,8 +2675,8 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "anyhow", "async-compression", @@ -2702,8 +2713,8 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "enum_dispatch", "indexmap 2.1.0", @@ -2719,8 +2730,8 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "anyhow", "chrono", @@ -2738,8 +2749,8 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "0.13.0" -source = "git+https://github.com/mamba-org/rattler?branch=main#9a3f2cc92a50fec4f6f7c13488441ca4ac15269b" +version = "0.14.0" +source = "git+https://github.com/mamba-org/rattler?branch=main#bd5cb2c6eb9344f1d3fbe4fe75d547add92629d4" dependencies = [ "cfg-if", "libloading", @@ -2773,15 +2784,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2924,9 +2926,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" dependencies = [ "cc", "getrandom", @@ -3007,15 +3009,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] @@ -3557,8 +3559,8 @@ checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.25", + "redox_syscall", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -4057,9 +4059,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4067,9 +4069,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -4082,9 +4084,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -4094,9 +4096,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4104,9 +4106,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -4117,9 +4119,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-streams" @@ -4136,9 +4138,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -4159,7 +4161,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.25", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -4403,9 +4405,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "0383266b19108dfc6314a56047aa545a1b4d1be60e799b4dbdd407b56402704b" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index d1ebd54c6..4a0c74128 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,21 +20,21 @@ rustls-tls = ['reqwest/rustls-tls', 'rattler/rustls-tls'] [dependencies] serde = { version = "1.0.193", features = ["derive"] } serde_yaml = "0.9.27" -rattler = { version = "0.13.0", default-features = false } -rattler_conda_types = { version = "0.13.0", default-features = false } -rattler_digest = { version = "0.13.0", default-features = false } -rattler_networking = { version = "0.13.0", default-features = false } -rattler_repodata_gateway = { version = "0.13.0", default-features = false, features = [ +rattler = { version = "0.14.0", default-features = false } +rattler_conda_types = { version = "0.14.0", default-features = false } +rattler_digest = { version = "0.14.0", default-features = false } +rattler_networking = { version = "0.14.0", default-features = false } +rattler_repodata_gateway = { version = "0.14.0", default-features = false, features = [ "sparse", ] } -rattler_shell = { version = "0.13.0", default-features = false, features = [ +rattler_shell = { version = "0.14.0", default-features = false, features = [ "sysinfo", ] } -rattler_solve = { version = "0.13.0", default-features = false, features = [ +rattler_solve = { version = "0.14.0", default-features = false, features = [ "resolvo", ] } -rattler_virtual_packages = { version = "0.13.0", default-features = false } -rattler_package_streaming = { version = "0.13.0", default-features = false } +rattler_virtual_packages = { version = "0.14.0", default-features = false } +rattler_package_streaming = { version = "0.14.0", default-features = false } anyhow = "1.0.75" walkdir = "2.4.0" sha2 = "0.10.8" @@ -47,7 +47,7 @@ content_inspector = "0.2.4" serde_with = "3.4.0" url = "2.5.0" tracing = "0.1.40" -clap = { version = "4.4.8", features = ["derive", "env", "cargo"] } +clap = { version = "4.4.11", features = ["derive", "env", "cargo"] } minijinja = { version = "1.0.10", features = [ "unstable_machinery", "custom_syntax", diff --git a/rust-tests/Cargo.toml b/rust-tests/Cargo.toml index d2b18bc3b..e82e32c7c 100644 --- a/rust-tests/Cargo.toml +++ b/rust-tests/Cargo.toml @@ -8,6 +8,6 @@ edition = "2021" [dependencies] glob = "0.3.1" itertools = "0.12.0" -rattler_package_streaming = { version = "0.13.0", default-features = false } +rattler_package_streaming = { version = "0.14.0", default-features = false } serde_json = "1.0.108" sha1 = "0.10.6" diff --git a/src/env_vars.rs b/src/env_vars.rs index fabc31650..a645b4be4 100644 --- a/src/env_vars.rs +++ b/src/env_vars.rs @@ -402,7 +402,7 @@ pub fn write_env_script( let activation_vars = ActivationVariables { conda_prefix, path: current_path, - path_modification_behaviour: Default::default(), + path_modification_behavior: Default::default(), }; let host_activation = host_prefix_activator @@ -420,7 +420,7 @@ pub fn write_env_script( let activation_vars = ActivationVariables { conda_prefix: None, path: Some(host_activation.path.clone()), - path_modification_behaviour: Default::default(), + path_modification_behavior: Default::default(), }; let build_activation = build_prefix_activator diff --git a/src/test.rs b/src/test.rs index 80abf3a40..3e5aac7ca 100644 --- a/src/test.rs +++ b/src/test.rs @@ -94,7 +94,7 @@ fn run_in_environment( let av = ActivationVariables { conda_prefix, path: current_path, - path_modification_behaviour: Default::default(), + path_modification_behavior: Default::default(), }; let activator = Activator::from_path(environment, shell.clone(), Platform::current())?;