fix(oxcaml): import eta-expansion changes from opam-repo#12563
Merged
shonfeder merged 4 commits intoocaml:mainfrom Oct 13, 2025
Merged
fix(oxcaml): import eta-expansion changes from opam-repo#12563shonfeder merged 4 commits intoocaml:mainfrom
shonfeder merged 4 commits intoocaml:mainfrom
Conversation
Signed-off-by: ArthurW <arthur@tarides.com>
Signed-off-by: ArthurW <arthur@tarides.com>
5a324c9 to
6c3e1bb
Compare
Signed-off-by: ArthurW <arthur@tarides.com>
Member
|
This is blocking for https://github.com/ocaml/dune/milestone/64, since it prevents the oxcaml CI from running, which is how we're validating that the work on parametric libraries is working as expected. |
shonfeder
approved these changes
Oct 13, 2025
davesnx
added a commit
to davesnx/dune
that referenced
this pull request
Oct 14, 2025
* 'main' of github.com:/ocaml/dune: (147 commits) cram test: test only parameter flags in merlin generation fix(oxcaml): import eta-expansion changes from opam-repo (ocaml#12563) address review comments Mask the path to the stdlib fix(oxcaml): generate merlin config for library parameters fix(melange + include_qualified): track correct `.cmj` dependencies in emit (ocaml#12531) refactor: remove some unused code in [Path] (ocaml#12558) dep_rules: don't run (transitive) `ocamldep` on single module buildables (ocaml#12555) fix(pkg): ignore project settings for building packages test(pkg): reproduce ocaml#12131 melange: add a test for module cycle checks (ocaml#12554) chore: lint check for new changes entries (ocaml#12553) feature(cram): allow for conflict detection (ocaml#12538) ci: update for ocaml 5.4 release (ocaml#12552) chore(script): generate changelog from structure (ocaml#12516) Reuse dependencies between project and tools (ocaml#12526) Introduce Io.overwrite_file test: fix dune install requiring a mandir Enable package management for more tests Add a `dune tools env` command to add dev tools to PATH (ocaml#12521) ...
Collaborator
|
I wrote that patch, but it's not really meaningful enough to warrant crediting 😅 Thanks! I'll see if we can fix this issue at the OxCaml side, since this behavior didn't happen with just Dune. |
MisterDA
pushed a commit
to MisterDA/dune
that referenced
this pull request
Nov 13, 2025
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.
The OxCaml opam-repo ships a custom version of dune, using this patch (= same as this PR). The changes are only required for OxCaml, but they fix the new errors in the dune CI. Furthermore as discovered by @Alizter, the OxCaml opam-repo has recently added a constraint on dune version to be exactly
3.20.2+ox, which leads to opam conflicts if we use the defaultdevversion.Cc @d-kalinichenko : who should be credited for the commit? :)