Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2a0d5ab
chore: update pixi types
baszalmstra Jun 26, 2025
f4ae163
outputs for cmake
baszalmstra Jun 26, 2025
11a8f53
python too
baszalmstra Jun 27, 2025
f7f48dd
feat: rattler-build support and variants
baszalmstra Jun 27, 2025
6f82b07
fix: rattler-build has provides-conda-outputs enabled
baszalmstra Jun 27, 2025
59f5138
feat: depend on fork of pixi
baszalmstra Jun 27, 2025
9ee7820
Merge remote-tracking branch 'upstream/main' into feat/split-protocol
baszalmstra Jun 27, 2025
41e54c7
fix: pre-commit
baszalmstra Jun 27, 2025
fee4e16
fix: tests
baszalmstra Jun 27, 2025
ace869f
feat: bump pixi, rattler and rattler-build
baszalmstra Jul 3, 2025
b37592b
Merge remote-tracking branch 'upstream/main' into feat/split-protocol
baszalmstra Jul 4, 2025
19bfc06
intermediate backend support
baszalmstra Jul 4, 2025
e26db0c
fmt
baszalmstra Jul 4, 2025
b6ace59
Merge remote-tracking branch 'upstream/main' into feat/split-protocol
baszalmstra Jul 10, 2025
02f491d
fix: clippy issue
baszalmstra Jul 10, 2025
9a0cacc
fix: test snapshots
baszalmstra Jul 10, 2025
da600b0
chore: align with pixi changes
baszalmstra Jul 7, 2025
4c73f63
it seems to work
baszalmstra Jul 10, 2025
b752651
update cargo
baszalmstra Jul 8, 2025
dbf0f16
add support for rattler-build too
baszalmstra Jul 8, 2025
d789327
fix: small issues
baszalmstra Jul 10, 2025
71f35f2
fix: pre-commit
baszalmstra Jul 10, 2025
aad6e79
fix: snapshots
baszalmstra Jul 10, 2025
8c52506
align with latest pixi changes
baszalmstra Jul 15, 2025
bce9915
fixes
baszalmstra Jul 15, 2025
0b88aa9
update to latest pixi changes
baszalmstra Jul 15, 2025
7fd6161
fix: target `prefix-dev/pixi@branch=main`
baszalmstra Jul 15, 2025
561dbc3
chore: bump pixi
baszalmstra Jul 18, 2025
d65b31c
update to simpler rattler-build modification and fix cmake build dir
baszalmstra Jul 24, 2025
c07229a
update to rattler-build main
baszalmstra Jul 24, 2025
2c167d7
precommit
baszalmstra Jul 24, 2025
729637f
update recipes
baszalmstra Jul 24, 2025
be269a1
fixes from code review
baszalmstra Jul 24, 2025
ae87723
fix: update compatible api version in recipe
baszalmstra Jul 24, 2025
9365ad0
Merge remote-tracking branch 'upstream/main' into feat/split-protocol…
baszalmstra Jul 24, 2025
8c8feed
fix: use default variants from recipe
baszalmstra Jul 25, 2025
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
1,139 changes: 602 additions & 537 deletions Cargo.lock

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ clap = "4.5.29"
clap-verbosity-flag = "3.0.2"
either = "1.15.0"
fs-err = "3.1.0"
hashlink = "0.10.0"
insta = "1.43.1"
indexmap = "2.7.1"
ordermap = "0.5.7"
itertools = "0.14.0"
log = "0.4.25"
marked-yaml = "0.8.0"
miette = "7.5.0"
minijinja = "2.7.0"
parking_lot = "0.12.3"
Expand All @@ -35,19 +39,20 @@ url = "2.5.4"
pyproject-toml = "0.13.4"
dirs = "6.0.0"
pathdiff = "0.2.3"
thiserror = "2.0.12"
strum = "0.27.2"

jsonrpc-stdio-server = "18.0.0"
jsonrpc-http-server = "18.0.0"
jsonrpc-core = "18.0.0"

