Skip to content

Sync dune-project with opam dependencies #8423

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

Open
aspeddro wants to merge 2 commits into
base: master
Choose a base branch
from
+42 −35
Open

Sync dune-project with opam dependencies #8423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a71b2d
Sync dune-project with opam dependencies
aspeddro May 12, 2026
0bd2deb
add dune
aspeddro May 12, 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
2 changes: 1 addition & 1 deletion analysis.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ license: "LGPL-3.0-or-later"
homepage: "https://github.com/rescript-lang/rescript-compiler"
bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
depends: [
"dune" {>= "3.17"}
"ocaml" {>= "5.0.0"}
"cppo" {= "1.8.0"}
"dune" {>= "3.17"}
"odoc" {with-doc}
]
build: [
Expand Down
30 changes: 27 additions & 3 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,31 @@
(synopsis "ReScript compiler")
(depends
(ocaml
(>= 5.0.0))))
(>= 5.0.0))
dune
(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)))))
Comment on lines +22 to +46
Copy link
Copy Markdown
Contributor Author

@aspeddro aspeddro May 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes made in #7349 removed deps from dune-project


(package
(name analysis)
Expand All @@ -29,7 +53,7 @@
(>= 5.0.0))
(cppo
(= 1.8.0))
dune))
(odoc :with-doc)))

(package
(name tools)
Expand All @@ -42,4 +66,4 @@
(cppo
(= 1.8.0))
analysis
dune))
(odoc :with-doc)))
28 changes: 13 additions & 15 deletions rescript.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ authors: ["Hongbo Zhang <bobzhang1988@gmail.com>"]
license: "LGPL-3.0-or-later"
homepage: "https://github.com/rescript-lang/rescript-compiler"
bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
depends: [
"ocaml" {>= "5.0.0"}
"dune" {>= "3.17"}
"cppo" {= "1.8.0"}
"flow_parser" {= "0.267.0"}
"ocamlformat" {with-test & = "0.27.0"}
"yojson" {with-test & = "2.2.2"}
"ounit2" {with-test & = "2.2.7"}
"odoc" {with-doc}
"ocaml-lsp-server" {with-dev-setup & = "1.22.0"}
"js_of_ocaml" {os != "win32" & with-test & = "6.0.1"}
"wasm_of_ocaml-compiler" {os != "win32" & with-test & = "6.0.1"}
]
build: [
["dune" "subst"] {dev}
[
Expand All @@ -20,21 +33,6 @@ build: [
"@doc" {with-doc}
]
]
depends: [
"ocaml" {>= "5.0.0"}
"cppo" {= "1.8.0"}
"dune" {>= "3.17"}
"flow_parser" {= "0.267.0"}
"ocamlformat" {with-test & = "0.27.0"}
"yojson" {with-test & = "2.2.2"}
"ounit2" {with-test & = "2.2.7"}
"odoc" {with-doc}
"ocaml-lsp-server" {with-dev-setup & = "1.22.0"}

# Test dependencies that would be broken on Windows runners
"js_of_ocaml" {os != "win32" & with-test & = "6.0.1"}
"wasm_of_ocaml-compiler" {os != "win32" & with-test & = "6.0.1"}
]
pin-depends: [
["flow_parser.0.267.0" "git+https://github.com/rescript-lang/flow.git#9ea4062c0b7e037415c4413a7634c459ebd5c31b"]
]
15 changes: 0 additions & 15 deletions rescript.opam.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
depends: [
"ocaml" {>= "5.0.0"}
"cppo" {= "1.8.0"}
"dune" {>= "3.17"}
"flow_parser" {= "0.267.0"}
"ocamlformat" {with-test & = "0.27.0"}
"yojson" {with-test & = "2.2.2"}
"ounit2" {with-test & = "2.2.7"}
"odoc" {with-doc}
"ocaml-lsp-server" {with-dev-setup & = "1.22.0"}

# Test dependencies that would be broken on Windows runners
"js_of_ocaml" {os != "win32" & with-test & = "6.0.1"}
"wasm_of_ocaml-compiler" {os != "win32" & with-test & = "6.0.1"}
]
pin-depends: [
["flow_parser.0.267.0" "git+https://github.com/rescript-lang/flow.git#9ea4062c0b7e037415c4413a7634c459ebd5c31b"]
]
2 changes: 1 addition & 1 deletion tools.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ license: "LGPL-3.0-or-later"
homepage: "https://github.com/rescript-lang/rescript-compiler"
bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
depends: [
"dune" {>= "3.17"}
"ocaml" {>= "5.0.0"}
"cmarkit" {>= "0.3.0"}
"cppo" {= "1.8.0"}
"analysis"
"dune" {>= "3.17"}
"odoc" {with-doc}
]
build: [
Expand Down
Loading