diff --git a/Cargo.lock b/Cargo.lock
index 877637325..0ecce7e7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,9 +42,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -135,9 +135,23 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+
+[[package]]
+name = "archspec"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "9db67cd9cf4f56a10d2cbae6a3b552e5bd36701fd37b74a18c14a231bdf446c7"
+dependencies = [
+ "cfg-if",
+ "itertools",
+ "libc",
+ "serde",
+ "serde_json",
+ "sysctl",
+]
 
 [[package]]
 name = "assert_matches"
@@ -196,7 +210,7 @@ dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand 2.0.1",
- "futures-lite 2.3.0",
+ "futures-lite 2.2.0",
  "slab",
 ]
 
@@ -234,18 +248,18 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
+checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65"
 dependencies = [
  "async-lock 3.3.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.2.0",
  "parking",
  "polling 3.5.0",
- "rustix 0.38.32",
+ "rustix 0.38.31",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -290,19 +304,19 @@ dependencies = [
  "cfg-if",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.32",
+ "rustix 0.38.31",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-recursion"
-version = "1.1.0"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
+checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -311,13 +325,13 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
 dependencies = [
- "async-io 2.3.2",
+ "async-io 2.3.1",
  "async-lock 2.8.0",
  "atomic-waker",
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.32",
+ "rustix 0.38.31",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.48.0",
@@ -331,13 +345,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
 [[package]]
 name = "async-trait"
-version = "0.1.78"
+version = "0.1.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
+checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -367,7 +381,7 @@ source = "git+https://github.com/charliermarsh/rs-async-zip?rev=d76801da0943de98
 dependencies = [
  "async-compression",
  "crc32fast",
- "futures-lite 2.3.0",
+ "futures-lite 2.2.0",
  "pin-project",
  "thiserror",
  "tokio",
@@ -402,9 +416,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.70"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
@@ -459,9 +473,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bitvec"
@@ -520,16 +534,16 @@ dependencies = [
  "async-task",
  "fastrand 2.0.1",
  "futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.2.0",
  "piper",
  "tracing",
 ]
 
 [[package]]
 name = "brotli"
-version = "3.5.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -671,9 +685,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-util"
-version = "0.2.10"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f2d9a9a8d3e0b61b1110c49ab8f6ed7a76ce4f2b1d53ae48a83152d3d5e8f5b"
+checksum = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342"
 dependencies = [
  "anyhow",
  "core-foundation",
@@ -726,9 +740,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.35"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
+checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -750,9 +764,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.3"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -792,14 +806,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.3"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -962,7 +976,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -973,7 +987,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -997,9 +1011,9 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
 name = "deno_task_shell"
-version = "0.14.4"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db60ddb0f58f5c32c2ea67784c233eeaf187285cc7b49733bc549088702a4552"
+checksum = "6b44af10161906e1bccc1fc966f074bec0148997bb7e2221ecd29416dcad90b3"
 dependencies = [
  "anyhow",
  "futures",
@@ -1007,6 +1021,7 @@ dependencies = [
  "monch",
  "os_pipe",
  "path-dedot",
+ "thiserror",
  "tokio",
  "tokio-util",
 ]
@@ -1128,12 +1143,6 @@ dependencies = [
  "uv-normalize",
 ]
 
-[[package]]
-name = "drop_bomb"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
-
 [[package]]
 name = "dunce"
 version = "1.0.4"
@@ -1179,6 +1188,18 @@ dependencies = [
  "encoding_rs",
 ]
 
+[[package]]
+name = "enum-as-inner"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+]
+
 [[package]]
 name = "enum_dispatch"
 version = "0.3.12"
@@ -1188,7 +1209,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1209,7 +1230,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1220,9 +1241,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.4.4"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3"
+checksum = "388979d208a049ffdfb22fa33b9c81942215b940910bccfe258caeb25d125cb3"
 dependencies = [
  "serde",
 ]
@@ -1470,9 +1491,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba"
 dependencies = [
  "fastrand 2.0.1",
  "futures-core",
@@ -1489,7 +1510,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1568,11 +1589,11 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "git2"
-version = "0.18.3"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
+checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "libc",
  "libgit2-sys",
  "log",
@@ -1602,9 +1623,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
 dependencies = [
  "bytes",
  "fnv",
@@ -1612,7 +1633,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -1933,9 +1954,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.5"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -1963,9 +1984,9 @@ checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
 
 [[package]]
 name = "insta"
-version = "1.36.1"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a7c22c4d34ef4788c351e971c52bfdfe7ea2766f8c5466bc175dd46e52ac22e"
+checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc"
 dependencies = [
  "console",
  "globset",
@@ -1974,7 +1995,6 @@ dependencies = [
  "serde",
  "similar",
  "walkdir",
- "yaml-rust",
 ]
 
 [[package]]
@@ -2142,7 +2162,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2193,7 +2213,7 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "libc",
  "redox_syscall 0.4.1",
 ]
@@ -2214,9 +2234,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.16"
+version = "1.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
+checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
 dependencies = [
  "cc",
  "libc",
@@ -2245,7 +2265,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "libc",
 ]
 
@@ -2389,7 +2409,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2400,7 +2420,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2421,9 +2441,9 @@ dependencies = [
 
 [[package]]
 name = "minijinja"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5b00f90b3542f74bb9aaaccd2627920c16367787de103883461365580e5481"
+checksum = "3fb3bf58a1ec4f3f228bec851a2066c7717ad308817cd8a08f67c10660c6ff7b"
 dependencies = [
  "serde",
 ]
@@ -2520,7 +2540,7 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -2688,7 +2708,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2705,7 +2725,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2784,7 +2804,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -2917,7 +2937,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
@@ -2950,7 +2970,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
  "unicase",
 ]
 
@@ -2981,7 +3001,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -3032,7 +3052,7 @@ dependencies = [
  "human_bytes",
  "humantime",
  "ignore",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "indicatif",
  "insta",
  "install-wheel-rs",
@@ -3133,7 +3153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef"
 dependencies = [
  "base64 0.21.7",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "line-wrap",
  "quick-xml",
  "serde",
@@ -3165,7 +3185,7 @@ dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.32",
+ "rustix 0.38.31",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -3196,7 +3216,7 @@ checksum = "509354d8a769e8d0b567d6821b84495c60213162761a732d68ce87c964bd347f"
 dependencies = [
  "autocfg",
  "equivalent",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
@@ -3211,9 +3231,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
@@ -3226,7 +3246,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
  "version_check",
  "yansi",
 ]
@@ -3256,7 +3276,7 @@ name = "pubgrub"
 version = "0.2.1"
 source = "git+https://github.com/astral-sh/pubgrub?rev=e981e4dfe315582e84e2fd724832fb0e0c50b7aa#e981e4dfe315582e84e2fd724832fb0e0c50b7aa"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "log",
  "priority-queue",
  "rustc-hash",
@@ -3303,7 +3323,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b80f889b6d413c3f8963a2c7db03f95dd6e1d85e1074137cb2013ea2faa8898"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "pep440_rs",
  "pep508_rs",
  "serde",
@@ -3372,8 +3392,9 @@ dependencies = [
 
 [[package]]
 name = "rattler"
-version = "0.19.5"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cf17592e2097c40bb78458d5894cd0c4f4e54fa3c7e48a4ca2cdc09bf48d18f"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -3382,12 +3403,11 @@ dependencies = [
  "clap",
  "digest",
  "dirs",
- "drop_bomb",
  "fs-err",
  "futures",
  "fxhash",
  "hex",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itertools",
  "memchr",
  "memmap2 0.9.4",
@@ -3418,14 +3438,15 @@ dependencies = [
 
 [[package]]
 name = "rattler_conda_types"
-version = "0.20.3"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04312e29a2f1f7932b82f522ce01a7f6f095810775db681062f6d7c6ac2f7ea"
 dependencies = [
  "chrono",
  "fxhash",
  "glob",
  "hex",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itertools",
  "lazy-regex",
  "nom",
@@ -3448,7 +3469,8 @@ dependencies = [
 [[package]]
 name = "rattler_digest"
 version = "0.19.2"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a15f14fa0e0fdf3fbacabd21d66a3d6b15af5c7c0cda2e0e29bd6605dec4569"
 dependencies = [
  "blake2",
  "digest",
@@ -3462,12 +3484,13 @@ dependencies = [
 
 [[package]]
 name = "rattler_lock"
-version = "0.21.0"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "922bf1fe06e8541c948568a081f39350f5b49e4a6fdd14a413d46c5e4b8fc086"
 dependencies = [
  "chrono",
  "fxhash",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itertools",
  "pep440_rs",
  "pep508_rs",
@@ -3486,16 +3509,18 @@ dependencies = [
 [[package]]
 name = "rattler_macros"
 version = "0.19.2"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f6c3aedd4fa6a50b41be9537c8abc7190ae24f1b0add0ab722275fa0ec8d6d"
 dependencies = [
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "rattler_networking"
 version = "0.20.0"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0b9354421a0725078dfd1ba787269578a7c1121fe9a859818f8eb57fecb0b6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3524,8 +3549,9 @@ dependencies = [
 
 [[package]]
 name = "rattler_package_streaming"
-version = "0.20.1"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51ab40c7851026ce066437a7aa8f41bd855631de1df7119cd6c4592f5e7c8761"
 dependencies = [
  "bzip2",
  "chrono",
@@ -3550,8 +3576,9 @@ dependencies = [
 
 [[package]]
 name = "rattler_repodata_gateway"
-version = "0.19.4"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5a431bebc785418239234de099d93c762f36ee9eccc25fb771e66f7e67dc478"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -3589,11 +3616,12 @@ dependencies = [
 
 [[package]]
 name = "rattler_shell"
-version = "0.19.4"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb0bc411deca7d7592d234fb3af4143e43a4a82778543815cc553d79ec7c920f"
 dependencies = [
  "enum_dispatch",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itertools",
  "rattler_conda_types",
  "serde_json",
@@ -3606,8 +3634,9 @@ dependencies = [
 
 [[package]]
 name = "rattler_solve"
-version = "0.20.3"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3afcaf726654799c7ebe4c8ecc25418a6cdc1717ada8d04df0c4f560e8eb7bfa"
 dependencies = [
  "anyhow",
  "chrono",
@@ -3626,9 +3655,11 @@ dependencies = [
 
 [[package]]
 name = "rattler_virtual_packages"
-version = "0.19.4"
-source = "git+https://github.com/baszalmstra/rattler?rev=b6ccac0f72df9617d6d02220595ed4595aa34e1c#b6ccac0f72df9617d6d02220595ed4595aa34e1c"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec1b00f4888441c1a11df94bc07be619124fdf75d0d1a5072d3b28df3ae08ba1"
 dependencies = [
+ "archspec",
  "cfg-if",
  "libloading",
  "nom",
@@ -3706,15 +3737,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52b1349400e2ffd64a9fb5ed9008e33c0b8ef86bd5bae8f73080839c7082f1d5"
 dependencies = [
  "cfg-if",
- "rustix 0.38.32",
+ "rustix 0.38.31",
  "windows 0.54.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4026,7 +4057,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.53",
+ "syn 2.0.52",
  "unicode-ident",
 ]
 
@@ -4076,11 +4107,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.32"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys 0.4.13",
@@ -4283,16 +4314,16 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
@@ -4306,7 +4337,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4340,7 +4371,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4357,16 +4388,16 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.33"
+version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
@@ -4395,7 +4426,7 @@ checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4506,9 +4537,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 dependencies = [
  "serde",
 ]
@@ -4608,24 +4639,24 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "strum"
-version = "0.26.2"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.26.2"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4674,9 +4705,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.53"
+version = "2.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4699,6 +4730,20 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "sysctl"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea"
+dependencies = [
+ "bitflags 2.4.2",
+ "byteorder",
+ "enum-as-inner",
+ "libc",
+ "thiserror",
+ "walkdir",
+]
+
 [[package]]
 name = "sysinfo"
 version = "0.30.7"
@@ -4778,7 +4823,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.1",
- "rustix 0.38.32",
+ "rustix 0.38.31",
  "windows-sys 0.52.0",
 ]
 
@@ -4788,7 +4833,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.38.32",
+ "rustix 0.38.31",
  "windows-sys 0.48.0",
 ]
 
@@ -4820,7 +4865,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4887,9 +4932,9 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4911,7 +4956,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4936,9 +4981,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5003,7 +5048,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -5014,7 +5059,7 @@ version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -5046,7 +5091,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -5212,9 +5257,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
 dependencies = [
  "getrandom",
  "rand",
@@ -5550,7 +5595,7 @@ dependencies = [
  "distribution-types",
  "either",
  "futures",
- "indexmap 2.2.5",
+ "indexmap 2.2.6",
  "itertools",
  "once-map",
  "once_cell",
@@ -5699,7 +5744,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
  "wasm-bindgen-shared",
 ]
 
@@ -5733,7 +5778,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.53",
+ "syn 2.0.52",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5797,7 +5842,7 @@ dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.32",
+ "rustix 0.38.31",
  "windows-sys 0.52.0",
 ]
 
@@ -6057,7 +6102,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
  "linux-raw-sys 0.4.13",
- "rustix 0.38.32",
+ "rustix 0.38.31",
 ]
 
 [[package]]
@@ -6076,20 +6121,11 @@ version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
 
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
 [[package]]
 name = "yansi"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+checksum = "6c2861d76f58ec8fc95708b9b1e417f7b12fd72ad33c01fa6886707092dea0d3"
 
 [[package]]
 name = "zbus"
diff --git a/Cargo.toml b/Cargo.toml
index fd2509051..6acbd7dda 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,8 +28,8 @@ slow_integration_tests = []
 assert_matches = "1.5.0"
 async-once-cell = "0.5.3"
 cfg-if = "1.0"
-chrono = "0.4.35"
-clap = { version = "4.5.3", default-features = false, features = [
+chrono = "0.4.37"
+clap = { version = "4.5.4", default-features = false, features = [
     "derive",
     "usage",
     "wrap_help",
@@ -42,7 +42,7 @@ clap-verbosity-flag = "2.2.0"
 clap_complete = "4.5.1"
 console = { version = "0.15.8", features = ["windows-console-colors"] }
 crossbeam-channel = "0.5.12"
-deno_task_shell = "0.14.4"
+deno_task_shell = "0.16.0"
 dialoguer = "0.11.0"
 dirs = "5.0.1"
 distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
@@ -54,7 +54,7 @@ http-cache-reqwest = "0.13.0"
 human_bytes = "0.4.3"
 humantime = "2.1.0"
 ignore = "0.4.22"
-indexmap = { version = "2.2.5", features = ["serde"] }
+indexmap = { version = "2.2.6", features = ["serde"] }
 indicatif = "0.17.8"
 
 install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
@@ -69,31 +69,31 @@ miette = { version = "7.2.0", features = [
     "terminal_size",
     "textwrap",
 ] }
-minijinja = { version = "1.0.14", features = ["builtins"] }
+minijinja = { version = "1.0.16", features = ["builtins"] }
 once_cell = "1.19.0"
 pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
 pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
 platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
 pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
 pyproject-toml = "0.10.0"
-rattler = { version = "0.19.4", default-features = false, features = [
+rattler = { version = "0.20.0", default-features = false, features = [
     "cli-tools",
 ] }
-rattler_conda_types = { version = "0.20.3", default-features = false }
+rattler_conda_types = { version = "0.20.4", default-features = false }
 rattler_digest = { version = "0.19.2", default-features = false }
-rattler_lock = { version = "0.21.0", default-features = false }
+rattler_lock = { version = "0.22.0", default-features = false }
 rattler_networking = { version = "0.20.0", default-features = false }
-rattler_repodata_gateway = { version = "0.19.4", default-features = false, features = [
+rattler_repodata_gateway = { version = "0.19.5", default-features = false, features = [
     "sparse",
 ] }
-rattler_shell = { version = "0.19.4", default-features = false, features = [
+rattler_shell = { version = "0.19.5", default-features = false, features = [
     "sysinfo",
 ] }
-rattler_solve = { version = "0.20.3", default-features = false, features = [
+rattler_solve = { version = "0.20.4", default-features = false, features = [
     "resolvo",
 ] }
-rattler_virtual_packages = { version = "0.19.4", default-features = false }
-regex = "1.10.3"
+rattler_virtual_packages = { version = "0.19.5", default-features = false }
+regex = "1.10.4"
 requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
 reqwest = { version = "0.11.27", default-features = false }
 reqwest-middleware = "0.2.5"
@@ -101,9 +101,9 @@ reqwest-retry = "0.4.0"
 self-replace = "1.3.7"
 serde = "1.0.197"
 serde-untagged = "0.1.5"
-serde_json = "1.0.114"
+serde_json = "1.0.115"
 serde_with = { version = "3.7.0", features = ["indexmap"] }
-serde_yaml = "0.9.33"
+serde_yaml = "0.9.34"
 shlex = "1.3.0"
 spdx = "0.10.4"
 strsim = "0.11.0"
@@ -111,13 +111,13 @@ tabwriter = { version = "1.4.0", features = ["ansi_formatting"] }
 tar = "0.4.40"
 tempfile = "3.10.1"
 thiserror = "1.0.58"
-tokio = { version = "1.36.0", features = [
+tokio = { version = "1.37.0", features = [
     "macros",
     "rt-multi-thread",
     "signal",
 ] }
 tokio-util = "0.7.10"
-toml_edit = { version = "0.22.8", features = ["serde"] }
+toml_edit = { version = "0.22.9", features = ["serde"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 url = "2.5.0"
@@ -148,12 +148,12 @@ libc = { version = "0.2.153", default-features = false }
 signal-hook = "0.3.17"
 
 [dev-dependencies]
-insta = { version = "1.36.1", features = ["yaml", "glob"] }
+insta = { version = "1.38.0", features = ["yaml", "glob"] }
 rattler_digest = "0.19.2"
 rstest = "0.18.2"
-serde_json = "1.0.114"
+serde_json = "1.0.115"
 serial_test = "3.0.0"
-tokio = { version = "1.36.0", features = ["rt"] }
+tokio = { version = "1.37.0", features = ["rt"] }
 toml = "0.8.12"
 
 [patch.crates-io]
@@ -161,17 +161,16 @@ toml = "0.8.12"
 # If you change this also change the versions in the the patch section for uv
 pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
 pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
-
 # deno_task_shell = { path = "../deno_task_shell" }
-rattler = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
-rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
-rattler_digest = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
-rattler_lock = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
-rattler_networking = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
-rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
-rattler_shell = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
-rattler_solve = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
-rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler_digest = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler_lock = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler_networking = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler_shell = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler_solve = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
+# rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
 #rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
 #rattler_digest = { path = "../rattler/crates/rattler_digest" }
 #rattler_networking = { path = "../rattler/crates/rattler_networking" }
diff --git a/src/lock_file/satisfiability.rs b/src/lock_file/satisfiability.rs
index 444e1cf25..7a4f4bfc6 100644
--- a/src/lock_file/satisfiability.rs
+++ b/src/lock_file/satisfiability.rs
@@ -350,6 +350,7 @@ pub fn verify_package_platform_satisfiability(
     let virtual_packages = environment
         .virtual_packages(platform)
         .into_iter()
+        .map(GenericVirtualPackage::from)
         .map(|vpkg| (vpkg.name.clone(), vpkg))
         .collect::<HashMap<_, _>>();
 
diff --git a/src/project/manifest/system_requirements.rs b/src/project/manifest/system_requirements.rs
index 64df0b468..29746968c 100644
--- a/src/project/manifest/system_requirements.rs
+++ b/src/project/manifest/system_requirements.rs
@@ -1,6 +1,6 @@
 use miette::Diagnostic;
 use rattler_conda_types::Version;
-use rattler_virtual_packages::{Archspec, Cuda, LibC, Linux, Osx, VirtualPackage};
+use rattler_virtual_packages::{Cuda, LibC, Linux, Osx, VirtualPackage};
 use serde::Deserialize;
 use serde_with::{serde_as, DisplayFromStr};
 use std::str::FromStr;
@@ -44,13 +44,12 @@ impl SystemRequirements {
         if let Some(version) = self.macos.clone() {
             result.push(VirtualPackage::Osx(Osx { version }))
         }
-        if let Some(spec) = self.archspec.clone() {
-            result.push(VirtualPackage::Archspec(Archspec { spec }))
-        }
         if let Some(libc) = self.libc.clone() {
             result.push(VirtualPackage::LibC(libc.into()))
         }
-
+        if let Some(_archspec) = self.archspec.clone() {
+            tracing::info!("The archspec system-requirement is deprecated and not used.");
+        }
         result
     }
 
@@ -223,7 +222,7 @@ mod tests {
     use assert_matches::assert_matches;
     use insta::assert_snapshot;
     use rattler_conda_types::Version;
-    use rattler_virtual_packages::{Archspec, Cuda, LibC, Linux, Osx, VirtualPackage};
+    use rattler_virtual_packages::{Cuda, LibC, Linux, Osx, VirtualPackage};
     use serde::Deserialize;
     use std::str::FromStr;
 
@@ -233,7 +232,6 @@ mod tests {
         linux = "5.11"
         cuda = "12.2"
         macos = "10.15"
-        archspec = "arm64"
         libc = { family = "glibc", version = "2.12" }
         "#;
 
@@ -250,9 +248,6 @@ mod tests {
             VirtualPackage::Osx(Osx {
                 version: Version::from_str("10.15").unwrap(),
             }),
-            VirtualPackage::Archspec(Archspec {
-                spec: "arm64".to_string(),
-            }),
             VirtualPackage::LibC(LibC {
                 version: Version::from_str("2.12").unwrap(),
                 family: "glibc".to_string(),
@@ -476,32 +471,4 @@ mod tests {
 
         assert_matches!(eglibc_2_17.union(&glibc_2_12).unwrap_err(), SystemRequirementsUnionError::DifferentLibcFamilies(fam_a, fam_b) if fam_a == "eglibc" && fam_b == "glibc");
     }
-
-    #[test]
-    fn test_union_archspec() {
-        let a = SystemRequirements {
-            archspec: Some("arm64".to_string()),
-            ..Default::default()
-        };
-        let b = SystemRequirements {
-            archspec: Some("x86_64".to_string()),
-            ..Default::default()
-        };
-        let c = SystemRequirements {
-            archspec: None,
-            ..Default::default()
-        };
-        assert_matches!(
-            a.union(&b).unwrap_err(),
-            SystemRequirementsUnionError::MismatchingArchSpec(a,b) if a == "arm64" && b == "x86_64"
-        );
-        assert_eq!(
-            c.union(&b).unwrap(),
-            SystemRequirements {
-                archspec: Some("x86_64".to_string()),
-                ..Default::default()
-            }
-        );
-        assert_eq!(c.union(&b).unwrap(), b.union(&c).unwrap());
-    }
 }
diff --git a/src/project/mod.rs b/src/project/mod.rs
index 34a2e0233..399723def 100644
--- a/src/project/mod.rs
+++ b/src/project/mod.rs
@@ -11,11 +11,12 @@ use distribution_types::IndexLocations;
 use indexmap::{Equivalent, IndexMap, IndexSet};
 use miette::{IntoDiagnostic, NamedSource};
 
-use rattler_conda_types::{Channel, GenericVirtualPackage, Platform, Version};
+use rattler_conda_types::{Channel, Platform, Version};
 use reqwest_middleware::ClientWithMiddleware;
 use std::fs;
 use std::hash::Hash;
 
+use rattler_virtual_packages::VirtualPackage;
 use std::{
     collections::{HashMap, HashSet},
     env,
@@ -371,7 +372,7 @@ impl Project {
     }
 
     /// TODO: Remove this method and use the one from Environment instead.
-    pub fn virtual_packages(&self, platform: Platform) -> Vec<GenericVirtualPackage> {
+    pub fn virtual_packages(&self, platform: Platform) -> Vec<VirtualPackage> {
         self.default_environment().virtual_packages(platform)
     }
 
diff --git a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-64.snap b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-64.snap
index b8ab6c9be..b506fde40 100644
--- a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-64.snap
+++ b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-64.snap
@@ -1,29 +1,51 @@
 ---
 source: src/project/virtual_packages.rs
+assertion_line: 226
 expression: packages
 ---
 [
-    Unix,
-    Linux(
-        Linux {
-            version: Version {
-                version: [[0], [5], [10]],
-                local: [],
-            },
-        },
-    ),
-    LibC(
-        LibC {
-            family: "glibc",
-            version: Version {
-                version: [[0], [2], [17]],
-                local: [],
-            },
-        },
-    ),
-    Archspec(
-        Archspec {
-            spec: "x86_64",
-        },
-    ),
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__unix",
+        },
+        version: Version {
+            version: [[0], [0]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__linux",
+        },
+        version: Version {
+            version: [[0], [5], [10]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__glibc",
+        },
+        version: Version {
+            version: [[0], [2], [17]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__archspec",
+        },
+        version: Version {
+            version: [[0], [1]],
+            local: [],
+        },
+        build_string: "x86_64",
+    },
 ]
diff --git a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-aarch64.snap b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-aarch64.snap
index 258f2014d..10d136740 100644
--- a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-aarch64.snap
+++ b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-aarch64.snap
@@ -3,27 +3,48 @@ source: src/project/virtual_packages.rs
 expression: packages
 ---
 [
-    Unix,
-    Linux(
-        Linux {
-            version: Version {
-                version: [[0], [5], [10]],
-                local: [],
-            },
-        },
-    ),
-    LibC(
-        LibC {
-            family: "glibc",
-            version: Version {
-                version: [[0], [2], [17]],
-                local: [],
-            },
-        },
-    ),
-    Archspec(
-        Archspec {
-            spec: "aarch64",
-        },
-    ),
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__unix",
+        },
+        version: Version {
+            version: [[0], [0]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__linux",
+        },
+        version: Version {
+            version: [[0], [5], [10]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__glibc",
+        },
+        version: Version {
+            version: [[0], [2], [17]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__archspec",
+        },
+        version: Version {
+            version: [[0], [1]],
+            local: [],
+        },
+        build_string: "aarch64",
+    },
 ]
diff --git a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-ppc64le.snap b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-ppc64le.snap
index e6f4f4773..cc393aae4 100644
--- a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-ppc64le.snap
+++ b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-ppc64le.snap
@@ -3,27 +3,48 @@ source: src/project/virtual_packages.rs
 expression: packages
 ---
 [
-    Unix,
-    Linux(
-        Linux {
-            version: Version {
-                version: [[0], [5], [10]],
-                local: [],
-            },
-        },
-    ),
-    LibC(
-        LibC {
-            family: "glibc",
-            version: Version {
-                version: [[0], [2], [17]],
-                local: [],
-            },
-        },
-    ),
-    Archspec(
-        Archspec {
-            spec: "ppc64le",
-        },
-    ),
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__unix",
+        },
+        version: Version {
+            version: [[0], [0]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__linux",
+        },
+        version: Version {
+            version: [[0], [5], [10]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__glibc",
+        },
+        version: Version {
+            version: [[0], [2], [17]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__archspec",
+        },
+        version: Version {
+            version: [[0], [1]],
+            local: [],
+        },
+        build_string: "ppc64le",
+    },
 ]
diff --git a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-64.snap b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-64.snap
index e7808e4f6..a2bcc21af 100644
--- a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-64.snap
+++ b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-64.snap
@@ -3,18 +3,37 @@ source: src/project/virtual_packages.rs
 expression: packages
 ---
 [
-    Unix,
-    Archspec(
-        Archspec {
-            spec: "x86_64",
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__unix",
         },
-    ),
-    Osx(
-        Osx {
-            version: Version {
-                version: [[0], [10], [15]],
-                local: [],
-            },
+        version: Version {
+            version: [[0], [0]],
+            local: [],
         },
-    ),
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__osx",
+        },
+        version: Version {
+            version: [[0], [10], [15]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__archspec",
+        },
+        version: Version {
+            version: [[0], [1]],
+            local: [],
+        },
+        build_string: "x86_64",
+    },
 ]
diff --git a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-arm64.snap b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-arm64.snap
index d2e3b23d2..867620518 100644
--- a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-arm64.snap
+++ b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-arm64.snap
@@ -3,18 +3,37 @@ source: src/project/virtual_packages.rs
 expression: packages
 ---
 [
-    Unix,
-    Archspec(
-        Archspec {
-            spec: "arm64",
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__unix",
         },
-    ),
-    Osx(
-        Osx {
-            version: Version {
-                version: [[0], [11], [0]],
-                local: [],
-            },
+        version: Version {
+            version: [[0], [0]],
+            local: [],
         },
-    ),
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__osx",
+        },
+        version: Version {
+            version: [[0], [11], [0]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__archspec",
+        },
+        version: Version {
+            version: [[0], [1]],
+            local: [],
+        },
+        build_string: "m1",
+    },
 ]
diff --git a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.win-64.snap b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.win-64.snap
index 5aeff3ece..494fda8fa 100644
--- a/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.win-64.snap
+++ b/src/project/snapshots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.win-64.snap
@@ -3,10 +3,26 @@ source: src/project/virtual_packages.rs
 expression: packages
 ---
 [
-    Win,
-    Archspec(
-        Archspec {
-            spec: "x86_64",
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__win",
         },
-    ),
+        version: Version {
+            version: [[0], [0]],
+            local: [],
+        },
+        build_string: "0",
+    },
+    GenericVirtualPackage {
+        name: PackageName {
+            normalized: None,
+            source: "__archspec",
+        },
+        version: Version {
+            version: [[0], [1]],
+            local: [],
+        },
+        build_string: "x86_64",
+    },
 ]
diff --git a/src/project/virtual_packages.rs b/src/project/virtual_packages.rs
index 2c3f3fbfb..f0eea7dc8 100644
--- a/src/project/virtual_packages.rs
+++ b/src/project/virtual_packages.rs
@@ -69,12 +69,6 @@ pub fn get_minimal_virtual_packages(
         virtual_packages.push(VirtualPackage::Win);
     }
 
-    if let Some(archspec) = system_requirements.archspec.clone() {
-        virtual_packages.push(VirtualPackage::Archspec(Archspec { spec: archspec }))
-    } else if let Some(archspec) = Archspec::from_platform(platform) {
-        virtual_packages.push(archspec.into())
-    }
-
     // Add platform specific packages
     if platform.is_osx() {
         let version = system_requirements
@@ -89,17 +83,19 @@ pub fn get_minimal_virtual_packages(
         virtual_packages.push(VirtualPackage::Cuda(Cuda { version }));
     }
 
+    // Archspec is only based on the platform for now
+    if let Some(spec) = Archspec::from_platform(platform) {
+        virtual_packages.push(VirtualPackage::Archspec(spec));
+    }
+
     virtual_packages
 }
 
 impl Environment<'_> {
     /// Returns the set of virtual packages to use for the specified platform. This method
     /// takes into account the system requirements specified in the project manifest.
-    pub fn virtual_packages(&self, platform: Platform) -> Vec<GenericVirtualPackage> {
+    pub fn virtual_packages(&self, platform: Platform) -> Vec<VirtualPackage> {
         get_minimal_virtual_packages(platform, &self.system_requirements())
-            .into_iter()
-            .map(GenericVirtualPackage::from)
-            .collect()
     }
 }
 
@@ -158,10 +154,18 @@ pub fn verify_current_platform_has_required_virtual_packages(
         .map(GenericVirtualPackage::from)
         .map(|vpkg| (vpkg.name.clone(), vpkg))
         .collect::<HashMap<_, _>>();
-    let required_pkgs = environment.virtual_packages(current_platform);
+    let required_pkgs = environment
+        .virtual_packages(current_platform)
+        .into_iter()
+        .map(GenericVirtualPackage::from);
 
     // Check for every local minimum package if it is available and on the correct version.
     for req_pkg in required_pkgs {
+        if req_pkg.name.as_normalized() == "__archspec" {
+            // Skip archspec packages completely for now.
+            continue;
+        }
+
         if let Some(local_vpkg) = system_virtual_packages.get(&req_pkg.name) {
             if req_pkg.build_string != local_vpkg.build_string {
                 return Err(VerifyCurrentPlatformError::MismatchingBuildString {
@@ -214,7 +218,10 @@ mod tests {
         let system_requirements = SystemRequirements::default();
 
         for platform in platforms {
-            let packages = get_minimal_virtual_packages(platform, &system_requirements);
+            let packages = get_minimal_virtual_packages(platform, &system_requirements)
+                .into_iter()
+                .map(GenericVirtualPackage::from)
+                .collect_vec();
             let snapshot_name = format!("test_get_minimal_virtual_packages.{}", platform);
             assert_debug_snapshot!(snapshot_name, packages);
         }
diff --git a/src/utils/snapshots/pixi__utils__conda_environment_file__tests__test_import_from_env_yaml.cockpit.yml.snap b/src/utils/snapshots/pixi__utils__conda_environment_file__tests__test_import_from_env_yaml.cockpit.yml.snap
index 14188f72c..a1a400f68 100644
--- a/src/utils/snapshots/pixi__utils__conda_environment_file__tests__test_import_from_env_yaml.cockpit.yml.snap
+++ b/src/utils/snapshots/pixi__utils__conda_environment_file__tests__test_import_from_env_yaml.cockpit.yml.snap
@@ -74,9 +74,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -115,9 +113,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -156,9 +152,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -197,9 +191,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -238,9 +230,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -279,9 +269,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -320,9 +308,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -361,9 +347,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -402,9 +386,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -443,9 +425,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -484,9 +464,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -525,9 +503,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -566,9 +542,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -607,9 +581,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -648,9 +620,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -689,9 +659,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -730,9 +698,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -781,9 +747,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },
@@ -822,9 +786,7 @@ expression: "(parse_dependencies(env_info.dependencies().clone()).unwrap(),\n
                     },
                 ),
                 subdir: None,
-                namespace: Some(
-                    "",
-                ),
+                namespace: None,
                 md5: None,
                 sha256: None,
             },