rattler-build = { version = "*", default-features = false, features = [
rattler-build = { git = "https://github.com/prefix-dev/rattler-build", branch = "main", default-features = false, features = [
"rustls-tls",
] }


rattler_conda_types = { version = "0.32.0", default-features = false }
rattler_package_streaming = { version = "0.22.35", default-features = false }
rattler_virtual_packages = { version = "2.0.9", default-features = false }
rattler_conda_types = { version = "0.35.3", default-features = false }
rattler_package_streaming = { version = "0.22.42", default-features = false }
rattler_virtual_packages = { version = "2.0.16", default-features = false }

pixi_build_types = { version = "*" }
pixi_consts = { version = "*" }
Expand Down Expand Up @@ -80,6 +85,3 @@ pixi_build_type_conversions = { git = "https://github.com/prefix-dev/pixi", bran
#rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" }
#rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" }
#simple_spawn_blocking = { path = "../rattler/crates/simple_spawn_blocking" }

rattler-build = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
#rattler-build = { path = "../rattler-build" }
2 changes: 2 additions & 0 deletions crates/pixi-build-backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ clap = { workspace = true, features = ["derive", "env"] }
clap-verbosity-flag = { workspace = true }
fs-err = { workspace = true }
indexmap = { workspace = true }
ordermap = { workspace = true }
itertools = { workspace = true }
log = { workspace = true }
miette = { workspace = true }
Expand All @@ -32,6 +33,7 @@ url = { workspace = true }
pyproject-toml = { workspace = true }
dirs = { workspace = true }
pathdiff = { workspace = true }
thiserror = { workspace = true }

pixi_build_types = { workspace = true }
pixi_consts = { workspace = true }
Expand Down
25 changes: 21 additions & 4 deletions crates/pixi-build-backend/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use miette::{Context, IntoDiagnostic};
use pixi_build_types::{
BackendCapabilities, ChannelConfiguration, FrontendCapabilities, PlatformAndVirtualPackages,
procedures::{
conda_build::CondaBuildParams,
conda_build_v0::CondaBuildParams,
conda_metadata::{CondaMetadataParams, CondaMetadataResult},
initialize::InitializeParams,
negotiate_capabilities::NegotiateCapabilitiesParams,
Expand Down Expand Up @@ -93,17 +93,33 @@ pub async fn main<T: ProtocolInstantiator, F: FnOnce(LoggingOutputHandler) -> T>
Some(Commands::Capabilities) => {
let backend_capabilities = capabilities::<T>().await?;
eprintln!(
"Supports conda metadata: {}",
"Supports {}: {}",
pixi_build_types::procedures::conda_metadata::METHOD_NAME,
backend_capabilities
.provides_conda_metadata
.unwrap_or_default()
);
eprintln!(
"Supports conda build: {}",
"Supports {}: {}",
pixi_build_types::procedures::conda_outputs::METHOD_NAME,
backend_capabilities
.provides_conda_outputs
.unwrap_or_default()
);
eprintln!(
"Supports {}: {}",
pixi_build_types::procedures::conda_build_v0::METHOD_NAME,
backend_capabilities
.provides_conda_build
.unwrap_or_default()
);
eprintln!(
"Supports {}: {}",
pixi_build_types::procedures::conda_build_v1::METHOD_NAME,
backend_capabilities
.provides_conda_build_v1
.unwrap_or_default()
);
eprintln!(
"Highest project model: {}",
backend_capabilities
Expand Down Expand Up @@ -156,6 +172,7 @@ async fn initialize<T: ProtocolInstantiator>(
// Initialize the backend
let (protocol, _initialize_result) = factory
.initialize(InitializeParams {
source_dir: None,
manifest_path: manifest_path.to_path_buf(),
project_model,
cache_directory: None,
Expand Down Expand Up @@ -232,7 +249,7 @@ async fn build<T: ProtocolInstantiator>(factory: T, manifest_path: &Path) -> mie
.context("failed to create a temporary directory in the current directory")?;

let result = protocol
.conda_build(CondaBuildParams {
.conda_build_v0(CondaBuildParams {
host_platform: None,
build_platform_virtual_packages: None,
channel_base_urls: None,
Expand Down
Loading
Loading