diff --git a/Cargo.lock b/Cargo.lock index 15a96e6c..1a9e5825 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1795,7 +1795,7 @@ dependencies = [ [[package]] name = "fancy_display" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "console 0.15.11", ] @@ -4068,7 +4068,7 @@ dependencies = [ [[package]] name = "pixi_build_type_conversions" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "itertools 0.14.0", "ordermap", @@ -4082,7 +4082,7 @@ dependencies = [ [[package]] name = "pixi_build_types" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "ordermap", "rattler_conda_types", @@ -4096,7 +4096,7 @@ dependencies = [ [[package]] name = "pixi_config" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "clap", "console 0.15.11", @@ -4122,7 +4122,7 @@ dependencies = [ [[package]] name = "pixi_consts" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "console 0.15.11", "rattler_cache", @@ -4133,7 +4133,7 @@ dependencies = [ [[package]] name = "pixi_git" version = "0.0.1" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "dashmap", "dunce", @@ -4153,7 +4153,7 @@ dependencies = [ [[package]] name = "pixi_manifest" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "chrono", "console 0.15.11", @@ -4193,7 +4193,7 @@ dependencies = [ [[package]] name = "pixi_pypi_spec" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "itertools 0.14.0", "pep440_rs", @@ -4213,7 +4213,7 @@ dependencies = [ [[package]] name = "pixi_spec" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "dirs", "file_url", @@ -4236,7 +4236,7 @@ dependencies = [ [[package]] name = "pixi_spec_containers" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "indexmap 2.10.0", "itertools 0.14.0", @@ -4248,7 +4248,7 @@ dependencies = [ [[package]] name = "pixi_toml" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "digest", "hex", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "pixi_utils" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#3484c4f8771b322b7a5a5546af3c785de2cd68b3" dependencies = [ "async-fd-lock", "fs-err", diff --git a/crates/pixi-build-backend/src/intermediate_backend.rs b/crates/pixi-build-backend/src/intermediate_backend.rs index bc8f2b98..4f53b959 100644 --- a/crates/pixi-build-backend/src/intermediate_backend.rs +++ b/crates/pixi-build-backend/src/intermediate_backend.rs @@ -1181,11 +1181,23 @@ where finalized_dependencies: Some(FinalizedDependencies { build: Some(ResolvedDependencies { specs: vec![], - resolved: vec![], + resolved: params + .build_prefix + .map(|prefix| prefix.packages) + .unwrap_or_default() + .into_iter() + .map(|pkg| pkg.repodata_record) + .collect(), }), host: Some(ResolvedDependencies { specs: vec![], - resolved: vec![], + resolved: params + .host_prefix + .map(|prefix| prefix.packages) + .unwrap_or_default() + .into_iter() + .map(|pkg| pkg.repodata_record) + .collect(), }), run: FinalizedRunDependencies { depends: vec![], diff --git a/crates/pixi-build-backend/src/utils/test.rs b/crates/pixi-build-backend/src/utils/test.rs index f8a1bec6..485bb24b 100644 --- a/crates/pixi-build-backend/src/utils/test.rs +++ b/crates/pixi-build-backend/src/utils/test.rs @@ -82,6 +82,7 @@ where let current_dir = std::env::current_dir().unwrap(); let result = protocol .conda_outputs(CondaOutputsParams { + channels: vec![], host_platform, build_platform: host_platform, variant_configuration, diff --git a/crates/pixi-build-cmake/src/main.rs b/crates/pixi-build-cmake/src/main.rs index 7ae39a54..2088b944 100644 --- a/crates/pixi-build-cmake/src/main.rs +++ b/crates/pixi-build-cmake/src/main.rs @@ -363,6 +363,7 @@ mod tests { let outputs = factory .0 .conda_outputs(CondaOutputsParams { + channels: vec![], host_platform: Platform::Win64, build_platform: Platform::Win64, variant_configuration: None, diff --git a/crates/pixi-build-rattler-build/src/protocol.rs b/crates/pixi-build-rattler-build/src/protocol.rs index 7a6143e2..95277438 100644 --- a/crates/pixi-build-rattler-build/src/protocol.rs +++ b/crates/pixi-build-rattler-build/src/protocol.rs @@ -1004,6 +1004,7 @@ mod tests { let result = factory .0 .conda_outputs(CondaOutputsParams { + channels: vec![], host_platform: Platform::Linux64, build_platform: Platform::Linux64, variant_configuration: None, diff --git a/py-pixi-build-backend/Cargo.lock b/py-pixi-build-backend/Cargo.lock index c63755d0..0fd62c2f 100644 --- a/py-pixi-build-backend/Cargo.lock +++ b/py-pixi-build-backend/Cargo.lock @@ -1862,7 +1862,7 @@ dependencies = [ [[package]] name = "fancy_display" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "console 0.15.11", ] @@ -3976,7 +3976,7 @@ dependencies = [ [[package]] name = "pixi_build_type_conversions" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "itertools 0.14.0", "ordermap", @@ -3990,7 +3990,7 @@ dependencies = [ [[package]] name = "pixi_build_types" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "ordermap", "rattler_conda_types 0.37.0", @@ -4004,7 +4004,7 @@ dependencies = [ [[package]] name = "pixi_config" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "clap", "console 0.15.11", @@ -4030,7 +4030,7 @@ dependencies = [ [[package]] name = "pixi_consts" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "console 0.15.11", "rattler_cache 0.3.29", @@ -4041,7 +4041,7 @@ dependencies = [ [[package]] name = "pixi_git" version = "0.0.1" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "dashmap", "dunce", @@ -4061,7 +4061,7 @@ dependencies = [ [[package]] name = "pixi_manifest" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "chrono", "console 0.15.11", @@ -4101,7 +4101,7 @@ dependencies = [ [[package]] name = "pixi_pypi_spec" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "itertools 0.14.0", "pep440_rs", @@ -4121,7 +4121,7 @@ dependencies = [ [[package]] name = "pixi_spec" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "dirs", "file_url 0.2.6", @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "pixi_spec_containers" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "indexmap 2.10.0", "itertools 0.14.0", @@ -4156,7 +4156,7 @@ dependencies = [ [[package]] name = "pixi_toml" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "digest", "hex", @@ -4171,7 +4171,7 @@ dependencies = [ [[package]] name = "pixi_utils" version = "0.1.0" -source = "git+https://github.com/prefix-dev/pixi?branch=main#56f7ebe64a068ae64b31cd44b59af05c566262b8" +source = "git+https://github.com/prefix-dev/pixi?branch=main#2f25603ef6060ab0aa370d2c4b7240e09008eb97" dependencies = [ "async-fd-lock", "fs-err",