Fix rebase

Author: remimimimimi

Cargo.lock

@@ -31,7 +31,7 @@ clap = { version = "4.5.31", default-features = false }
 clap_complete = "4.5.46"
 clap_complete_nushell = "4.5.5"
 # Rattler crates
-coalesced_map = "0.1.1"
+coalesced_map = "0.1.2"
 concat-idents = "1.1.5"
 console = "0.15.10"
 console-subscriber = "0.4.1"
@@ -122,12 +122,12 @@ rattler_conda_types = { version = "0.40.3", default-features = false, features =
 ] }
 rattler_digest = { version = "1.1.7", default-features = false }
 rattler_lock = { version = "0.25.3", default-features = false }
-rattler_menuinst = { version = "0.2.23", default-features = false }
+rattler_menuinst = { version = "0.2.29", default-features = false }
 rattler_networking = { version = "0.25.20", default-features = false, features = [
   "dirs",
   "google-cloud-auth",
 ] }
-rattler_package_streaming = { version = "0.23.11", default-features = false }
+rattler_package_streaming = { version = "0.23.8", default-features = false }
 rattler_repodata_gateway = { version = "0.24.12", default-features = false }
 rattler_shell = { version = "0.25.5", default-features = false }
 rattler_solve = { version = "3.0.8", default-features = false }
@@ -144,6 +144,7 @@ self-replace = "1.5.0"
 serde = "1.0.218"
 serde-untagged = "0.1.6"
 serde-value = "0.7.0"
+serde_derive = "*"
 serde_ignored = "0.1.10"
 serde_json = "1.0.139"
 serde_with = "=3.14.0"
@@ -212,6 +213,24 @@ reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware",
 reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "ad8b9d332d1773fde8b4cd008486de5973e0a3f8" }
 version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "06ec5a5f59ffaeb6cf5079c6cb184467da06c9db" }
 
+# pixi-rattler-patches - START
+# pixi-rattler-original-versions: {"coalesced_map": "0.1.1", "file_url": "0.2.6", "rattler": "0.38.2", "rattler_cache": "0.3.41", "rattler_conda_types": "0.40.3", "rattler_digest": "1.1.7", "rattler_lock": "0.25.3", "rattler_menuinst": "0.2.23", "rattler_networking": "0.25.20", "rattler_package_streaming": "0.23.11", "rattler_repodata_gateway": "0.24.12", "rattler_shell": "0.25.5", "rattler_solve": "3.0.8", "rattler_virtual_packages": "2.2.4", "simple_spawn_blocking": "1.1.0"}
+coalesced_map = { path = "../../rattler/main//crates/coalesced_map" }
+file_url = { path = "../../rattler/main//crates/file_url" }
+rattler = { path = "../../rattler/main//crates/rattler" }
+rattler_cache = { path = "../../rattler/main//crates/rattler_cache" }
+rattler_conda_types = { path = "../../rattler/main//crates/rattler_conda_types" }
+rattler_digest = { path = "../../rattler/main//crates/rattler_digest" }
+rattler_lock = { path = "../../rattler/main//crates/rattler_lock" }
+rattler_menuinst = { path = "../../rattler/main//crates/rattler_menuinst" }
+rattler_networking = { path = "../../rattler/main//crates/rattler_networking" }
+rattler_package_streaming = { path = "../../rattler/main//crates/rattler_package_streaming" }
+rattler_repodata_gateway = { path = "../../rattler/main//crates/rattler_repodata_gateway" }
+rattler_shell = { path = "../../rattler/main//crates/rattler_shell" }
+rattler_solve = { path = "../../rattler/main//crates/rattler_solve" }
+rattler_virtual_packages = { path = "../../rattler/main//crates/rattler_virtual_packages" }
+simple_spawn_blocking = { path = "../../rattler/main//crates/simple_spawn_blocking" }
+# pixi-rattler-patches - END
 [profile.ci]
 codegen-units = 16
 inherits = "release"