Misc: fix opam files

ocsigen · Nov 16, 2019 · f8c2f08 · f8c2f08
1 parent b895550
commit f8c2f08
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 12 deletions.
diff --git a/js_of_ocaml-compiler.opam b/js_of_ocaml-compiler.opam
@@ -15,7 +15,7 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 
 depends: [
   "ocaml" {>= "4.02.0"}
-  "dune" {build & >= "1.11.1"}
+  "dune" {>= "1.11.1"}
   "ppx_expect" {with-test & >= "0.12.0"}
   "cmdliner"
   "ocaml-migrate-parsetree"

diff --git a/js_of_ocaml-lwt.opam b/js_of_ocaml-lwt.opam
@@ -15,7 +15,7 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 
 depends: [
   "ocaml" {>= "4.02.0"}
-  "dune" {build & >= "1.11.1"}
+  "dune" {>= "1.11.1"}
   "lwt" {>= "2.4.4"}
   "js_of_ocaml" {>= "3.2"}
   "js_of_ocaml-ppx"

diff --git a/js_of_ocaml-ocamlbuild.opam b/js_of_ocaml-ocamlbuild.opam
@@ -14,6 +14,6 @@ environment like browsers and Node.js
 build: [["dune" "build" "-p" name "-j" jobs]]
 
 depends: [
-  "dune" {build & >= "1.11.1"}
+  "dune" {>= "1.11.1"}
   "ocamlbuild"
 ]
diff --git a/js_of_ocaml-ppx.opam b/js_of_ocaml-ppx.opam
@@ -15,7 +15,7 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 
 depends: [
   "ocaml" {>= "4.02.0"}
-  "dune" {build & >= "1.11.1"}
+  "dune" {>= "1.11.1"}
   "ocaml-migrate-parsetree" {>= "1.4"}
   "ppx_tools_versioned" {>= "5.2.3"}
   "js_of_ocaml" {>= "3.0"}

diff --git a/js_of_ocaml-ppx_deriving_json.opam b/js_of_ocaml-ppx_deriving_json.opam
@@ -15,7 +15,7 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 
 depends: [
   "ocaml" {>= "4.04.1"}
-  "dune" {build & >= "1.11.1"}
+  "dune" {>= "1.11.1"}
   "js_of_ocaml"
   "ocaml-migrate-parsetree"
   "ppxlib" {< "0.9.0"}

diff --git a/js_of_ocaml-toplevel.opam b/js_of_ocaml-toplevel.opam
@@ -15,7 +15,7 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 
 depends: [
   "ocaml" {>= "4.02.0"}
-  "dune" {build & >= "1.11.1"}
+  "dune" {>= "1.11.1"}
   "ocamlfind" {>= "1.5.1"}
   "js_of_ocaml-compiler"
   "js_of_ocaml-ppx"

diff --git a/js_of_ocaml-tyxml.opam b/js_of_ocaml-tyxml.opam
@@ -15,12 +15,9 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 
 depends: [
   "ocaml" {>= "4.02.0"}
-  "dune" {build & >= "1.11.1"}
+  "dune" {>= "1.11.1"}
   "tyxml" {>= "4.3"}
   "reactiveData" {>= "0.2"}
   "js_of_ocaml" {>= "3.0"}
   "js_of_ocaml-ppx"
-]
-conflicts: [
-  "js_of_ocaml"             {<"3.0"}
-]
+]
diff --git a/js_of_ocaml.opam b/js_of_ocaml.opam
@@ -17,7 +17,7 @@ build: [["dune" "build" "-p" name "-j" jobs]]
 
 depends: [
   "ocaml" {>= "4.02.0"}
-  "dune" {build & >= "1.11.1"}
+  "dune" {>= "1.11.1"}
   "ocaml-migrate-parsetree" {>= "1.4"}
   "ppx_tools_versioned" {>= "5.2.3"}
   "uchar"