Include non-platform-specific solver vars in portable lockdirs #12678
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gridbugs
force-pushed
the
portable-lockdirs-add-non-platform-specific-solver-variables
branch
3 times, most recently
from
a124243 to
d85eae5
Compare
Alizter
approved these changes
Nov 7, 2025
shonfeder
approved these changes
Nov 7, 2025
Member
|
A general comment that is related to this PR but isn't necessarily directly applicable: the code base needs to move away from distinguishing portable from non portable lock directories. What I mean by that is:
Given those, the current definitions are just:
In practice, I think this means that we should not be having flags as |
Collaborator
Author
|
Oops didn't mean to close this! |
Alizter
reviewed
Nov 10, 2025
src/dune_pkg/lock_dir.mli
Outdated
| -> repos:Opam_repo.t list option | ||
| -> expanded_solver_variable_bindings:Solver_stats.Expanded_variable_bindings.t | ||
| -> solved_for_platform:Solver_env.t option | ||
| (* TODO: make this non-optional when portable lockdirs becomes the default *) |
Collaborator
There was a problem hiding this comment.
Suggested change
| (* TODO: make this non-optional when portable lockdirs becomes the default *) | |
| (* TODO: make this ^^^ non-optional when portable lockdirs becomes the default *) |
otherwise the comment is a bit confusing
Previously all expanded solver variables were omitted from lockdirs, as some solver variables are specific to the platform being solved for. This was too strict, and meant that non-platform-specific solver variables like "with-doc" were incorrectly omitted. This change adds non-platform-specific expanded solver variables to portable lockdirs. Signed-off-by: Stephen Sherratt <[email protected]>
gridbugs
force-pushed
the
portable-lockdirs-add-non-platform-specific-solver-variables
branch
from
d85eae5 to
6d24064
Compare
gridbugs
deleted the
portable-lockdirs-add-non-platform-specific-solver-variables
branch
Sudha247
pushed a commit
to Sudha247/dune
that referenced
this pull request
Nov 14, 2025
…#12678) Previously all expanded solver variables were omitted from lockdirs, as some solver variables are specific to the platform being solved for. This was too strict, and meant that non-platform-specific solver variables like "with-doc" were incorrectly omitted. This change adds non-platform-specific expanded solver variables to portable lockdirs. Signed-off-by: Stephen Sherratt <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously all expanded solver variables were omitted from lockdirs, as some solver variables are specific to the platform being solved for. This was too strict, and meant that non-platform-specific solver variables like "with-doc" were incorrectly omitted. This change adds non-platform-specific expanded solver variables to portable lockdirs.