Skip to content

fix(conda): preserve cross-platform lock data #11946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdx merged 4 commits into from
Aug 13, 2026
Merged

fix(conda): preserve cross-platform lock data #11946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f147c2
fix(conda): preserve cross-platform lock data
jdx Aug 12, 2026
bd04503
fix(lock): preserve unsupported platform skips
jdx Aug 12, 2026
4b9ff1c
fix(lock): propagate conda package resolution errors
jdx Aug 13, 2026
b477e68
fix(lock): reject unresolved platform upgrades
jdx Aug 13, 2026
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
86 changes: 45 additions & 41 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,14 @@ phf = "0.14"
rand = "0.10"
rattler = { version = "0.48", default-features = false }
rattler_conda_types = { version = "0.49", default-features = false }
rattler_repodata_gateway = { version = "0.31", default-features = false, features = [
rattler_repodata_gateway = { version = "0.32", default-features = false, features = [
"gateway",
] }
rattler_solve = { version = "9", default-features = false, features = [
"resolvo",
] }
rattler_package_streaming = { version = "0.26", default-features = false }
rattler_virtual_packages = { version = "4", default-features = false }
rattler_package_streaming = { version = "0.27", default-features = false }
rattler_virtual_packages = { version = "5", default-features = false }
reflink-copy = "0.1"
regex = "1"
plist = "1"
Expand Down
21 changes: 21 additions & 0 deletions e2e/lockfile/test_lockfile_conda_cross_platform
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env bash

# Regression test for https://github.com/jdx/mise/discussions/11944.
# Foreign-platform conda solves need usable virtual package defaults, and a
# failed re-solve must not delete an existing platform's dependency metadata.

export MISE_LOCKFILE=1

cat <<EOF >mise.toml
[tools]
"conda:ffmpeg" = "7.1.1"
EOF

mise lock --platform linux-x64
assert_contains "cat mise.lock" 'platforms.linux-x64'
assert_contains "cat mise.lock" 'conda_deps = ['
assert_contains "cat mise.lock" '[conda-packages.linux-x64.'

cp mise.lock mise.lock.before
assert_fail "CONDA_OVERRIDE_GLIBC=0 mise lock --platform linux-x64"
assert_succeed "cmp -s mise.lock.before mise.lock"
Loading