Skip to content

Commit

Permalink
Merge pull request ocaml#16856 from kit-ty-kate/412-fixes
Browse files Browse the repository at this point in the history 
Make dune >= 1.7 incompatible with OCaml 4.12
  • Loading branch information
@kit-ty-kate
kit-ty-kate authored Jul 28, 2020
2 parents 8e6de32 + 39b993f commit 4297a14
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion packages/dune/dune.1.11.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"ocaml" {>= "4.02"}
"ocaml" {>= "4.02" & < "4.12"}
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.1.11.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"ocaml" {>= "4.02"}
"ocaml" {>= "4.02" & < "4.12"}
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.1.11.2/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"ocaml" {>= "4.02"}
"ocaml" {>= "4.02" & < "4.12"}
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.1.11.3/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"ocaml" {>= "4.02"}
"ocaml" {>= "4.02" & < "4.12"}
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.1.11.4/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"ocaml" {>= "4.02"}
"ocaml" {>= "4.02" & < "4.12"}
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.0.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
("ocaml" {>= "4.06"} | ("ocaml" {< "4.06~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.06" & < "4.12"} | ("ocaml" {< "4.06~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.0.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
("ocaml" {>= "4.06"} | ("ocaml" {< "4.06~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.06" & < "4.12"} | ("ocaml" {< "4.06~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.1.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.1.2/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.1.3/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.2.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.3.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build: [
depends: [
# Please keep the lower bound in sync with .travis.yml, dune-project
# and min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.3.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build: [
depends: [
# Please keep the lower bound in sync with .travis.yml, dune-project
# and min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.4.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build: [
depends: [
# Please keep the lower bound in sync with .travis.yml, dune-project
# and min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.5.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build: [
depends: [
# Please keep the lower bound in sync with .travis.yml, dune-project
# and min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.5.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build: [
depends: [
# Please keep the lower bound in sync with .travis.yml, dune-project
# and min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.6.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ build: [
depends: [
# Please keep the lower bound in sync with .travis.yml, dune-project
# and min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/dune/dune.2.6.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ build: [
depends: [
# Please keep the lower bound in sync with .travis.yml, dune-project
# and min_ocaml_version in bootstrap.ml
("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary"))
"base-unix"
"base-threads"
]
Expand Down

0 comments on commit 4297a14

Please sign in to comment.