fix: use rattler main branch

3 files changed, 89 insertions, 147 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 7ac4af5..c90c850 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,23 +24,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
 dependencies = [
  "cfg-if",
- "cipher 0.3.0",
+ "cipher",
  "cpufeatures",
  "opaque-debug",
 ]
 
 [[package]]
-name = "aes"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
-dependencies = [
- "cfg-if",
- "cipher 0.4.4",
- "cpufeatures",
-]
-
-[[package]]
 name = "ahash"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -169,8 +158,8 @@ dependencies = [
  "memchr",
  "pin-project-lite",
  "tokio",
- "zstd 0.12.3+zstd.1.5.2",
- "zstd-safe 6.0.5+zstd.1.5.4",
+ "zstd",
+ "zstd-safe",
 ]
 
 [[package]]
@@ -328,12 +317,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
 
 [[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
 name = "bitflags"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -370,7 +353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e"
 dependencies = [
  "block-padding",
- "cipher 0.3.0",
+ "cipher",
 ]
 
 [[package]]
@@ -492,16 +475,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
 name = "clap"
 version = "4.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -590,12 +563,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
 name = "core-foundation"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1072,8 +1039,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1328,6 +1297,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.0",
+ "serde",
 ]
 
 [[package]]
@@ -1344,15 +1314,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
 name = "insta"
 version = "1.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1996,17 +1957,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
 
 [[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core",
- "subtle",
-]
-
-[[package]]
 name = "path-dedot"
 version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2016,18 +1966,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest",
- "hmac",
- "password-hash",
- "sha2",
-]
-
-[[package]]
 name = "percent-encoding"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2079,7 +2017,8 @@ dependencies = [
  "once_cell",
  "rattler",
  "rattler_conda_types",
- "rattler_digest",
+ "rattler_digest 0.7.0",
+ "rattler_digest 0.8.0",
  "rattler_networking",
  "rattler_repodata_gateway",
  "rattler_shell",
@@ -2244,9 +2183,8 @@ dependencies = [
 
 [[package]]
 name = "rattler"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8383a3f4a20a844087dd0d83dbe68a5cfa2524d56b75b236413a3679a3488b7"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -2264,7 +2202,7 @@ dependencies = [
  "once_cell",
  "pin-project-lite",
  "rattler_conda_types",
- "rattler_digest",
+ "rattler_digest 0.8.0",
  "rattler_networking",
  "rattler_package_streaming",
  "regex",
@@ -2285,18 +2223,18 @@ dependencies = [
 
 [[package]]
 name = "rattler_conda_types"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f08f408a6e12ba91911b4d46e89558007490abd6f3cae9390cce7a5fb51c63f9"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "chrono",
  "fxhash",
  "glob",
  "hex",
+ "indexmap 2.0.0",
  "itertools",
  "lazy-regex",
  "nom",
- "rattler_digest",
+ "rattler_digest 0.8.0",
  "rattler_macros",
  "regex",
  "serde",
@@ -2322,6 +2260,19 @@ dependencies = [
  "digest",
  "hex",
  "md-5",
+ "serde_with",
+ "sha2",
+]
+
+[[package]]
+name = "rattler_digest"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
+dependencies = [
+ "blake2",
+ "digest",
+ "hex",
+ "md-5",
  "serde",
  "serde_with",
  "sha2",
@@ -2330,9 +2281,8 @@ dependencies = [
 
 [[package]]
 name = "rattler_libsolv_rs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "101b8062ed0634d013b8450c263f894aa2e9cc509f115e5b11050f08e6f0062e"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "itertools",
  "petgraph",
@@ -2342,9 +2292,8 @@ dependencies = [
 
 [[package]]
 name = "rattler_macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35dd5131cfabe7773fad1b4534972c06f2b5260c0b203bf8ed90ca5875dab84e"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "quote",
  "syn 2.0.26",
@@ -2352,16 +2301,17 @@ dependencies = [
 
 [[package]]
 name = "rattler_networking"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ae820ef06d7227ca6038f5a2d77bd2c54557f107a0087d2aa14d37a75d37fbd"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "anyhow",
  "dirs",
+ "getrandom",
  "keyring",
  "lazy_static",
  "libc",
  "reqwest",
+ "retry-policies",
  "serde",
  "serde_json",
  "thiserror",
@@ -2370,16 +2320,15 @@ dependencies = [
 
 [[package]]
 name = "rattler_package_streaming"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fac9521f0994973b839a4290f4b4ce7107af78b04333534fe62f0c68b8f183"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "bzip2",
  "chrono",
  "futures-util",
  "itertools",
  "rattler_conda_types",
- "rattler_digest",
+ "rattler_digest 0.8.0",
  "rattler_networking",
  "reqwest",
  "serde_json",
@@ -2389,14 +2338,13 @@ dependencies = [
  "tokio-util",
  "url",
  "zip",
- "zstd 0.12.3+zstd.1.5.2",
+ "zstd",
 ]
 
 [[package]]
 name = "rattler_repodata_gateway"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5044e06058c149082d5a0f4db2278b7e815c1b3a00e8293a0bde1c4061661675"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -2415,7 +2363,7 @@ dependencies = [
  "ouroboros",
  "pin-project-lite",
  "rattler_conda_types",
- "rattler_digest",
+ "rattler_digest 0.8.0",
  "rattler_networking",
  "reqwest",
  "serde",
@@ -2433,9 +2381,8 @@ dependencies = [
 
 [[package]]
 name = "rattler_shell"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b20eebc358911adfc6b3baaf797ead242a0b9fc06f13d287a45ff4e53afe8932"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "enum_dispatch",
  "indexmap 2.0.0",
@@ -2451,14 +2398,13 @@ dependencies = [
 
 [[package]]
 name = "rattler_solve"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06bcad9b4fd059ceb359c26afcbcede36dbb7977edd1f85346bfb33df23cb04f"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "anyhow",
  "hex",
  "rattler_conda_types",
- "rattler_digest",
+ "rattler_digest 0.8.0",
  "rattler_libsolv_rs",
  "serde",
  "tempfile",
@@ -2469,9 +2415,8 @@ dependencies = [
 
 [[package]]
 name = "rattler_virtual_packages"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c60fa37473636acae757e3b4d98b692a8fd4a38d43ed7ba6433e4d0a2e9320f0"
+version = "0.8.0"
+source = "git+https://github.com/mamba-org/rattler?branch=main#fd4029f2b9d4a524aa92a44c46916d6dff798db6"
 dependencies = [
  "cfg-if",
  "libloading",
@@ -2626,6 +2571,17 @@ dependencies = [
 ]
 
 [[package]]
+name = "retry-policies"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a715dc4d0e8aea3085a9a94d76e79c79c7df7c9f6be609da841a6d2489ca3687"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "rand",
+]
+
+[[package]]
 name = "ring"
 version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2753,7 +2709,7 @@ version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5da1a5ad4d28c03536f82f77d9f36603f5e37d8869ac98f0a750d5b5686d8d95"
 dependencies = [
- "aes 0.7.5",
+ "aes",
  "block-modes",
  "futures-util",
  "generic-array",
@@ -2864,14 +2820,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3"
+checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
+ "indexmap 2.0.0",
  "serde",
  "serde_json",
  "serde_with_macros",
@@ -2880,9 +2837,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65"
+checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -3994,27 +3951,11 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
 dependencies = [
- "aes 0.8.3",
  "byteorder",
- "bzip2",
- "constant_time_eq",
  "crc32fast",
  "crossbeam-utils",
  "flate2",
- "hmac",
- "pbkdf2",
- "sha1",
  "time 0.3.23",
- "zstd 0.11.2+zstd.1.5.2",
-]
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe 5.0.2+zstd.1.5.2",
 ]
 
 [[package]]
@@ -4023,17 +3964,7 @@ version = "0.12.3+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
 dependencies = [
- "zstd-safe 6.0.5+zstd.1.5.4",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
+ "zstd-safe",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 3ed4397..69c42b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,14 +35,14 @@ itertools = "0.11.0"
 miette = { version = "5.10.0", features = ["fancy", "supports-color", "supports-hyperlinks", "supports-unicode", "terminal_size", "textwrap"] }
 minijinja = { version = "1.0.5", features = ["builtins"] }
 once_cell = "1.18.0"
-rattler = { version = "0.7.0", default-features = false }
-rattler_conda_types = { version = "0.7.0", default-features = false }
-rattler_digest = { version = "0.7.0", default-features = false }
-rattler_networking = { version = "0.7.0", default-features = false }
-rattler_repodata_gateway = { version = "0.7.0", default-features = false, features = ["sparse"] }
-rattler_shell = { version = "0.7.0", default-features = false, features = ["sysinfo"] }
-rattler_solve = { version = "0.7.0", default-features = false, features = ["libsolv_rs"] }
-rattler_virtual_packages = { version = "0.7.0", default-features = false }
+rattler = { version = "0.8.0", default-features = false }
+rattler_conda_types = { version = "0.8.0", default-features = false }
+rattler_digest = { version = "0.8.0", default-features = false }
+rattler_networking = { version = "0.8.0", default-features = false }
+rattler_repodata_gateway = { version = "0.8.0", default-features = false, features = ["sparse"] }
+rattler_shell = { version = "0.8.0", default-features = false, features = ["sysinfo"] }
+rattler_solve = { version = "0.8.0", default-features = false, features = ["libsolv_rs"] }
+rattler_virtual_packages = { version = "0.8.0", default-features = false }
 reqwest = { version = "0.11.18", default-features = false }
 serde = "1.0.171"
 serde_json = "1.0.103"
@@ -64,3 +64,14 @@ rattler_digest = "0.7.0"
 serde_json = "1.0.103"
 tokio = { version = "1.29.1", features = ["rt"] }
 toml = "0.7.6"
+
+[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" }
+
diff --git a/src/environment.rs b/src/environment.rs
index 6ac7b8f..b785070 100644
--- a/src/environment.rs
+++ b/src/environment.rs
@@ -363,7 +363,7 @@ pub async fn update_lock_file(
         builder = builder.add_locked_packages(locked_packages);
     }
 
-    let mut conda_lock = builder.build().into_diagnostic()?;
+    let conda_lock = builder.build().into_diagnostic()?;
 
     // Write the conda lock to disk
     conda_lock