Skip to content

Commit

Permalink
Merge pull request #27102 from hannesm/fix-with-test
Browse files Browse the repository at this point in the history 
fix constraints of the form "with-test >= Y" to "with-test & >= Y"
  • Loading branch information
@mseri
mseri authored Dec 16, 2024
2 parents 9b19569 + c46b46b commit 23aff87
Show file tree
Hide file tree
Showing 17 changed files with 47 additions and 45 deletions.
2 changes: 1 addition & 1 deletion packages/conjury/conjury.2.0.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"ocaml" { with-test & >= "4.04" }
"ocamlfind" { with-test & >= "1.7.3" }
"omake" { = "0.10.3" }
"ounit2" { with-test >= "2.2" }
"ounit2" { with-test & >= "2.2" }
]
build: [
[ "omake" "--configure" ]
Expand Down
2 changes: 1 addition & 1 deletion packages/conjury/conjury.2.1.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ depends: [
"ocaml" { >= "4.08" & < "5.0"}
"ocamlfind" { >= "1.7.3"}
"omake" { >= "0.10.3"}
"ounit2" { with-test >= "2.2"}
"ounit2" { >= "2.2"}
]
build: [
["omake" "--dotomake.omake" "--force-dotomake" "--configure" "build"]
Expand Down
2 changes: 1 addition & 1 deletion packages/conjury/conjury.2.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ depends: [
"ocaml" { >= "4.08" & < "5.0"}
"ocamlfind" { >= "1.7.3"}
"omake" { = "0.10.3"}
"ounit2" { with-test >= "2.2"}
"ounit2" { >= "2.2"}
]
build: [
["omake" "--dotomake.omake" "--force-dotomake" "--configure" "build"]
Expand Down
8 changes: 4 additions & 4 deletions packages/gobba/gobba.0.4.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ build: [
]

depends: [
"dune" {>= "2.0"}
"dune" {>= "3.0"}
"ocaml" {>= "4.05.0"}
"ANSITerminal"
"ocamline" {>= "1.0" & < "1.2"}
"menhir"
"menhir" {>= "20180528"}
"ppx_deriving"
"cmdliner"
"cmdliner" {>= "0.9.8"}
"alcotest" {with-test & >= "0.8.5"}
"bisect_ppx" {with-test >= "1.4.1" & < "2.6.0"}
"bisect_ppx" {>= "1.4.1" & < "2.6.0"}
]
url {
src:
Expand Down
6 changes: 3 additions & 3 deletions packages/lsp/lsp.1.11.3/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ license: "ISC"
homepage: "https://github.com/ocaml/ocaml-lsp"
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"jsonrpc" {= version}
"dyn"
"yojson"
"ppx_yojson_conv_lib" {>= "v0.14"}
"cinaps" {with-test}
"menhir" {"20211230" >= with-test}
"ppx_expect" {"v0.14.0" >= with-test}
"menhir" {>= "20211230" & with-test}
"ppx_expect" {>= "v0.14.0" & with-test}
"uutf" {>= "1.0.2"}
"odoc" {with-doc}
"ocaml" {>= "4.12"}
Expand Down
6 changes: 3 additions & 3 deletions packages/lsp/lsp.1.11.4/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ license: "ISC"
homepage: "https://github.com/ocaml/ocaml-lsp"
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"jsonrpc" {= version}
"dyn"
"yojson"
"ppx_yojson_conv_lib" {>= "v0.14"}
"cinaps" {with-test}
"menhir" {"20211230" >= with-test}
"ppx_expect" {"v0.14.0" >= with-test}
"menhir" {>= "20211230" & with-test}
"ppx_expect" {>= "v0.14.0" & with-test}
"uutf" {>= "1.0.2"}
"odoc" {with-doc}
"ocaml" {>= "4.12"}
Expand Down
6 changes: 3 additions & 3 deletions packages/lsp/lsp.1.11.5/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ license: "ISC"
homepage: "https://github.com/ocaml/ocaml-lsp"
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"jsonrpc" {= version}
"dyn"
"yojson"
"ppx_yojson_conv_lib" {>= "v0.14"}
"cinaps" {with-test}
"menhir" {"20211230" >= with-test}
"ppx_expect" {"v0.14.0" >= with-test}
"menhir" {>= "20211230" & with-test}
"ppx_expect" {>= "v0.14.0" & with-test}
"uutf" {>= "1.0.2"}
"odoc" {with-doc}
"ocaml" {>= "4.12"}
Expand Down
6 changes: 3 additions & 3 deletions packages/lsp/lsp.1.11.6/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ license: "ISC"
homepage: "https://github.com/ocaml/ocaml-lsp"
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"jsonrpc" {= version}
"dyn"
"yojson"
"ppx_yojson_conv_lib" {>= "v0.14"}
"cinaps" {with-test}
"menhir" {"20211230" >= with-test}
"ppx_expect" {"v0.14.0" >= with-test}
"menhir" {>= "20211230" & with-test}
"ppx_expect" {>= "v0.14.0" & with-test}
"uutf" {>= "1.0.2"}
"odoc" {with-doc}
"ocaml" {>= "4.12"}
Expand Down
6 changes: 3 additions & 3 deletions packages/lsp/lsp.1.12.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ license: "ISC"
homepage: "https://github.com/ocaml/ocaml-lsp"
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"jsonrpc" {= version}
"dyn"
"yojson"
"ppx_yojson_conv_lib" {>= "v0.14"}
"cinaps" {with-test}
"menhir" {"20211230" >= with-test}
"ppx_expect" {"v0.15.0" >= with-test}
"menhir" {>= "20211230" & with-test}
"ppx_expect" {>= "v0.15.0" & with-test}
"uutf" {>= "1.0.2"}
"odoc" {with-doc}
"ocaml" {>= "4.12"}
Expand Down
4 changes: 2 additions & 2 deletions packages/lsp/lsp.1.12.1/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ license: "ISC"
homepage: "https://github.com/ocaml/ocaml-lsp"
bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
depends: [
"dune" {>= "2.9"}
"dune" {>= "3.0"}
"jsonrpc" {= version}
"dyn"
"yojson"
"ppx_yojson_conv_lib" {>= "v0.14"}
"cinaps" {with-test}
"menhir" {>= "20211230" & with-test}
"ppx_expect" {"v0.15.0" >= with-test}
"ppx_expect" {>= "v0.15.0" & with-test}
"uutf" {>= "1.0.2"}
"odoc" {with-doc}
"ocaml" {>= "4.12"}
Expand Down
9 changes: 5 additions & 4 deletions packages/minicaml/minicaml.0.3.3/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ build: [
[make "test" "-j" jobs] {with-test}
]
depends: [
"dune" {>= "2.0"}
"dune" {>= "3.0"}
"ocaml" {>= "4.05.0"}
"ANSITerminal"
"menhir"
"menhir" {>= "20180528"}
"ppx_deriving"
"cmdliner"
"cmdliner" {>= "0.9.8"}
"cmdliner" {with-test & < "1.1.0"}
"alcotest" {with-test & >= "0.8.5" & < "1.0.0"}
"bisect_ppx" {with-test >= "1.4.1" & < "2.0.0"}
"bisect_ppx" {>= "1.4.1" & < "2.0.0"}
]
url {
src:
Expand Down
7 changes: 4 additions & 3 deletions packages/minicaml/minicaml.0.4/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ build: [
[make "test" "-j" jobs] {with-test}
]
depends: [
"dune" {>= "2.0"}
"dune" {>= "3.0"}
"ocaml" {>= "4.05.0"}
"ANSITerminal"
"ocamline" {>= "1.0" & < "1.2"}
"menhir"
"menhir" {>= "20180528"}
"ppx_deriving"
"cmdliner"
"cmdliner" {>= "0.9.8"}
"cmdliner" {with-test & < "1.1.0"}
"alcotest" {with-test & >= "0.8.5"}
"bisect_ppx" {>= "1.4.1" & < "2.0.0"}
]
Expand Down
2 changes: 1 addition & 1 deletion packages/pa_ppx/pa_ppx.0.09/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ depends: [
"bos" { >= "0.2.0" }
"uint" { >= "2.0.1" }
"ounit"
# "sexplib" { with-test >= "v0.14.0" }
# "sexplib" { with-test & >= "v0.14.0" }
# "ppx_import" { with-test & >= "1.7.1" }
# "ppx_deriving { with-test }
# "ppx_deriving_yojson" { with-test & >= "3.5.2" }
Expand Down
8 changes: 4 additions & 4 deletions packages/pratter/pratter.3.0.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ homepage: "https://forge.tedomum.net/koizel/pratter"
bug-reports: "https://github.com/gabrielhdt/pratter/issues"
depends: [
"ocaml" {>= "4.08"}
"dune" {>= "2.7"}
"dune" {>= "3.0"}
"camlp-streams" {>= "5.0" & < "6"}
"alcotest" {with-test >= "1.5.0" & < "2"}
"qcheck" {with-test >= "0.12"}
"qcheck-alcotest" {with-test >= "0.12"}
"alcotest" {with-test & >= "1.5.0" & < "2"}
"qcheck" {with-test & >= "0.12"}
"qcheck-alcotest" {with-test & >= "0.12"}
"odoc" {with-doc}
]
build: [
Expand Down
6 changes: 3 additions & 3 deletions packages/tls-eio/tls-eio.1.0.0/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ depends: [
"mirage-crypto-rng" {>= "1.0.0"}
"mirage-crypto-rng-eio" {with-test & >= "1.0.0"}
"eio" {>= "0.12"}
"eio_main" {>= "0.12" with-test}
"eio_main" {>= "0.12" & with-test}
"mdx" {with-test}
"crowbar" {>= "0.2.1" with-test}
"logs" {>= "0.7.0" with-test}
"crowbar" {>= "0.2.1" & with-test}
"logs" {>= "0.7.0" & with-test}
"ptime" {>= "1.0.0"}
]
tags: [ "org:mirage"]
Expand Down
6 changes: 3 additions & 3 deletions packages/tls-eio/tls-eio.1.0.2/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ depends: [
"mirage-crypto-rng" {>= "1.0.0"}
"mirage-crypto-rng-eio" {with-test & >= "1.0.0"}
"eio" {>= "0.12"}
"eio_main" {>= "0.12" with-test}
"eio_main" {>= "0.12" & with-test}
"mdx" {with-test}
"crowbar" {>= "0.2.1" with-test}
"logs" {>= "0.7.0" with-test}
"crowbar" {>= "0.2.1" & with-test}
"logs" {>= "0.7.0" & with-test}
"ptime" {>= "1.0.0"}
]
tags: [ "org:mirage"]
Expand Down
6 changes: 3 additions & 3 deletions packages/tls-eio/tls-eio.1.0.4/opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ depends: [
"mirage-crypto-rng" {>= "1.0.0"}
"mirage-crypto-rng-eio" {with-test & >= "1.0.0"}
"eio" {>= "0.12"}
"eio_main" {>= "0.12" with-test}
"eio_main" {>= "0.12" & with-test}
"mdx" {with-test}
"crowbar" {>= "0.2.1" with-test}
"logs" {>= "0.7.0" with-test}
"crowbar" {>= "0.2.1" & with-test}
"logs" {>= "0.7.0" & with-test}
"ptime" {>= "1.0.0"}
]
tags: [ "org:mirage"]
Expand Down

0 comments on commit 23aff87

Please sign in to comment.