Skip to content
Draft
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
234 changes: 180 additions & 54 deletions Cargo.lock

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ slotmap = "1.0.7"
spdx = "0.10.8"
strsim = "0.11.1"
strum = "0.28.0"
sysinfo = "0.39"
tabwriter = "1.4.1"
tar = "0.4.44"
temp-env = { version = "0.3.6", features = ["async_closure"] }
Expand Down Expand Up @@ -223,6 +224,7 @@ uv-types = { git = "https://github.com/astral-sh/uv", tag = "0.11.15" }
uv-workspace = { git = "https://github.com/astral-sh/uv", tag = "0.11.15" }
webpki-root-certs = "1"
which = "8.0.0"
windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_System_Threading", "Win32_System_IO", "Win32_Storage_FileSystem"] }
xxhash-rust = "0.8.15"
zip = { version = "8.0.0", default-features = false }
zstd = { version = "0.13.3", default-features = false }
Expand All @@ -231,6 +233,7 @@ zstd = { version = "0.13.3", default-features = false }
file_url = "0.3.0"
rattler = { version = "0.46", default-features = false }
rattler_cache = { version = "0.10", default-features = false }
rattler_fs = { version = "0.1.0" }
rattler_conda_types = { version = "0.47", default-features = false, features = [
"rayon",
] }
Expand Down Expand Up @@ -267,6 +270,26 @@ rattler_build_types = { version = "0.1.8" }
rattler_build_variant_config = { version = "0.1.9" }

[patch.crates-io]
coalesced_map = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
file_url = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
path_resolver = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_cache = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_conda_types = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_digest = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_fs = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_index = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_lock = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_menuinst = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_networking = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_package_streaming = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_repodata_gateway = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_s3 = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_shell = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_solve = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_upload = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
rattler_virtual_packages = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
simple_spawn_blocking = { git = "https://github.com/chrisburr/rattler", branch = "feat/rattler-fs" }
version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" }

# Redirect crates.io's `reqwest-middleware` to a local shim that re-exports
Expand Down
4 changes: 4 additions & 0 deletions crates/pixi_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pypi_modifiers = { workspace = true }
rattler = { workspace = true, features = ["cli-tools", "indicatif"] }
rattler_conda_types = { workspace = true }
rattler_index = { workspace = true }
rattler_fs = { workspace = true }
rattler_lock = { workspace = true }
rattler_networking = { workspace = true, default-features = false }
rattler_package_streaming = { workspace = true }
Expand Down Expand Up @@ -111,6 +112,9 @@ pixi_test_utils = { workspace = true }
libc = { workspace = true, default-features = false }
pixi_pty = { path = "../pixi_pty" }

[target.'cfg(windows)'.dependencies]
windows-sys = { workspace = true }

[features]
default = []
native-tls = [
Expand Down
6 changes: 6 additions & 0 deletions crates/pixi_cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ pub mod install;
pub mod list;
pub mod lock;
pub(crate) mod match_spec_or_path;
pub mod mount;
mod process_exit;
pub mod publish;
pub mod reinstall;
Expand All @@ -49,6 +50,7 @@ pub mod shell;
pub mod shell_hook;
pub mod task;
pub mod tree;
pub mod umount;
pub mod update;
pub mod upgrade;
pub mod upload;
Expand Down Expand Up @@ -174,6 +176,8 @@ pub enum Command {
#[clap(visible_alias = "ls")]
List(list::Args),
Lock(lock::Args),
Mount(mount::Args),
Umount(umount::Args),
Reinstall(reinstall::Args),
Publish(publish::Args),
#[clap(visible_alias = "rm")]
Expand Down Expand Up @@ -385,6 +389,8 @@ pub async fn execute_command(
Command::Update(cmd) => update::execute(cmd).await,
Command::Upgrade(cmd) => upgrade::execute(cmd).await,
Command::Lock(cmd) => lock::execute(cmd).await,
Command::Mount(cmd) => mount::execute(cmd).await,
Command::Umount(cmd) => umount::execute(cmd).await,
Command::Exec(args) => exec::execute(args).await,
Command::Build(args) => build::execute(args).await,
Command::External(args) => command_info::execute_external_command(args),
Expand Down
Loading
Loading