Skip to content
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.

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

Re-enable a few packages for OCaml 5.3 #26831

Merged
merged 5 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions packages/MlFront_Cli/MlFront_Cli.0.4.0~prerel7/opam
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ depends: [
"odoc" {with-doc}
]
conflicts: [
"base-effects"
"ocaml-variants" {= "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
build: [
[
"sh"
Expand All @@ -49,4 +51,4 @@ url {
"md5=eaaecad4dfce5ad6849444bfa1e0cc44"
"sha512=9cf976ec567c41101249a4cc1f57dedac14597f664d44ab8d25d1507812357ab038a6d47fe7e4450d25114e7f9edcedbcf78c1e24267858d8b7b0c12fb15c22b"
]
}
}
2 changes: 1 addition & 1 deletion packages/caisar-onnx/caisar-onnx.0.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage: "https://git.frama-c.com/pub/caisar"
doc: "https://git.frama-c.com/pub/caisar"
bug-reports: "https://git.frama-c.com/pub/caisar/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"ocaml" {>= "4.13"}
"base" {>= "v0.14.0" & < "v0.17"}
"stdio" {>= "v0.14.0"}
Expand Down
2 changes: 1 addition & 1 deletion packages/caisar/caisar.0.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ depends: [
"ppx_deriving_yojson" {>= "3.6.1"}
"csv" {>= "2.4"}
"why3" {>= "1.5.0" & < "1.6~"}
"re" {>= "1.10.4"}
"re" {>= "1.10.4" & < "1.12.0"}
"caisar-nnet" {= version}
"caisar-ovo" {= version}
"caisar-onnx" {= version}
Expand Down
2 changes: 1 addition & 1 deletion packages/caisar/caisar.0.2.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ depends: [
"menhirLib" {>= "20210310"}
"csv" {>= "2.4"}
"why3" {>= "1.6.0" & < "1.7~"}
"re" {>= "1.10.4"}
"re" {>= "1.10.4" & < "1.12.0"}
"fpath" {>= "0.7.3"}
"yaml" {>= "3.1.0"}
"ocaml-protoc-plugin" {>= "4.2.0"}
Expand Down
4 changes: 2 additions & 2 deletions packages/caisar/caisar.0.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ depends: [
"piqilib" {>= "0.6.14"}
"zarith" {>= "1.7"}
"ocplib-endian" {>= "1.0"}
"base" {>= "v0.14.0" & < "v0.17" }
"base" {>= "v0.15.0" & < "v0.17" }
"stdio" {>= "v0.14.0"}
"cmdliner" {>= "1.1.1"}
"fmt" {>= "0.8.9"}
Expand All @@ -28,7 +28,7 @@ depends: [
"ppx_deriving_yojson" {>= "3.6.1"}
"csv" {>= "2.4"}
"why3" {>= "1.6.0" & < "1.7~"}
"re" {>= "1.10.4"}
"re" {>= "1.10.4" & < "1.12.0"}
"fpath" {>= "0.7.3"}
"yaml" {>= "3.1.0"}
"caisar-nnet" {= version}
Expand Down
2 changes: 1 addition & 1 deletion packages/caisar/caisar.1.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ depends: [
"menhirLib" {>= "20210310"}
"csv" {>= "2.4"}
"why3" {= "1.6.0"}
"re" {>= "1.10.4"}
"re" {>= "1.10.4" & < "1.12.0"}
"fpath" {>= "0.7.3"}
"yaml" {>= "3.1.0"}
"ocaml-protoc-plugin" {>= "4.2.0"}
Expand Down
2 changes: 1 addition & 1 deletion packages/caisar/caisar.2.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ depends: [
"menhirLib" {>= "20210310"}
"csv" {>= "2.4"}
"why3" {= "1.6.0"}
"re" {>= "1.10.4"}
"re" {>= "1.10.4" & < "1.12.0"}
"fpath" {>= "0.7.3"}
"yaml" {>= "3.1.0"}
"ocaml-protoc-plugin" {>= "4.2.0"}
Expand Down
2 changes: 1 addition & 1 deletion packages/caisar/caisar.2.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ depends: [
"menhirLib" {>= "20210310"}
"csv" {>= "2.4"}
"why3" {>= "1.7.0"}
"re" {>= "1.10.4"}
"re" {>= "1.10.4" & < "1.12.0"}
"fpath" {>= "0.7.3"}
"yaml" {>= "3.1.0"}
"ocaml-protoc-plugin" {>= "4.2.0"}
Expand Down
4 changes: 3 additions & 1 deletion packages/coq-core/coq-core.8.17.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ depends: [
conflicts: [
"coq" { < "8.17" }
"ocaml-option-bytecode-only"
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
build-env: OCAMLPARAM = "_,w=-46,warn-error=-a,keywords=5.2"
build: [
[ "./configure"
"-prefix" prefix
Expand Down
4 changes: 3 additions & 1 deletion packages/coq-core/coq-core.8.17.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ depends: [
]
conflicts: [
"coq" { < "8.17" }
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
build-env: OCAMLPARAM = "_,w=-46,warn-error=-a,keywords=5.2"
build: [
[ "./configure"
"-prefix" prefix
Expand Down
4 changes: 3 additions & 1 deletion packages/coq-core/coq-core.8.18.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ depends: [
]
conflicts: [
"coq" { < "8.17" }
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
build-env: OCAMLPARAM = "_,w=-46,warn-error=-a,keywords=5.2"
build: [
# Requires dune 2.8 due to https://github.com/ocaml/dune/issues/3219
# ["dune" "subst"] {pinned}
Expand Down
4 changes: 3 additions & 1 deletion packages/coq-core/coq-core.8.19.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ depends: [
]
conflicts: [
"coq" { < "8.17" }
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
depopts: ["coq-native"]
dev-repo: "git+https://github.com/coq/coq.git"
build-env: OCAMLPARAM = "_,w=-46,warn-error=-a,keywords=5.2"
build: [
["dune" "subst"] {dev}
[ "./configure"
Expand Down
4 changes: 3 additions & 1 deletion packages/coq-core/coq-core.8.19.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ depends: [
]
conflicts: [
"coq" { < "8.17" }
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
depopts: ["coq-native"]
dev-repo: "git+https://github.com/coq/coq.git"
build-env: OCAMLPARAM = "_,w=-46,warn-error=-a,keywords=5.2"
build: [
["dune" "subst"] {dev}
[ "./configure"
Expand Down
4 changes: 3 additions & 1 deletion packages/mock/mock.1.0.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bug-reports: "https://github.com/cryptosense/ocaml-mock/issues"
license: "BSD-2-Clause"
dev-repo: "git+https://github.com/cryptosense/ocaml-mock.git"
doc: "https://cryptosense.github.io/ocaml-mock/doc"
build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
build: [
[ "dune" "build" "-p" name "-j" jobs ]
]
Expand All @@ -14,7 +15,8 @@ depends: [
"ocaml" {>= "4.07.0"}
]
conflicts: [
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
synopsis: "Configurable functions to test impure code"
description: """
Expand Down
6 changes: 4 additions & 2 deletions packages/mopsa/mopsa.1.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ depends: [
]
depopts: ["elina"]
conflicts: [
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
available:
!(arch = "x86_32") & !(os-family = "windows") & opam-version >= "2.1.0"
build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
build: [
["./configure"] {os != "macos"}
[
Expand Down Expand Up @@ -97,4 +99,4 @@ url {
"md5=9f673f79708b44a7effb3b6bb3618d2c"
"sha512=cb91cb428e43a22f1abbcb8219710d0c10a5b3756d0da392d4084b3b3a6157350776c596983e63def344f617d39964e91f244f60c07958695ee5c8c809a9f0f4"
]
}
}
7 changes: 6 additions & 1 deletion packages/omake/omake.0.10.6/opam
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dev-repo: "git+https://github.com/ocaml-omake/omake.git"
homepage: "http://projects.camlcity.org/projects/omake.html"
bug-reports: "https://github.com/ocaml-omake/issues"

build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"

build: [
["./configure" "-prefix" "%{prefix}%"]
[make]
Expand All @@ -24,7 +26,10 @@ depends: [
"ocaml" {>= "4.03.0"}
"ocamlfind"
]
conflicts: [ "base-effects" ]
conflicts: [
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
synopsis: "Build system designed for scalability and portability"

url {
Expand Down
4 changes: 3 additions & 1 deletion packages/prbnmcn-dagger/prbnmcn-dagger.0.0.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ depends: [
"odoc" {with-doc}
]
conflicts: [
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
build: [
["dune" "subst"] {dev}
[
Expand Down
4 changes: 3 additions & 1 deletion packages/prbnmcn-dagger/prbnmcn-dagger.0.0.3/opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ depends: [
"odoc" {with-doc}
]
conflicts: [
"base-effects"
"ocaml-variants" {= "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
build: [
["dune" "subst"] {dev}
[
Expand Down
4 changes: 3 additions & 1 deletion packages/prbnmcn-dagger/prbnmcn-dagger.0.0.4/opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ depends: [
"odoc" {with-doc}
]
conflicts: [
"base-effects"
"ocaml-variants" {= "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
build: [
["dune" "subst"] {dev}
[
Expand Down
4 changes: 3 additions & 1 deletion packages/prbnmcn-dagger/prbnmcn-dagger.0.0.5/opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ depends: [
"odoc" {with-doc}
]
conflicts: [
"base-effects"
"ocaml-variants" {= "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
build: [
["dune" "subst"] {dev}
[
Expand Down
5 changes: 4 additions & 1 deletion packages/why3/why3.1.6.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ tags: [
"interactive theorem prover"
]

build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"

build: [
["./autogen.sh"] {dev} # when pinning, there might be no configure file
["./configure"
Expand Down Expand Up @@ -73,7 +75,8 @@ conflicts: [
"why3-base"
"ocamlgraph" {< "1.8.2"}
"mlmpfr" {< "4.0.0"}
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
"ocaml-option-bytecode-only"
]

Expand Down
5 changes: 4 additions & 1 deletion packages/why3/why3.1.7.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ tags: [
"interactive theorem prover"
]

build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"

build: [
["./autogen.sh"] {dev} # when pinning, there might be no configure file
["touch" "configure"]
Expand Down Expand Up @@ -74,7 +76,8 @@ conflicts: [
"why3-base"
"ocamlgraph" {< "1.8.2"}
"mlmpfr" {< "4.0.0"}
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
"ocaml-option-bytecode-only"
]

Expand Down
5 changes: 4 additions & 1 deletion packages/why3/why3.1.7.1/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ tags: [
"interactive theorem prover"
]

build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"

build: [
["./autogen.sh"] {dev} # when pinning, there might be no configure file
["touch" "configure"]
Expand Down Expand Up @@ -74,7 +76,8 @@ conflicts: [
"why3-base"
"ocamlgraph" {< "1.8.2"}
"mlmpfr" {< "4.0.0"}
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
"ocaml-option-bytecode-only"
]

Expand Down
5 changes: 4 additions & 1 deletion packages/why3/why3.1.7.2/opam
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ tags: [
"interactive theorem prover"
]

build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"

build: [
["./autogen.sh"] {dev} # when pinning, there might be no configure file
["touch" "configure"]
Expand Down Expand Up @@ -74,7 +76,8 @@ conflicts: [
"why3-base"
"ocamlgraph" {< "1.8.2"}
"mlmpfr" {< "4.0.0"}
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]

synopsis: "Why3 environment for deductive program verification"
Expand Down
4 changes: 3 additions & 1 deletion packages/yocaml/yocaml.1.0.0/opam
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ synopsis: "YOCaml It is a static site generator, mostly written in OCaml"
maintainer: "[email protected]"
authors: [ "The XHTMLBoy <[email protected]>" ]

build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
build: [
[ "dune" "subst" ] {dev}
[ "dune" "build" "-p" name "-j" jobs ]
Expand All @@ -24,7 +25,8 @@ depends: [
"preface" { >= "1.0.0"}
]
conflicts: [
"base-effects"
"ocaml-variants" {= "4.12.0+domains+effects" | = "5.1.1+effect-syntax"}
"ocaml-compiler" {= "5.3.0~alpha1"}
]
url {
src:
Expand Down
Loading