Skip to content

Commit

Permalink
Add bounds for removed dune ctypes 0.1 extension
Browse files Browse the repository at this point in the history
The ctypes extension in Dune is documented as experimental (and has
version 0.x) so is not subject to the same compatibility as the rest of
Dune.

Dune 3.11.0 removed versions 0.1 and 0.2 of this extension, so packages
using it need to build with `dune < 3.11`.

Affected packages need to migrate to version 0.3. This should be just a
matter of changing the version of the extension in `dune-project`, but:
- it requires `(lang dune 3.7)`
- if C code refers to local include paths, these are now relative to the
  where the stanza is located. This avoids the need to specify paths
  twice. See ocaml/dune#6883.
  • Loading branch information
emillon authored and nberth committed May 16, 2024
1 parent fd96515 commit 4fb6a3a
Show file tree
Hide file tree
Showing 41 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion packages/colibrics/colibrics.0.3.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ depends: [
"dolmen" {>= "0.7" & < "0.8" }
"dolmen_type" {>= "0.7" & < "0.8" }
"dolmen_loop" {>= "0.7" & < "0.8" }
"dune" {>= "3.0"}
"dune" {>= "3.0" & < "3.11"}
"zarith" {>= "1.12"}
"cmdliner" {>= "1.1.1"}
"ocaml" {>= "4.08" & < "5.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/colibrics/colibrics.0.4/opam
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ depends: [
"dolmen" {>= "0.8" & < "0.9" }
"dolmen_type" {>= "0.8" & < "0.9" }
"dolmen_loop" {>= "0.8" & < "0.9" }
"dune" {>= "3.0"}
"dune" {>= "3.0" & < "3.11"}
"zarith" {>= "1.12"}
"cmdliner" {>= "1.1.1"}
"ocaml" {>= "4.08"}
Expand Down
2 changes: 1 addition & 1 deletion packages/colibrilib/colibrilib.0.3.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ homepage: "https://colibri.frama-c.com"
bug-reports: "https://git.frama-c.com/pub/colibrics/issues"
license: "LGPL-2.1"
depends: [
"dune" {>= "3.0"}
"dune" {>= "3.0" & < "3.11"}
"zarith" {>= "1.12"}
"ocaml" {>= "4.12"}
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion packages/colibrilib/colibrilib.0.4/opam
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license: "LGPL-2.1-only"
homepage: "https://colibri.frama-c.com"
bug-reports: "https://git.frama-c.com/pub/colibrics/issues"
depends: [
"dune" {>= "3.0"}
"dune" {>= "3.0" & < "3.11"}
"zarith" {>= "1.12"}
"ocaml" {>= "4.12"}
"odoc" {with-doc}
Expand Down
2 changes: 1 addition & 1 deletion packages/flint/flint.0.1.5/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license: "LGPL-2.1"
homepage: "https://github.com/bobot/ocaml-flint"
bug-reports: "https://github.com/bobot/ocaml-flint/issues"
depends: [
"dune" {>= "3.2"}
"dune" {>= "3.2" & < "3.11"}
"zarith" {>= "1.12"}
"ctypes" {>= "0.20.1"}
"conf-mpfr" {>= "3"}
Expand Down
2 changes: 1 addition & 1 deletion packages/flint/flint.0.2.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license: "LGPL-2.1-only"
homepage: "https://github.com/bobot/ocaml-flint"
bug-reports: "https://github.com/bobot/ocaml-flint/issues"
depends: [
"dune" {>= "3.2"}
"dune" {>= "3.2" & < "3.11"}
"zarith" {>= "1.12"}
"ctypes" {>= "0.20.1"}
"conf-mpfr" {>= "3"}
Expand Down
2 changes: 1 addition & 1 deletion packages/flint/flint.0.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license: "LGPL-2.1-only"
homepage: "https://github.com/bobot/ocaml-flint"
bug-reports: "https://github.com/bobot/ocaml-flint/issues"
depends: [
"dune" {>= "3.2"}
"dune" {>= "3.2" & < "3.11"}
"zarith" {>= "1.12"}
"ctypes" {>= "0.20.1"}
"conf-mpfr" {>= "3"}
Expand Down
2 changes: 1 addition & 1 deletion packages/monocypher/monocypher.0.1.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license: "CC0-1.0"
homepage: "https://inqlab.net/git/ocaml-monocypher.git"
bug-reports: "mailto:[email protected]"
depends: [
"dune" {>= "3.2"}
"dune" {>= "3.2" & < "3.11"}
"ocaml" {>= "4.08.0"}
"ctypes" {>= "0.13.0"}
"alcotest" {with-test}
Expand Down
2 changes: 1 addition & 1 deletion packages/octez-alcotezt/octez-alcotezt.17.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"tezt" { >= "3.1.0" }
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"bls12-381" { >= "6.1.0" & < "6.2.0" }
"bisect_ppx" { >= "2.7.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"ppx_repr" { >= "0.6.0" }
"bls12-381" { >= "6.1.0" & < "6.2.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"bls12-381" { >= "6.1.0" & < "6.2.0" }
"alcotest" { with-test & >= "1.5.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"base-unix"
]
Expand Down
2 changes: 1 addition & 1 deletion packages/octez-mec/octez-mec.17.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"alcotest" { >= "1.5.0" }
"bls12-381" { >= "6.1.0" & < "6.2.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/octez-polynomial/octez-polynomial.17.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"bls12-381" { >= "6.1.0" & < "6.2.0" }
"bisect_ppx" { >= "2.7.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-hacl/tezos-hacl.15.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"tezos-stdlib" { with-test & = version }
"tezos-error-monad" { with-test & = version }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-hacl/tezos-hacl.15.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"hacl-star" { >= "0.4.2" & < "0.5" }
"hacl-star-raw"
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-hacl/tezos-hacl.16.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"hacl-star" { >= "0.6.1" & < "0.7" }
"hacl-star-raw"
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-hacl/tezos-hacl.16.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"hacl-star" { >= "0.6.1" & < "0.7" }
"hacl-star-raw"
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-hacl/tezos-hacl.17.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"hacl-star" { >= "0.7.0" & < "0.8" }
"hacl-star-raw"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.12" }
"lwt" { >= "5.6.0" }
"alcotest-lwt" { with-test & >= "1.5.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.12" }
"lwt" { >= "5.6.0" }
"alcotest-lwt" { with-test & >= "1.5.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"lwt" { >= "5.6.0" }
"alcotest-lwt" { with-test & >= "1.5.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"lwt" { >= "5.6.0" }
"alcotest-lwt" { with-test & >= "1.5.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"lwt" { >= "5.6.0" }
"seqes" { >= "0.2" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-stdlib/tezos-stdlib.15.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"alcotest" { with-test & >= "1.5.0" }
"alcotest-lwt" { with-test & >= "1.5.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-stdlib/tezos-stdlib.15.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"ppx_expect"
"hex" { >= "1.3.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-stdlib/tezos-stdlib.16.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"ppx_expect"
"hex" { >= "1.3.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-stdlib/tezos-stdlib.16.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"ppx_expect"
"hex" { >= "1.3.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-stdlib/tezos-stdlib.17.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"ppx_expect"
"hex" { >= "1.3.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-test-helpers/tezos-test-helpers.15.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.12" }
"uri" { >= "2.2.0" }
"fmt" { >= "0.8.7" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-test-helpers/tezos-test-helpers.15.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.12" }
"uri" { >= "2.2.0" }
"fmt" { >= "0.8.7" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-test-helpers/tezos-test-helpers.16.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"uri" { >= "3.1.0" }
"fmt" { >= "0.8.7" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-test-helpers/tezos-test-helpers.16.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"uri" { >= "3.1.0" }
"fmt" { >= "0.8.7" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-test-helpers/tezos-test-helpers.17.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"uri" { >= "3.1.0" }
"fmt" { >= "0.8.7" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-wasmer/tezos-wasmer.16.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"ppx_deriving"
"ctypes" { >= "0.18.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-wasmer/tezos-wasmer.16.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"ppx_deriving"
"ctypes" { >= "0.18.0" }
Expand Down
2 changes: 1 addition & 1 deletion packages/tezos-wasmer/tezos-wasmer.17.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" & < "5.0" }
"ppx_deriving"
"ctypes" { >= "0.18.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"tezt" { >= "3.1.0" }
"uri" { >= "3.1.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"tezt" { >= "3.1.0" }
"uri" { >= "3.1.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "git+https://gitlab.com/tezos/tezos.git"
license: "MIT"
depends: [
"dune" { >= "3.0" }
"dune" {>= "3.0" & < "3.11"}
"ocaml" { >= "4.14" }
"tezt" { >= "3.1.0" }
"uri" { >= "3.1.0" }
Expand Down

0 comments on commit 4fb6a3a

Please sign in to comment.