Merge pull request #28805 from jmid/os-windows

mseri · web-flow · commit bd172fce1a94 · 2025-11-03T11:11:51.000+01:00
Correct `os != "windows"` constraints
diff --git a/packages/coq-lsp/coq-lsp.0.2.3+9.0/opam b/packages/coq-lsp/coq-lsp.0.2.3+9.0/opam
@@ -40,7 +40,7 @@ depends: [
   "rocq-stdlib"
 
   # [release branch] Remove
-  "ocamlfind" {>= "1.9.1" & (>= "1.9.8" | os != "windows") }
+  "ocamlfind" {>= "1.9.1" & (>= "1.9.8" | os-family != "windows") }
   "zarith" {>= "1.13"}
 
   # serlib deps: see what we need to keep for release
diff --git a/packages/coqide/coqide.8.19.2/opam b/packages/coqide/coqide.8.19.2/opam
@@ -21,7 +21,7 @@ depends: [
   "conf-adwaita-icon-theme"
   "coqide-server" {= version}
   "cairo2" {>= "0.6.4"}
-  "lablgtk3-sourceview3" {>= "3.1.2" & (< "3.1.5" | os != "windows")}
+  "lablgtk3-sourceview3" {>= "3.1.2" & (< "3.1.5" | os-family != "windows")}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/packages/coqide/coqide.8.20.0/opam b/packages/coqide/coqide.8.20.0/opam
@@ -21,7 +21,7 @@ depends: [
   "conf-adwaita-icon-theme"
   "coqide-server" {= version}
   "cairo2" {>= "0.6.4"}
-  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os != "windows")}
+  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os-family != "windows")}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/packages/coqide/coqide.8.20.1/opam b/packages/coqide/coqide.8.20.1/opam
@@ -21,7 +21,7 @@ depends: [
   "conf-adwaita-icon-theme"
   "coqide-server" {= version}
   "cairo2" {>= "0.6.4"}
-  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os != "windows")}
+  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os-family != "windows")}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/packages/rocq-runtime/rocq-runtime.9.1.0/opam b/packages/rocq-runtime/rocq-runtime.9.1.0/opam
@@ -27,7 +27,7 @@ bug-reports: "https://github.com/rocq-prover/rocq/issues"
 depends: [
   "dune" {>= "3.8"}
   "ocaml" {>= "4.14.0"}
-  "ocamlfind" {>= "1.9.1" & (>= "1.9.8" | os != "windows")}
+  "ocamlfind" {>= "1.9.1" & (>= "1.9.8" | os-family != "windows")}
   "zarith" {>= "1.11"}
   "conf-linux-libc-dev" {os = "linux"}
   "odoc" {with-doc}
diff --git a/packages/rocqide/rocqide.9.0.0/opam b/packages/rocqide/rocqide.9.0.0/opam
@@ -21,7 +21,7 @@ depends: [
   "conf-adwaita-icon-theme"
   "coqide-server" {= version}
   "cairo2" {>= "0.6.4"}
-  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os != "windows")}
+  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os-family != "windows")}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/packages/rocqide/rocqide.9.0.1/opam b/packages/rocqide/rocqide.9.0.1/opam
@@ -21,7 +21,7 @@ depends: [
   "conf-adwaita-icon-theme"
   "coqide-server" {= version}
   "cairo2" {>= "0.6.4"}
-  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os != "windows")}
+  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os-family != "windows")}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/packages/rocqide/rocqide.9.1.0/opam b/packages/rocqide/rocqide.9.1.0/opam
@@ -21,7 +21,7 @@ depends: [
   "conf-adwaita-icon-theme"
   "coqide-server" {= version}
   "cairo2" {>= "0.6.4"}
-  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os != "windows")}
+  "lablgtk3-sourceview3" {>= "3.1.2" & (>= "3.1.5" | os-family != "windows")}
   "odoc" {with-doc}
 ]
 build: [

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ depends: [`
`21`	`21`	`"conf-adwaita-icon-theme"`
`22`	`22`	`"coqide-server" {= version}`
`23`	`23`	`"cairo2" {>= "0.6.4"}`
`24`		`- "lablgtk3-sourceview3" {>= "3.1.2" & (< "3.1.5" \| os != "windows")}`
	`24`	`+ "lablgtk3-sourceview3" {>= "3.1.2" & (< "3.1.5" \| os-family != "windows")}`
`25`	`25`	`"odoc" {with-doc}`
`26`	`26`	`]`
`27`	`27`	`build: [`