chore: bump rattler (#1973)

.github/workflows/rust.yml

@@ -103,10 +103,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: "Linux",       target: x86_64-unknown-linux-musl,  os: ubuntu-20.04 }
+          - { name: "Linux",       target: x86_64-unknown-linux-musl,  os: 8core_ubuntu_latest_runner }
           - { name: "macOS",       target: x86_64-apple-darwin,        os: macos-13 }
           - { name: "macOS-arm",   target: aarch64-apple-darwin,       os: macos-14 }
-          - { name: "Windows",     target: x86_64-pc-windows-msvc,     os: windows-latest }
+          - { name: "Windows",     target: x86_64-pc-windows-msvc,     os: 16core_windows_latest_runner }
     steps:
       - uses: actions/checkout@v4
       - uses: taiki-e/setup-cross-toolchain-action@v1

Cargo.toml

@@ -72,7 +72,6 @@ serde_ignored = "0.1.10"
 serde_json = "1.0.116"
 serde_with = "3.7.0"
 serde_yaml = "0.9.34"
-serial_test = "3.0.0"
 shlex = "1.3.0"
 signal-hook = "0.3.17"
 spdx = "0.10.4"
@@ -90,16 +89,16 @@ typed-path = "0.9.1"
 
 # Rattler crates
 file_url = "0.1.4"
-rattler = { version = "0.27.6", default-features = false }
-rattler_cache = { version = "0.1.8", default-features = false }
-rattler_conda_types = { version = "0.27.2", default-features = false }
+rattler = { version = "0.27.8", default-features = false }
+rattler_cache = { version = "0.2.0", default-features = false }
+rattler_conda_types = { version = "0.27.4", default-features = false }
 rattler_digest = { version = "1.0.1", default-features = false }
-rattler_lock = { version = "0.22.20", default-features = false }
-rattler_networking = { version = "0.21.2", default-features = false }
-rattler_repodata_gateway = { version = "0.21.8", default-features = false }
-rattler_shell = { version = "0.21.6", default-features = false }
-rattler_solve = { version = "1.0.3", default-features = false }
-rattler_virtual_packages = { version = "1.0.4", default-features = false }
+rattler_lock = { version = "0.22.22", default-features = false }
+rattler_networking = { version = "0.21.3", default-features = false }
+rattler_repodata_gateway = { version = "0.21.10", default-features = false }
+rattler_shell = { version = "0.21.8", default-features = false }
+rattler_solve = { version = "1.0.5", default-features = false }
+rattler_virtual_packages = { version = "1.1.1", default-features = false }
 
 # Bumping this to a higher version breaks the Windows path handling.
 url = "2.5.0"
@@ -314,7 +313,6 @@ http = { workspace = true }
 insta = { workspace = true, features = ["yaml", "glob"] }
 rstest = { workspace = true }
 serde_json = { workspace = true }
-serial_test = { workspace = true }
 tokio = { workspace = true, features = ["rt"] }
 
 

src/cli/exec.rs

@@ -12,7 +12,7 @@ use rattler::{
 };
 use rattler_conda_types::{GenericVirtualPackage, MatchSpec, PackageName, Platform};
 use rattler_solve::{resolvo::Solver, SolverImpl, SolverTask};
-use rattler_virtual_packages::VirtualPackage;
+use rattler_virtual_packages::{VirtualPackage, VirtualPackageOverrides};
 use reqwest_middleware::ClientWithMiddleware;
 
 use crate::prefix::Prefix;
@@ -185,7 +185,7 @@ pub async fn create_exec_prefix(
     .context("failed to get repodata")?;
 
     // Determine virtual packages of the current platform
-    let virtual_packages = VirtualPackage::current()
+    let virtual_packages = VirtualPackage::detect(&VirtualPackageOverrides::from_env())
         .into_diagnostic()
         .context("failed to determine virtual packages")?
         .iter()

src/cli/global/install.rs

@@ -8,6 +8,8 @@ use clap::Parser;
 use indexmap::IndexMap;
 use itertools::Itertools;
 use miette::{Context, IntoDiagnostic};
+use pixi_config::{self, Config, ConfigCli};
+use pixi_progress::{await_in_progress, global_multi_progress, wrap_in_progress};
 use pixi_utils::reqwest::build_reqwest_clients;
 use rattler::{
     install::{DefaultProgressFormatter, IndicatifReporter, Installer},
@@ -21,16 +23,15 @@ use rattler_shell::{
     shell::{Shell, ShellEnum},
 };
 use rattler_solve::{resolvo::Solver, SolverImpl, SolverTask};
-use rattler_virtual_packages::VirtualPackage;
+use rattler_virtual_packages::{VirtualPackage, VirtualPackageOverrides};
 use reqwest_middleware::ClientWithMiddleware;
 
 use super::common::{channel_name_from_prefix, find_designated_package, BinDir, BinEnvDir};
 use crate::{
-    cli::cli_config::ChannelsConfig, cli::has_specs::HasSpecs, prefix::Prefix,
+    cli::{cli_config::ChannelsConfig, has_specs::HasSpecs},
+    prefix::Prefix,
     rlimit::try_increase_rlimit_to_sensible,
 };
-use pixi_config::{self, Config, ConfigCli};
-use pixi_progress::{await_in_progress, global_multi_progress, wrap_in_progress};
 
 /// Installs the defined package in a global accessible location.
 #[derive(Parser, Debug)]
@@ -313,7 +314,7 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         .into_diagnostic()?;
 
     // Determine virtual packages of the current platform
-    let virtual_packages = VirtualPackage::current()
+    let virtual_packages = VirtualPackage::detect(&VirtualPackageOverrides::from_env())
         .into_diagnostic()
         .context("failed to determine virtual packages")?
         .iter()

src/cli/global/upgrade.rs

@@ -8,7 +8,7 @@ use miette::{Context, IntoDiagnostic, Report};
 use pixi_utils::reqwest::build_reqwest_clients;
 use rattler_conda_types::{Channel, GenericVirtualPackage, MatchSpec, PackageName, Platform};
 use rattler_solve::{resolvo::Solver, SolverImpl, SolverTask};
-use rattler_virtual_packages::VirtualPackage;
+use rattler_virtual_packages::{VirtualPackage, VirtualPackageOverrides};
 use tokio::task::JoinSet;
 
 use super::{common::find_installed_package, install::globally_install_package};
@@ -134,7 +134,7 @@ pub(super) async fn upgrade_packages(
                 .collect();
 
             // Determine virtual packages of the current platform
-            let virtual_packages = VirtualPackage::current()
+            let virtual_packages = VirtualPackage::detect(&VirtualPackageOverrides::from_env())
                 .into_diagnostic()
                 .context("failed to determine virtual packages")?
                 .iter()

src/cli/info.rs

@@ -11,7 +11,7 @@ use pixi_manifest::{FeaturesExt, HasFeaturesIter};
 use pixi_progress::await_in_progress;
 use rattler_conda_types::{GenericVirtualPackage, Platform};
 use rattler_networking::authentication_storage;
-use rattler_virtual_packages::VirtualPackage;
+use rattler_virtual_packages::{VirtualPackage, VirtualPackageOverrides};
 use serde::Serialize;
 use serde_with::{serde_as, DisplayFromStr};
 use tokio::task::spawn_blocking;
@@ -360,7 +360,7 @@ pub async fn execute(args: Args) -> miette::Result<()> {
         })
         .unwrap_or_default();
 
-    let virtual_packages = VirtualPackage::current()
+    let virtual_packages = VirtualPackage::detect(&VirtualPackageOverrides::from_env())
         .into_diagnostic()?
         .iter()
         .cloned()