Merge pull request #28641 from raphael-proust/incompatibilities-lwt-6

mseri · web-flow · commit aa21336f2140 · 2025-10-03T13:53:11.000+02:00
Incompatibilities lwt 6
diff --git a/packages/bimage-lwt/bimage-lwt.0.3.0/opam b/packages/bimage-lwt/bimage-lwt.0.3.0/opam
@@ -13,7 +13,7 @@ depends:
     "ocaml" {>= "4.08.0"}
     "dune" {>= "2.0"}
     "bimage" {= version}
-    "lwt"
+    "lwt" {< "6~"}
 ]
 
 build: [
diff --git a/packages/bimage-lwt/bimage-lwt.0.3.1/opam b/packages/bimage-lwt/bimage-lwt.0.3.1/opam
@@ -13,7 +13,7 @@ depends:
     "ocaml" {>= "4.08.0"}
     "dune" {>= "2.0"}
     "bimage" {= version}
-    "lwt"
+    "lwt" {< "6~"}
 ]
 
 build: [
diff --git a/packages/bimage-lwt/bimage-lwt.0.4.0/opam b/packages/bimage-lwt/bimage-lwt.0.4.0/opam
@@ -13,7 +13,7 @@ depends:
     "ocaml" {>= "4.08.0"}
     "dune" {>= "2.0"}
     "bimage" {= version}
-    "lwt"
+    "lwt" {< "6~"}
 ]
 
 build: [
diff --git a/packages/fuseau-lwt/fuseau-lwt.0.1/opam b/packages/fuseau-lwt/fuseau-lwt.0.1/opam
@@ -9,7 +9,7 @@ bug-reports: "https://github.com/c-cube/fuseau/issues"
 depends: [
   "dune" {>= "3.0"}
   "trace" {>= "0.6"}
-  "lwt"
+  "lwt" {< "6~"}
   "base-unix"
   "trace-tef" {with-test}
   "fuseau" {= version}
diff --git a/packages/lwt_log/lwt_log.1.1.2/opam b/packages/lwt_log/lwt_log.1.1.2/opam
@@ -15,8 +15,8 @@ dev-repo: "git+https://github.com/ocsigen/lwt_log.git"
 
 depends: [
   "dune" {>= "1.0"}
-  "lwt" {>= "4.0.0"}
-  "ocaml" {>= "4.03" & < "6~"}
+  "lwt" {>= "4.0.0" & < "6~"}
+  "ocaml" {>= "4.03"}
 ]
 
 build: [
diff --git a/packages/ocluster/ocluster.0.1/opam b/packages/ocluster/ocluster.0.1/opam
@@ -20,7 +20,7 @@ depends: [
   "ppx_sexp_conv"
   "dune-build-info"
   "ocluster-api" {= version}
-  "lwt"
+  "lwt" {< "6~"}
   "capnp-rpc-lwt"
   "capnp-rpc-net" {< "2.0"}
   "capnp-rpc-unix" {>= "0.9.0" & < "2.0"}
diff --git a/packages/ocluster/ocluster.0.2.1/opam b/packages/ocluster/ocluster.0.2.1/opam
@@ -31,7 +31,7 @@ depends: [
   "fmt"
   "fpath"
   "logs"
-  "lwt" {>= "5.6.1"}
+  "lwt" {>= "5.6.1" & < "6~"}
   "lwt-dllist"
   "mirage-crypto" {>= "0.8.5" & < "1.0.0"}
   "obuilder" {>= "0.5.1" & < "6.0.0"}
diff --git a/packages/ocluster/ocluster.0.2/opam b/packages/ocluster/ocluster.0.2/opam
@@ -22,7 +22,7 @@ depends: [
   "ppx_sexp_conv"
   "dune-build-info"
   "ocluster-api" {= version}
-  "lwt" {>= "5.6.1"}
+  "lwt" {>= "5.6.1" & < "6~"}
   "capnp-rpc-lwt"
   "capnp-rpc-net" {< "2.0"}
   "capnp-rpc-unix" {>= "1.2" & < "2.0"}
diff --git a/packages/ocluster/ocluster.0.3.0/opam b/packages/ocluster/ocluster.0.3.0/opam
@@ -40,7 +40,7 @@ depends: [
   "fmt"
   "fpath"
   "logs"
-  "lwt" {>= "5.6.1"}
+  "lwt" {>= "5.6.1" & < "6~"}
   "lwt-dllist"
   "mirage-crypto" {>= "0.8.5" & < "1.0.0"}
   "obuilder" {>= "0.6.0"}
diff --git a/packages/picos/picos.0.3.0/opam b/packages/picos/picos.0.3.0/opam
@@ -14,7 +14,7 @@ depends: [
   "mtime" {>= "2.0.0"}
   "psq" {>= "0.2.1"}
   "multicore-magic" {>= "2.1.0"}
-  "lwt" {>= "5.7.0"}
+  "lwt" {>= "5.7.0" & < "6~"}
   "multicore-bench" {>= "0.1.2" & with-test}
   "alcotest" {>= "1.7.0" & with-test}
   "qcheck-core" {>= "0.21.2" & with-test}
diff --git a/packages/picos/picos.0.4.0/opam b/packages/picos/picos.0.4.0/opam
@@ -14,7 +14,7 @@ depends: [
   "mtime" {>= "2.0.0"}
   "psq" {>= "0.2.1"}
   "multicore-magic" {>= "2.2.0"}
-  "lwt" {>= "5.7.0"}
+  "lwt" {>= "5.7.0" & < "6~"}
   "multicore-bench" {>= "0.1.3" & with-test}
   "alcotest" {>= "1.7.0" & with-test}
   "qcheck-core" {>= "0.21.2" & with-test}
diff --git a/packages/usb/usb.1.3.1/opam b/packages/usb/usb.1.3.1/opam
@@ -15,6 +15,10 @@ depends: [
   "conf-pkg-config" {build}
 ]
 
+conflicts: [
+  "lwt" { >= "6~" }
+]
+
 depexts: [
   ["libusb-1.0-0-dev"] {os-family = "debian"}
   ["libusb"] {os-family = "arch"}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ depends:`
`13`	`13`	`"ocaml" {>= "4.08.0"}`
`14`	`14`	`"dune" {>= "2.0"}`
`15`	`15`	`"bimage" {= version}`
`16`		`- "lwt"`
	`16`	`+ "lwt" {< "6~"}`
`17`	`17`	`]`
`18`	`18`
`19`	`19`	`build: [`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ dev-repo: "git+https://github.com/ocsigen/lwt_log.git"`
`15`	`15`
`16`	`16`	`depends: [`
`17`	`17`	`"dune" {>= "1.0"}`
`18`		`- "lwt" {>= "4.0.0"}`
`19`		`- "ocaml" {>= "4.03" & < "6~"}`
	`18`	`+ "lwt" {>= "4.0.0" & < "6~"}`
	`19`	`+ "ocaml" {>= "4.03"}`
`20`	`20`	`]`
`21`	`21`
`22`	`22`	`build: [`