Sync dune-project with opam dependencies#8423
Open
aspeddro wants to merge 2 commits into
Open
Conversation
The .opam files declared dependencies (cppo, flow_parser, ocamlformat,
yojson, ounit2, odoc, ocaml-lsp-server, js_of_ocaml,
wasm_of_ocaml-compiler) that were not present in dune-project. For the
rescript package those deps were sourced from rescript.opam.template,
which fully overrode what dune-project would have generated. For
analysis and tools, the odoc {with-doc} entry was missing entirely.
Move all dependencies into dune-project so it is the single source of
truth, and shrink rescript.opam.template to only the pin-depends: block
for the flow_parser fork — the one field dune-project cannot express.
The regenerated .opam files are equivalent to the previous ones.
rescript
@rescript/darwin-arm64
@rescript/darwin-x64
@rescript/linux-arm64
@rescript/linux-x64
@rescript/runtime
@rescript/win32-x64
commit: |
aspeddro
commented
May 12, 2026
Comment on lines
+22
to
+45
| (>= 5.0.0)) | ||
| (cppo | ||
| (= 1.8.0)) | ||
| (flow_parser | ||
| (= 0.267.0)) | ||
| (ocamlformat | ||
| (and :with-test (= 0.27.0))) | ||
| (yojson | ||
| (and :with-test (= 2.2.2))) | ||
| (ounit2 | ||
| (and :with-test (= 2.2.7))) | ||
| (odoc :with-doc) | ||
| (ocaml-lsp-server | ||
| (and :with-dev-setup (= 1.22.0))) | ||
| (js_of_ocaml | ||
| (and | ||
| (<> :os "win32") | ||
| :with-test | ||
| (= 6.0.1))) | ||
| (wasm_of_ocaml-compiler | ||
| (and | ||
| (<> :os "win32") | ||
| :with-test | ||
| (= 6.0.1))))) |
Contributor
Author
There was a problem hiding this comment.
The changes made in #7349 removed deps from dune-project
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
1 participant
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 .opam files declared dependencies (cppo, flow_parser, ocamlformat, yojson, ounit2, odoc, ocaml-lsp-server, js_of_ocaml, wasm_of_ocaml-compiler) that were not present in dune-project. For the rescript package those deps were sourced from rescript.opam.template, which fully overrode what dune-project would have generated. For analysis and tools, the odoc {with-doc} entry was missing entirely.
Move all dependencies into dune-project so it is the single source of truth, and shrink rescript.opam.template to only the pin-depends: block for the flow_parser fork — the one field dune-project cannot express. The regenerated .opam files are equivalent to the previous ones.