Skip to content

Commit

Permalink
Conflict with seq < 0.3
Browse files Browse the repository at this point in the history
Older versions conflict with the stdlib one. Also, require mdx 2.2.0 to
prevent complains about semi-colons.
  • Loading branch information
talex5 committed Mar 13, 2023
1 parent 39c981b commit 9d968dc
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
13 changes: 7 additions & 6 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
(conflicts
(ocaml-base-compiler (< 5.0.0~beta1))
(ocaml-variants (< 5.0.0~beta1))
(ocaml-system (< 5.0.0~beta1)))
(ocaml-system (< 5.0.0~beta1))
(seq (< 0.3)))
(depends
(ocaml (>= 5.0.0))
(bigstringaf (>= 0.9.0))
Expand All @@ -26,7 +27,7 @@
(hmap (>= 0.8.1))
(crowbar (and (>= 0.2) :with-test))
(mtime (>= 2.0.0))
(mdx (and (>= 1.10.0) :with-test))
(mdx (and (>= 2.2.0) :with-test))
(alcotest (and (>= 1.4.0) :with-test))
(dscheck (and (>= 0.1.0) :with-test))))
(package
Expand All @@ -36,7 +37,7 @@
(depends
(alcotest (and (>= 1.4.0) :with-test))
(eio (= :version))
(mdx (and (>= 1.10.0) :with-test))
(mdx (and (>= 2.2.0) :with-test))
(logs (>= 0.7.0))
(fmt (>= 0.8.9))
(cmdliner (and (>= 1.1.0) :with-test))
Expand All @@ -48,7 +49,7 @@
(depends
(eio (= :version))
(iomux (>= 0.2))
(mdx (and (>= 1.10.0) :with-test))
(mdx (and (>= 2.2.0) :with-test))
(fmt (>= 0.8.9))))
(package
(name eio_luv)
Expand All @@ -58,15 +59,15 @@
(eio (= :version))
(luv (>= 0.5.11))
(luv_unix (>= 0.5.0))
(mdx (and (>= 1.10.0) :with-test))
(mdx (and (>= 2.2.0) :with-test))
(fmt (>= 0.8.9))))
(package
(name eio_main)
(synopsis "Effect-based direct-style IO mainloop for OCaml")
(description "Selects an appropriate Eio backend for the current platform.")
(depopts eio_luv)
(depends
(mdx (and (>= 1.10.0) :with-test))
(mdx (and (>= 2.2.0) :with-test))
(eio_linux (and (= :version) (= :os "linux")))
(eio_posix (and (= :version) (<> :os "windows")))
(eio_luv (and (= :version) (or (= :os "windows") :with-test)))))
Expand Down
3 changes: 2 additions & 1 deletion eio.opam
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ depends: [
"hmap" {>= "0.8.1"}
"crowbar" {>= "0.2" & with-test}
"mtime" {>= "2.0.0"}
"mdx" {>= "1.10.0" & with-test}
"mdx" {>= "2.2.0" & with-test}
"alcotest" {>= "1.4.0" & with-test}
"dscheck" {>= "0.1.0" & with-test}
"odoc" {with-doc}
Expand All @@ -29,6 +29,7 @@ conflicts: [
"ocaml-base-compiler" {< "5.0.0~beta1"}
"ocaml-variants" {< "5.0.0~beta1"}
"ocaml-system" {< "5.0.0~beta1"}
"seq" {< "0.3"}
]
build: [
["dune" "subst"] {dev}
Expand Down
2 changes: 1 addition & 1 deletion eio_linux.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.7"}
"alcotest" {>= "1.4.0" & with-test}
"eio" {= version}
"mdx" {>= "1.10.0" & with-test}
"mdx" {>= "2.2.0" & with-test}
"logs" {>= "0.7.0"}
"fmt" {>= "0.8.9"}
"cmdliner" {>= "1.1.0" & with-test}
Expand Down
2 changes: 1 addition & 1 deletion eio_luv.opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"eio" {= version}
"luv" {>= "0.5.11"}
"luv_unix" {>= "0.5.0"}
"mdx" {>= "1.10.0" & with-test}
"mdx" {>= "2.2.0" & with-test}
"fmt" {>= "0.8.9"}
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion eio_main.opam
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ doc: "https://ocaml-multicore.github.io/eio/"
bug-reports: "https://github.com/ocaml-multicore/eio/issues"
depends: [
"dune" {>= "3.7"}
"mdx" {>= "1.10.0" & with-test}
"mdx" {>= "2.2.0" & with-test}
"eio_linux" {= version & os = "linux"}
"eio_posix" {= version & os != "windows"}
"eio_luv" {= version & os = "windows" | with-test}
Expand Down
2 changes: 1 addition & 1 deletion eio_posix.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ depends: [
"dune" {>= "3.7"}
"eio" {= version}
"iomux" {>= "0.2"}
"mdx" {>= "1.10.0" & with-test}
"mdx" {>= "2.2.0" & with-test}
"fmt" {>= "0.8.9"}
"odoc" {with-doc}
]
Expand Down

0 comments on commit 9d968dc

Please sign in to comment.