Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/rattler-bin/src/commands/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ pub async fn create(opt: Opt, offline: bool) -> miette::Result<()> {
VirtualPackages::detect_for_platform(
install_platform,
&VirtualPackageOverrides::from_env(),
rattler::default_cache_dir().ok().as_deref(),
)
.map(|vpkgs| vpkgs.into_generic_virtual_packages().collect::<Vec<_>>())
.into_diagnostic()
Expand Down
16 changes: 9 additions & 7 deletions crates/rattler-bin/src/commands/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,15 @@ async fn create_exec_prefix(options: CreateExecPrefixOptions<'_>) -> miette::Res
tracing::debug!("loaded {} records from repodata", total_records);

// Determine virtual packages of the current platform
let virtual_packages: Vec<GenericVirtualPackage> =
VirtualPackage::detect(&VirtualPackageOverrides::from_env())
.into_diagnostic()
.context("failed to determine virtual packages")?
.into_iter()
.map(GenericVirtualPackage::from)
.collect();
let virtual_packages: Vec<GenericVirtualPackage> = VirtualPackage::detect(
&VirtualPackageOverrides::from_env(),
rattler::default_cache_dir().ok().as_deref(),
)
.into_diagnostic()
.context("failed to determine virtual packages")?
.into_iter()
.map(GenericVirtualPackage::from)
.collect();

let solver_task = SolverTask {
specs: specs.to_vec(),
Expand Down
1 change: 1 addition & 0 deletions crates/rattler-bin/src/commands/prefix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ fn validate_virtual_package_dependencies(
let virtual_packages = rattler_virtual_packages::VirtualPackages::detect_for_platform(
platform,
&rattler_virtual_packages::VirtualPackageOverrides::from_env(),
rattler::default_cache_dir().ok().as_deref(),
)
.into_diagnostic()
.with_context(|| format!("failed to determine virtual packages for {platform}"))?
Expand Down
10 changes: 7 additions & 3 deletions crates/rattler-bin/src/commands/solve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,13 @@ pub async fn solve(opt: Opt, offline: bool) -> miette::Result<()> {
if let Some(virtual_packages) = &opt.virtual_package {
parse_virtual_packages(virtual_packages)
} else {
VirtualPackages::detect_for_platform(opt.platform, &VirtualPackageOverrides::from_env())
.map(|vpkgs| vpkgs.into_generic_virtual_packages().collect::<Vec<_>>())
.into_diagnostic()
VirtualPackages::detect_for_platform(
opt.platform,
&VirtualPackageOverrides::from_env(),
rattler::default_cache_dir().ok().as_deref(),
)
.map(|vpkgs| vpkgs.into_generic_virtual_packages().collect::<Vec<_>>())
.into_diagnostic()
}
})?;

Expand Down
36 changes: 31 additions & 5 deletions crates/rattler-bin/src/commands/virtual_packages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,37 @@ use rattler_virtual_packages::VirtualPackageOverrides;
pub struct Opt {}

pub fn virtual_packages(_opt: Opt) -> miette::Result<()> {
let virtual_packages =
rattler_virtual_packages::VirtualPackage::detect(&VirtualPackageOverrides::from_env())
.into_diagnostic()?;
for package in virtual_packages {
println!("{}", GenericVirtualPackage::from(package.clone()));
let cache_dir = rattler::default_cache_dir().ok();
tracing::debug!(
cache_dir = %cache_dir
.as_ref()
.map_or_else(|| "<disabled>".to_string(), |path| path.display().to_string()),
"detecting virtual packages"
);

let virtual_packages = rattler_virtual_packages::VirtualPackage::detect(
&VirtualPackageOverrides::from_env(),
cache_dir.as_deref(),
)
.into_diagnostic()?;

let generic_virtual_packages = virtual_packages
.into_iter()
.map(GenericVirtualPackage::from)
.collect::<Vec<_>>();
let package_strings = generic_virtual_packages
.iter()
.map(ToString::to_string)
.collect::<Vec<_>>();

tracing::debug!(
count = package_strings.len(),
packages = ?package_strings,
"detected virtual packages"
);

for package in generic_virtual_packages {
println!("{package}");
}
Ok(())
}
7 changes: 7 additions & 0 deletions crates/rattler_virtual_packages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ once_cell = { workspace = true }
rattler_conda_types = { workspace = true, default-features = false }
regex = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tempfile = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
archspec = { workspace = true }
Expand All @@ -26,6 +28,11 @@ plist = { workspace = true }

[target.'cfg(target_os="windows")'.dependencies]
winver = { workspace = true }
windows-sys = { workspace = true, features = [
"Win32_System_SystemInformation",
"Win32_System_Registry",
"Win32_Devices_DeviceAndDriverInstallation",
] }

[dev-dependencies]
temp-env = { workspace = true }
Loading
Loading