Merge pull request ocaml#20170 from kit-ty-kate/ocamlnet-domains

ocamlnet is not compatible with ocaml-multicore
ivg · Dec 8, 2021 · 89fdc12 · 89fdc12
2 parents ae38ef4 + e05bf6a
commit 89fdc12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/packages/ocamlnet/ocamlnet.4.1.9-1/opam b/packages/ocamlnet/ocamlnet.4.1.9-1/opam
@@ -52,6 +52,7 @@ conflicts: [
   "ocaml-variants"
     {= "4.04.0+flambda" | = "4.04.1+flambda" | = "4.04.2+flambda"}
   "shell"
+  "base-domains"
 ]
 extra-files: [
   ["ocamlnet.install" "md5=ed54a9f3d6382ccc01ea1cf1af8f2c38"]

diff --git a/packages/ocamlnet/ocamlnet.4.1.9/opam b/packages/ocamlnet/ocamlnet.4.1.9/opam
@@ -51,6 +51,7 @@ conflicts: [
   "ocaml-variants"
     {= "4.04.0+flambda" | = "4.04.1+flambda" | = "4.04.2+flambda"}
   "shell"
+  "base-domains"
 ]
 extra-files: ["ocamlnet.install" "md5=ed54a9f3d6382ccc01ea1cf1af8f2c38"]
 url {