feat: update rattler

prefix-dev · Nov 15, 2024 · 305f756 · 305f756
1 parent 75df7e0
commit 305f756
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/pixi_config/src/lib.rs b/crates/pixi_config/src/lib.rs
@@ -461,6 +461,7 @@ impl From<&Config> for rattler_repodata_gateway::ChannelConfig {
                 jlap_enabled: !config.disable_jlap.unwrap_or(false),
                 zstd_enabled: !config.disable_zstd.unwrap_or(false),
                 bz2_enabled: !config.disable_bzip2.unwrap_or(false),
+                sharded_enabled: false,
                 cache_action: Default::default(),
             })
             .unwrap_or_default();

diff --git a/crates/pixi_manifest/src/features_ext.rs b/crates/pixi_manifest/src/features_ext.rs
@@ -55,7 +55,11 @@ pub trait FeaturesExt<'source>: HasManifestRef<'source> + HasFeaturesIter<'sourc
         self.channels()
             .into_iter()
             .cloned()
-            .map(|channel| channel.into_base_url(channel_config))
+            .map(|channel| {
+                channel
+                    .into_base_url(channel_config)
+                    .map(|ch| ch.url().clone())
+            })
             .collect()
     }
 

diff --git a/crates/pixi_spec/src/lib.rs b/crates/pixi_spec/src/lib.rs
@@ -123,7 +123,7 @@ impl PixiSpec {
                 build_number: spec.build_number,
                 file_name: spec.file_name,
                 channel: spec.channel.map(|c| {
-                    NamedChannelOrUrl::from_str(&channel_config.canonical_name(c.base_url()))
+                    NamedChannelOrUrl::from_str(&channel_config.canonical_name(c.base_url.url()))
                         .unwrap()
                 }),
                 subdir: spec.subdir,

diff --git a/src/cli/build.rs b/src/cli/build.rs
@@ -143,7 +143,11 @@ pub async fn execute(args: Args) -> miette::Result<()> {
                         .default_environment()
                         .channels()
                         .iter()
-                        .map(|&c| c.clone().into_base_url(&channel_config))
+                        .map(|&c| {
+                            c.clone()
+                                .into_base_url(&channel_config)
+                                .map(|ch| ch.url().clone())
+                        })
                         .collect::<Result<Vec<_>, _>>()
                         .into_diagnostic()?,
                 ),

diff --git a/src/cli/exec.rs b/src/cli/exec.rs
@@ -66,7 +66,7 @@ impl EnvironmentHash {
                 .channels
                 .resolve_from_config(config)?
                 .iter()
-                .map(|c| c.base_url().to_string())
+                .map(|c| c.base_url.to_string())
                 .collect(),
         })
     }

diff --git a/src/lock_file/satisfiability.rs b/src/lock_file/satisfiability.rs
@@ -396,7 +396,7 @@ pub fn verify_environment_satisfiability(
             channel
                 .clone()
                 .into_channel(&config)
-                .map(|channel| channel.base_url().clone())
+                .map(|channel| channel.base_url.url().clone())
         })
         .try_collect()?;
 
@@ -407,7 +407,7 @@ pub fn verify_environment_satisfiability(
             NamedChannelOrUrl::from_str(&c.url)
                 .unwrap_or_else(|_err| NamedChannelOrUrl::Name(c.url.clone()))
                 .into_channel(&config)
-                .map(|channel| channel.base_url().clone())
+                .map(|channel| channel.base_url.url().clone())
         })
         .try_collect()?;
     if !channels.eq(&locked_channels) {

diff --git a/src/lock_file/update.rs b/src/lock_file/update.rs
@@ -1709,7 +1709,11 @@ async fn spawn_solve_conda_environment_task(
             // Collect metadata from all source packages
             let channel_urls = channels
                 .iter()
-                .map(|c| c.clone().into_base_url(&channel_config))
+                .map(|c| {
+                    c.clone()
+                        .into_base_url(&channel_config)
+                        .map(|ch| ch.url().clone())
+                })
                 .collect::<Result<Vec<_>, _>>()
                 .into_diagnostic()?;