chore: fix opam file wrt missing test-dep for logtk, jobs, conflicts

sneeuwballen · Nov 1, 2019 · 3682535 · 3682535
1 parent fc1193e
commit 3682535
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/libzipperposition.opam b/libzipperposition.opam
@@ -5,8 +5,8 @@ homepage: "https://github.com/sneeuwballen/zipperposition"
 version: "1.5.1"
 synopsis: "Library for Zipperposition"
 build: [
-  ["dune" "build" "-p" name]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
 ]
 depends: [
   "base-bytes"
@@ -15,7 +15,7 @@ depends: [
   "logtk" { = version }
   "containers" { >= "1.0" }
   "iter" { >= "1.2" }
-  "dune" { build }
+  "dune" { >= "1.1" }
   "msat" { >= "0.8" < "0.9" }
   "menhir" {build}
   "logtk"

diff --git a/logtk.opam b/logtk.opam
@@ -5,9 +5,9 @@ homepage: "https://github.com/sneeuwballen/zipperposition"
 version: "1.5.1"
 synopsis: "Core types and algorithms for logic"
 build: [
-  ["dune" "build" "-p" name]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
-  ["dune" "runtest" "-p" name] {with-test}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
   "base-bytes"
@@ -16,13 +16,18 @@ depends: [
   "containers" { >= "1.0" }
   "iter" { >= "1.2" }
   "menhir" {build}
-  "dune" { build }
+  "dune" { >= "1.1" }
   "alcotest" {with-test}
   "qcheck-core" {with-test & >= "0.9"}
+  "qcheck-alcotest" {with-test & >= "0.9"}
   "ocaml" {>= "4.03"}
 ]
 depopts: [
-  "msat" { >= "0.8" < "0.9" }
+  "msat"
+]
+conflicts: [
+  "msat" { < "0.8" }
+  "msat" { >= "0.9" }
 ]
 tags: [ "logic" "unification" "term" ]
 bug-reports: "https://github.com/sneeuwballen/zipperposition/issues"

diff --git a/zipperposition-tools.opam b/zipperposition-tools.opam
@@ -5,11 +5,11 @@ homepage: "https://github.com/sneeuwballen/zipperposition"
 version: "1.5.1"
 synopsis: "Support tools for Zipperposition"
 build: [
-  ["dune" "build" "-p" name]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
 ]
 depends: [
-  "dune" { build }
+  "dune" { >= "1.1" }
   "containers" { >= "1.0" }
   "iter" { >= "1.2" }
   "msat" { >= "0.8" < "0.9" }

diff --git a/zipperposition.opam b/zipperposition.opam
@@ -5,8 +5,8 @@ homepage: "https://github.com/sneeuwballen/zipperposition"
 version: "1.5.1"
 synopsis: "A fully automatic theorem prover for typed first-order and beyond"
 build: [
-  ["dune" "build" "-p" name]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
 ]
 depends: [
   "base-unix"
@@ -15,7 +15,7 @@ depends: [
   "libzipperposition" { = version }
   "containers" { >= "1.0" }
   "iter" { >= "1.2" }
-  "dune" { build }
+  "dune" { >= "1.1" }
   "msat" { >= "0.8" < "0.9" }
   "menhir" {build}
   "ocaml" {>= "4.03"}