Remove dependency cycles

ocaml · Feb 10, 2021 · 2a81088 · 2a81088
1 parent 4acae19
commit 2a81088
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/packages/fileutils/fileutils.0.6.0/opam b/packages/fileutils/fileutils.0.6.0/opam
@@ -12,7 +12,6 @@ depends: [
   "stdlib-shims"
   "ocamlbuild" {build}
   "ocamlfind" {build}
-  "oasis" {build}
   "ounit" {with-test & >= "2.0.0"}
 ]
 build: [

diff --git a/packages/graphics/graphics.5.0.0/opam b/packages/graphics/graphics.5.0.0/opam
@@ -16,10 +16,11 @@ homepage: "https://github.com/ocaml/graphics"
 doc: "https://ocaml.github.io/graphics/"
 bug-reports: "https://github.com/ocaml/graphics/issues"
 depends: [
-  "dune" {>= "1.11"}
+  "dune" {>= "1.11" & < "2.0.0"}
   "conf-libX11"
   "ocaml" {>= "4.09.0~~" & < "4.10"}
 ]
+conflicts: ["ocamlfind-secondary"]
 build: [
   ["dune" "subst"] {pinned}
   [

diff --git a/packages/graphics/graphics.5.1.0/opam b/packages/graphics/graphics.5.1.0/opam
@@ -22,6 +22,7 @@ depends: [
   "ocaml" {>= "4.09.0~~"}
   "conf-pkg-config"
 ]
+conflicts: ["ocamlfind-secondary"]
 build: [
   ["dune" "subst"] {pinned}
   [

diff --git a/packages/graphics/graphics.5.1.1/opam b/packages/graphics/graphics.5.1.1/opam
@@ -22,6 +22,7 @@ depends: [
   "conf-pkg-config" {os != "win32"}
   "ocaml" {>= "4.09.0~~"}
 ]
+conflicts: ["ocamlfind-secondary"]
 build: [
   ["dune" "subst"] {pinned}
   [

diff --git a/packages/result/result.1.3/opam b/packages/result/result.1.3/opam
@@ -10,6 +10,7 @@ depends: [
   "ocaml"
   "jbuilder" {>= "1.0+beta11"}
 ]
+conflicts:["dune-configurator"]
 synopsis: "Compatibility Result module"
 description: """
 Projects that want to use the new result type defined in OCaml >= 4.03