Merge pull request ocaml#26463 from hannesm/conduit-bounds

bounds for cohttp 6*, websocket, current_web
dkalinichenko-js · Aug 30, 2024 · 8187cd8 · 8187cd8
2 parents 24df9da + f77632c
commit 8187cd8
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 10 deletions.
diff --git a/packages/cohttp-lwt-unix/cohttp-lwt-unix.6.0.0~alpha0/opam b/packages/cohttp-lwt-unix/cohttp-lwt-unix.6.0.0~alpha0/opam
@@ -33,8 +33,8 @@ depends: [
   "cohttp-lwt" {= version}
   "cmdliner" {>= "1.1.0"}
   "lwt" {>= "3.0.0"}
-  "conduit-lwt" {>= "5.0.0"}
-  "conduit-lwt-unix" {>= "5.0.0"}
+  "conduit-lwt" {>= "5.0.0" & < "7.0.0"}
+  "conduit-lwt-unix" {>= "5.0.0" & < "7.0.0"}
   "fmt" {>= "0.8.2"}
   "base-unix"
   "ppx_sexp_conv" {>= "v0.13.0"}

diff --git a/packages/cohttp-lwt-unix/cohttp-lwt-unix.6.0.0~alpha1/opam b/packages/cohttp-lwt-unix/cohttp-lwt-unix.6.0.0~alpha1/opam
@@ -33,8 +33,8 @@ depends: [
   "cohttp-lwt" {= version}
   "cmdliner" {>= "1.1.0"}
   "lwt" {>= "3.0.0"}
-  "conduit-lwt" {>= "5.0.0"}
-  "conduit-lwt-unix" {>= "5.0.0"}
+  "conduit-lwt" {>= "5.0.0" & < "7.0.0"}
+  "conduit-lwt-unix" {>= "5.0.0" & < "7.0.0"}
   "fmt" {>= "0.8.2"}
   "base-unix"
   "ppx_sexp_conv" {>= "v0.13.0"}

diff --git a/packages/cohttp-lwt-unix/cohttp-lwt-unix.6.0.0~alpha2/opam b/packages/cohttp-lwt-unix/cohttp-lwt-unix.6.0.0~alpha2/opam
@@ -33,8 +33,8 @@ depends: [
   "cohttp-lwt" {= version}
   "cmdliner" {>= "1.1.0"}
   "lwt" {>= "3.0.0"}
-  "conduit-lwt" {>= "5.0.0"}
-  "conduit-lwt-unix" {>= "5.0.0"}
+  "conduit-lwt" {>= "5.0.0" & < "7.0.0"}
+  "conduit-lwt-unix" {>= "5.0.0" & < "7.0.0"}
   "fmt" {>= "0.8.2"}
   "base-unix"
   "ppx_sexp_conv" {>= "v0.13.0"}

diff --git a/packages/cohttp-lwt-unix/cohttp-lwt-unix.6.0.0~beta2/opam b/packages/cohttp-lwt-unix/cohttp-lwt-unix.6.0.0~beta2/opam
@@ -33,8 +33,8 @@ depends: [
   "cohttp-lwt" {= version}
   "cmdliner" {>= "1.1.0"}
   "lwt" {>= "3.0.0"}
-  "conduit-lwt" {>= "5.0.0"}
-  "conduit-lwt-unix" {>= "5.0.0"}
+  "conduit-lwt" {>= "5.0.0" & < "7.0.0"}
+  "conduit-lwt-unix" {>= "5.0.0" & < "7.0.0"}
   "fmt" {>= "0.8.2"}
   "base-unix"
   "ppx_sexp_conv" {>= "v0.13.0"}

diff --git a/packages/current_web/current_web.0.1/opam b/packages/current_web/current_web.0.1/opam
@@ -27,6 +27,7 @@ depends: [
   "cohttp-lwt-unix" {>= "2.2.0"}
   "tyxml"
   "dune" {>= "1.9"}
+  "conduit" {< "7.0.0"}
 ]
 url {
   src:

diff --git a/packages/current_web/current_web.0.2/opam b/packages/current_web/current_web.0.2/opam
@@ -28,6 +28,7 @@ depends: [
   "tyxml"
   "routes" {>= "0.7.0" & < "0.8.0"}
   "dune" {>= "1.9"}
+  "conduit" {< "7.0.0"}
 ]
 url {
   src:

diff --git a/packages/current_web/current_web.0.3/opam b/packages/current_web/current_web.0.3/opam
@@ -33,6 +33,7 @@ depends: [
   "tyxml"
   "routes" {>= "0.8.0" & < "2.0.0"}
   "dune" {>= "2.0"}
+  "conduit" {< "7.0.0"}
 ]
 url {
   src:

diff --git a/packages/websocket/websocket.2.15/opam b/packages/websocket/websocket.2.15/opam
@@ -25,7 +25,7 @@ depends: [
   "dune" {>= "2.9"}
   "ocaml" {>= "4.06.0"}
   "base64" {>= "3.3.0"}
-  "conduit" {>= "5.1.0"}
+  "conduit" {>= "5.1.0" & < "7.0.0"}
   "cohttp" {>= "5.0.0"}
   "ocplib-endian" {>= "1.0"}
   "astring" {>= "0.8.3"}

diff --git a/packages/websocket/websocket.2.16/opam b/packages/websocket/websocket.2.16/opam
@@ -25,7 +25,7 @@ depends: [
   "dune" {>= "2.9"}
   "ocaml" {>= "4.06.0"}
   "base64" {>= "3.3.0"}
-  "conduit" {>= "5.1.0"}
+  "conduit" {>= "5.1.0" & < "7.0.0"}
   "cohttp" {>= "5.0.0"}
   "ocplib-endian" {>= "1.0"}
   "astring" {>= "0.8.3"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ depends: [ @@
       "cohttp-lwt-unix" {>= "2.2.0"}
       "tyxml"
       "dune" {>= "1.9"}
+      "conduit" {< "7.0.0"}
     ]
     url {
       src:
@@ Expand Down @@