Merge pull request #23946 from dra27/bad-windows

Fix various Windows `depends`/`available` fields
ocaml · Jun 21, 2023 · 2141099 · 2141099
2 parents 008dc91 + 5d23b32
commit 2141099
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/eio_main/eio_main.0.10/opam b/packages/eio_main/eio_main.0.10/opam
@@ -13,8 +13,8 @@ depends: [
   "kcas" {>= "0.3.0" & with-test}
   "yojson" {>= "2.0.2" & with-test}
   "eio_linux" {= version & os = "linux"}
-  "eio_posix" {= version & os-family != "windows"}
-  "eio_windows" {= version & os-family = "windows"}
+  "eio_posix" {= version & os != "win32"}
+  "eio_windows" {= version & os = "win32"}
   "odoc" {with-doc}
 ]
 build: [

diff --git a/packages/eio_main/eio_main.0.9/opam b/packages/eio_main/eio_main.0.9/opam
@@ -11,8 +11,8 @@ depends: [
   "dune" {>= "3.7"}
   "mdx" {>= "2.2.0" & with-test}
   "eio_linux" {= version & os = "linux"}
-  "eio_posix" {= version & os != "windows"}
-  "eio_luv" {= version & os = "windows" | with-test}
+  "eio_posix" {= version & os != "win32"}
+  "eio_luv" {= version & (os = "win32" | with-test)}
   "odoc" {with-doc}
 ]
 depopts: ["eio_luv"]

diff --git a/packages/parany/parany.12.2.2/opam b/packages/parany/parany.12.2.2/opam
@@ -11,7 +11,7 @@ depends: [
   "dune" {>= "1.6.0"}
   "ocaml" {>= "4.03.0"}
 ]
-available: [ os != "windows" ]
+available: os != "win32"
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "build" "-p" name "-j" jobs "src/test.exe"] {with-test}

diff --git a/packages/parany/parany.14.0.0/opam b/packages/parany/parany.14.0.0/opam
@@ -11,7 +11,7 @@ depends: [
   "dune" {>= "1.6.0"}
   "ocaml" {>= "4.03.0"}
 ]
-available: [ os != "windows" ]
+available: os != "win32"
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "build" "-p" name "-j" jobs "src/test.exe"] {with-test}