fix: Add or remove dune from package sets to allow resolving packages depending on it#11103
Merged
Leonidas-from-XIV merged 4 commits intoocaml:mainfrom Nov 6, 2024
Merged
Conversation
b7ac875 to
76ce2c5
Compare
dune to existing packages to allow resolving
maiste
approved these changes
Nov 5, 2024
Collaborator
maiste
left a comment
There was a problem hiding this comment.
One question to understand but it LGTM 👍
Collaborator
Author
|
I've changed the PR from doing 1. to 2, as I didn't like how we construct a fake |
76ce2c5 to
db5505a
Compare
rgrinberg
approved these changes
Nov 5, 2024
Member
|
We need to do a combination of 1 and 2. We need to pick the correct deps for a formula like So we give the right dune version when evaluating the formula and then filtering out dune from the evaluated list. We do the same for external deps as well. I pushed something along those lines. |
Signed-off-by: Marek Kubica <marek@tarides.com>
Signed-off-by: Marek Kubica <marek@tarides.com>
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
220cb43 to
f1d0556
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
There's multiple ways to go about it:
dune_rpcor whether that would even be the right thing, so I set the version todev.dunefrom the dependency formulas.Dependency_formula.remove_package formula (Package_name.Set.singleton Dune_dep.name)is an alternate solution.Fixes #11096