Merge pull request #18392 from mseri/relax-bounds

Partly revert #17577
ocaml · Mar 25, 2021 · b112440 · b112440
2 parents 8146cb6 + 52702a3
commit b112440
Show file tree

Hide file tree

Showing 45 changed files with 62 additions and 61 deletions.
diff --git a/packages/azblob-async/azblob-async.0.1.0/opam b/packages/azblob-async/azblob-async.0.1.0/opam
@@ -8,11 +8,12 @@ bug-reports: "https://github.com/kkazuo/azblob/issues"
 depends: [
   "ocaml" {>= "4.06.0"}
   "core" {< "v0.15"}
-  "cohttp" { < "3.0.0" }
-  "cohttp-async" {>= "2.4.0" & < "3.0.0" }
+  "cohttp"
+  "cohttp-async" {>= "2.4.0"}
   "azblob" {= version}
   "dune" {>= "1.11"}
 ]
+
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]

diff --git a/packages/comby/comby.1.2.2/opam b/packages/comby/comby.1.2.2/opam
@@ -34,7 +34,7 @@ depends: [
   "core"
   "lwt"
   "lwt_react"
-  "opium"
+  "opium" {>= "0.19.0"}
   "cohttp-lwt-unix"
   "parany"
   "patience_diff" {>= "v0.14" & < "v0.15"}

diff --git a/packages/comby/comby.1.3.0/opam b/packages/comby/comby.1.3.0/opam
@@ -36,7 +36,7 @@ depends: [
   "lwt_react"
   "mparser"
   "mparser-pcre"
-  "opium"
+  "opium" {>= "0.19.0"}
   "cohttp-lwt-unix"
   "parany"
   "patience_diff" {>= "v0.14" & < "v0.15"}

diff --git a/packages/curly/curly.0.1.0/opam b/packages/curly/curly.0.1.0/opam
@@ -19,7 +19,7 @@ depends: [
   "jbuilder" {>= "1.0+beta9"}
   "base-unix"
   "result"
-  "cohttp-lwt-unix" {with-test & < "3.0.0"}
+  "cohttp-lwt-unix" {with-test & != "3.0.0"}
   "alcotest" {with-test}
   "lwt" {with-test & < "4.0.0"}
 ]

diff --git a/packages/curly/curly.0.2.0/opam b/packages/curly/curly.0.2.0/opam
@@ -12,7 +12,7 @@ depends: [
   "base-unix"
   "result"
   "alcotest" {with-test}
-  "cohttp-lwt-unix" {with-test & < "3.0.0"}
+  "cohttp-lwt-unix" {with-test & != "3.0.0"}
   "odoc" {with-doc}
 ]
 build: [

diff --git a/packages/current_github/current_github.0.2/opam b/packages/current_github/current_github.0.2/opam
@@ -23,7 +23,7 @@ depends: [
   "fmt"
   "lwt"
   "yojson"
-  "cohttp-lwt-unix" { < "3.0.0"}
+  "cohttp-lwt-unix"
   "mirage-crypto"
   "mirage-crypto-pk"
   "x509" {>= "0.10.0"}

diff --git a/packages/current_github/current_github.0.3/opam b/packages/current_github/current_github.0.3/opam
@@ -24,7 +24,7 @@ depends: [
   "fmt"
   "lwt"
   "yojson"
-  "cohttp-lwt-unix" {< "3.0.0"}
+  "cohttp-lwt-unix"
   "mirage-crypto"
   "mirage-crypto-pk"
   "x509" {>= "0.10.0"}

diff --git a/packages/current_github/current_github.0.4/opam b/packages/current_github/current_github.0.4/opam
@@ -19,7 +19,7 @@ depends: [
   "fmt"
   "lwt"
   "yojson"
-  "cohttp-lwt-unix" {< "3.0.0"}
+  "cohttp-lwt-unix"
   "mirage-crypto"
   "mirage-crypto-pk"
   "x509" {>= "0.10.0"}

diff --git a/packages/current_web/current_web.0.1/opam b/packages/current_web/current_web.0.1/opam
@@ -24,7 +24,7 @@ depends: [
   "lwt"
   "cmdliner"
   "prometheus-app"
-  "cohttp-lwt-unix" {>= "2.2.0"  & < "3.0.0"}
+  "cohttp-lwt-unix" {>= "2.2.0"}
   "tyxml"
   "dune" {>= "1.9"}
 ]

diff --git a/packages/current_web/current_web.0.2/opam b/packages/current_web/current_web.0.2/opam
@@ -24,7 +24,7 @@ depends: [
   "lwt"
   "cmdliner"
   "prometheus-app"
-  "cohttp-lwt-unix" {>= "2.2.0" & < "3.0.0"}
+  "cohttp-lwt-unix" {>= "2.2.0"}
   "tyxml"
   "routes" {>= "0.7.0" & < "0.8.0"}
   "dune" {>= "1.9"}

diff --git a/packages/current_web/current_web.0.3/opam b/packages/current_web/current_web.0.3/opam
@@ -29,7 +29,7 @@ depends: [
   "lwt"
   "cmdliner"
   "prometheus-app"
-  "cohttp-lwt-unix" {>= "2.2.0" & < "3.0.0"}
+  "cohttp-lwt-unix" {>= "2.2.0"}
   "tyxml"
   "routes" {>= "0.8.0"}
   "dune" {>= "2.0"}

diff --git a/packages/current_web/current_web.0.4/opam b/packages/current_web/current_web.0.4/opam
@@ -26,9 +26,9 @@ depends: [
   "cmdliner"
   "prometheus" {>= "0.7"}
   "prometheus-app"
-  "cohttp" {>= "2.2.0" & < "3.0.0"}
-  "cohttp-lwt" {>= "2.2.0" & < "3.0.0"}
-  "cohttp-lwt-unix" {>= "2.2.0" & < "3.0.0"}
+  "cohttp" {>= "2.2.0"}
+  "cohttp-lwt" {>= "2.2.0"}
+  "cohttp-lwt-unix" {>= "2.2.0"}
   "tyxml"
   "routes" {>= "0.8.0"}
   "dune" {>= "2.0"}

diff --git a/packages/git-http/git-http.2.0.0/opam b/packages/git-http/git-http.2.0.0/opam
@@ -18,8 +18,8 @@ depends: [
   "ocaml"        {>= "4.03.0"}
   "dune"
   "git"          {= version}
-  "cohttp"       {>= "1.0.0" & < "3.0.0"}
-  "cohttp-lwt"   {>= "1.0.0" & < "3.0.0"}
+  "cohttp"       {>= "1.0.0"}
+  "cohttp-lwt"   {>= "1.0.0"}
   "sexplib"      {< "v0.15"}
 ]
 url {

diff --git a/packages/git-http/git-http.2.1.0/opam b/packages/git-http/git-http.2.1.0/opam
@@ -18,8 +18,8 @@ depends: [
   "ocaml"        {>= "4.03.0"}
   "dune"
   "git"          {= version}
-  "cohttp"       {>= "1.0.0" & < "3.0.0"}
-  "cohttp-lwt"   {>= "1.0.0" & < "3.0.0"}
+  "cohttp"       {>= "1.0.0"}
+  "cohttp-lwt"   {>= "1.0.0"}
 ]
 url {
   src:

diff --git a/packages/git-http/git-http.2.1.1/opam b/packages/git-http/git-http.2.1.1/opam
@@ -18,8 +18,8 @@ depends: [
   "ocaml"        {>= "4.03.0"}
   "dune"         {>= "1.1"}
   "git"          {= version}
-  "cohttp"       {>= "1.0.0" & < "3.0.0"}
-  "cohttp-lwt"   {>= "1.0.0" & < "3.0.0"}
+  "cohttp"       {>= "1.0.0"}
+  "cohttp-lwt"   {>= "1.0.0"}
 ]
 url {
   src:

diff --git a/packages/git-http/git-http.2.1.2/opam b/packages/git-http/git-http.2.1.2/opam
@@ -18,8 +18,8 @@ depends: [
   "ocaml"        {>= "4.03.0"}
   "dune"         {>= "1.1"}
   "git"          {= version}
-  "cohttp"       {>= "1.0.0" & < "3.0.0"}
-  "cohttp-lwt"   {>= "1.0.0" & < "3.0.0"}
+  "cohttp"       {>= "1.0.0"}
+  "cohttp-lwt"   {>= "1.0.0"}
 ]
 url {
   src:

diff --git a/packages/git-http/git-http.2.1.3/opam b/packages/git-http/git-http.2.1.3/opam
@@ -18,8 +18,8 @@ depends: [
   "ocaml"        {>= "4.07.0"}
   "dune"
   "git"          {= version}
-  "cohttp"       {>= "1.0.0" & < "3.0.0"}
-  "cohttp-lwt"   {>= "1.0.0" & < "3.0.0"}
+  "cohttp"       {>= "1.0.0"}
+  "cohttp-lwt"   {>= "1.0.0"}
 ]
 url {
   src:

diff --git a/packages/git-unix/git-unix.2.1.1/opam b/packages/git-unix/git-unix.2.1.1/opam
@@ -21,8 +21,8 @@ depends: [
   "mmap"            {>= "1.1.0"}
   "cmdliner"
   "git-http"        {= version}
-  "cohttp"          {>= "1.0.0" & < "3.0.0"}
-  "cohttp-lwt-unix" {>= "1.0.0" & < "3.0.0"}
+  "cohttp"          {>= "1.0.0"}
+  "cohttp-lwt-unix" {>= "1.0.0"}
   "mtime"           {>= "1.0.0"}
   "base-unix"
   "alcotest"        {with-test & >= "0.8.1"}

diff --git a/packages/git-unix/git-unix.2.1.2/opam b/packages/git-unix/git-unix.2.1.2/opam
@@ -21,8 +21,8 @@ depends: [
   "mmap"            {>= "1.1.0"}
   "cmdliner"
   "git-http"        {= version}
-  "cohttp"          {>= "1.0.0" & < "3.0.0"}
-  "cohttp-lwt-unix" {>= "1.0.0" & < "3.0.0"}
+  "cohttp"          {>= "1.0.0"}
+  "cohttp-lwt-unix" {>= "1.0.0"}
   "mtime"           {>= "1.0.0"}
   "base-unix"
   "alcotest"        {with-test & >= "0.8.1"}

diff --git a/packages/git-unix/git-unix.2.1.3/opam b/packages/git-unix/git-unix.2.1.3/opam
@@ -21,8 +21,8 @@ depends: [
   "mmap"              {>= "1.1.0"}
   "cmdliner"
   "git-http"          {= version}
-  "cohttp"            {>= "1.0.0" & < "3.0.0"}
-  "cohttp-lwt-unix"   {>= "1.0.0" & < "3.0.0"}
+  "cohttp"            {>= "1.0.0"}
+  "cohttp-lwt-unix"   {>= "1.0.0"}
   "mtime"             {>= "1.0.0"}
   "base-unix"
   "alcotest"          {with-test & >= "0.8.1"}

diff --git a/packages/kappa-server/kappa-server.4.1.0/opam b/packages/kappa-server/kappa-server.4.1.0/opam
@@ -15,7 +15,7 @@ depends : [
   "dune" {>= "1.1"}
   "kappa-binaries" { = version }
   "kappa-agents" { = version }
-  "cohttp-lwt-unix" { < "3.0.0"}
+  "cohttp-lwt-unix"
   "atdgen" {build}
 ]
 

diff --git a/packages/letsencrypt/letsencrypt.0.1.0/opam b/packages/letsencrypt/letsencrypt.0.1.0/opam
@@ -18,8 +18,8 @@ depends: [
   "base64" {>= "3.1.0"}
   "cmdliner"
   "cohttp"
-  "cohttp-lwt" {< "3.0.0"}
-  "cohttp-lwt-unix" {>= "1.0.0" & < "3.0.0"}
+  "cohttp-lwt"
+  "cohttp-lwt-unix" {>= "1.0.0"}
   "zarith"
   "logs"
   "fmt"

diff --git a/packages/letsencrypt/letsencrypt.0.1.1/opam b/packages/letsencrypt/letsencrypt.0.1.1/opam
@@ -16,8 +16,8 @@ depends: [
   "base64" {>= "3.1.0"}
   "cmdliner"
   "cohttp"
-  "cohttp-lwt" {< "3.0.0"}
-  "cohttp-lwt-unix" {>= "1.0.0" & < "3.0.0"}
+  "cohttp-lwt"
+  "cohttp-lwt-unix" {>= "1.0.0"}
   "zarith"
   "logs"
   "fmt"

diff --git a/packages/ocsigen-start/ocsigen-start.2.18.0/opam b/packages/ocsigen-start/ocsigen-start.2.18.0/opam
@@ -19,7 +19,7 @@ depends: [
   "ocsigen-toolkit" {>= "2.7.0"}
   "yojson" {>= "1.4.1"}
   "resource-pooling" {>= "1.0" & < "2.0"}
-  "cohttp-lwt-unix" { < "3.0.0"}
+  "cohttp-lwt-unix"
   "conf-npm" {>= "1"}
   "ocamlnet"
 ]

diff --git a/packages/ocsigenserver/ocsigenserver.2.18.0/opam b/packages/ocsigenserver/ocsigenserver.2.18.0/opam
@@ -38,7 +38,7 @@ build: [
 ]
 install: [make "install"]
 depends: [
-  "ocaml" {>= "4.06.1"}
+  "ocaml" {>= "4.08"}
   "ocamlfind"
   "base-unix"
   "base-threads"

diff --git a/packages/opium/opium.0.17.0/opam b/packages/opium/opium.0.17.0/opam
@@ -25,7 +25,7 @@ depends: [
   "ocaml" {>= "4.04.1"}
   "dune"
   "opium_kernel" { < "0.18.0" }
-  "cohttp-lwt-unix" {>= "0.99.0" & < "3.0.0"}
+  "cohttp-lwt-unix" {>= "0.99.0"}
   "base-unix"
   "lwt"
   "logs"

diff --git a/packages/opium/opium.0.17.1/opam b/packages/opium/opium.0.17.1/opam
@@ -26,7 +26,7 @@ depends: [
   "ocaml" {>= "4.04.1"}
   "dune"
   "opium_kernel" { < "0.18.0" }
-  "cohttp-lwt-unix" {>= "0.99.0" & < "3.0.0"}
+  "cohttp-lwt-unix" {>= "0.99.0"}
   "base-unix"
   "lwt"
   "logs"

diff --git a/packages/opium/opium.0.18.0/opam b/packages/opium/opium.0.18.0/opam
@@ -17,7 +17,7 @@ depends: [
   "ocaml" {>= "4.04.1"}
   "dune" {>= "1.11"}
   "opium_kernel"
-  "cohttp-lwt-unix" { < "3.0.0"}
+  "cohttp-lwt-unix"
   "ezjsonm"
   "lwt"
   "logs"

diff --git a/packages/oraft/oraft.0.1.0/opam b/packages/oraft/oraft.0.1.0/opam
@@ -16,7 +16,7 @@ depends: [
   "ocaml" {>= "4.05.0"}
   "dune" {>= "2.0"}
   "core" {>= "v0.9.0" & < "v0.15"}
-  "cohttp-lwt-unix" {< "3.0.0"}
+  "cohttp-lwt-unix"
   "yojson"
   "ppx_deriving"
   "ppx_deriving_yojson"

diff --git a/packages/oraft/oraft.0.1.1/opam b/packages/oraft/oraft.0.1.1/opam
@@ -10,7 +10,7 @@ depends: [
   "ocaml" {>= "4.05.0"}
   "dune" {>= "2.0"}
   "core" {>= "v0.9.0"}
-  "cohttp-lwt-unix" {< "3.0.0"}
+  "cohttp-lwt-unix"
   "yojson"
   "ppx_deriving"
   "ppx_deriving_yojson"

diff --git a/packages/prometheus-app/prometheus-app.0.6/opam b/packages/prometheus-app/prometheus-app.0.6/opam
@@ -13,8 +13,8 @@ depends: [
   "fmt"
   "re"
   "cohttp" {>= "1.0.0"}
-  "cohttp-lwt" {< "3.0.0"}
-  "cohttp-lwt-unix" {< "3.0.0"}
+  "cohttp-lwt"
+  "cohttp-lwt-unix"
   "lwt" {>= "2.5.0"}
   "cmdliner"
   "alcotest" {with-test}

diff --git a/packages/prometheus-app/prometheus-app.0.7/opam b/packages/prometheus-app/prometheus-app.0.7/opam
@@ -13,8 +13,8 @@ depends: [
   "fmt"
   "re"
   "cohttp" {>= "1.0.0"}
-  "cohttp-lwt" {< "3.0.0"}
-  "cohttp-lwt-unix" {< "3.0.0"}
+  "cohttp-lwt"
+  "cohttp-lwt-unix"
   "lwt" {>= "2.5.0"}
   "cmdliner"
   "alcotest" {with-test}

diff --git a/packages/prometheus-app/prometheus-app.1.0/opam b/packages/prometheus-app/prometheus-app.1.0/opam
@@ -31,8 +31,8 @@ depends: [
   "fmt"
   "re"
   "cohttp" {>= "1.0.0"}
-  "cohttp-lwt" {< "3.0.0"}
-  "cohttp-lwt-unix" {< "3.0.0"}
+  "cohttp-lwt"
+  "cohttp-lwt-unix"
   "lwt" {>= "2.5.0"}
   "cmdliner"
   "alcotest" {with-test}

diff --git a/packages/resto-cohttp-server/resto-cohttp-server.0.2/opam b/packages/resto-cohttp-server/resto-cohttp-server.0.2/opam
@@ -16,7 +16,7 @@ depends: [
   "dune" { >= "1.7" }
   "resto-directory" {= version }
   "resto-cohttp" {= version }
-  "cohttp-lwt-unix" { >= "1.0.0" & < "3.0.0" }
+  "cohttp-lwt-unix" { >= "1.0.0"}
   "lwt" { >= "3.0.0" & <= "5.0.0" }
 ]
 url {

diff --git a/packages/resto-cohttp-server/resto-cohttp-server.0.3/opam b/packages/resto-cohttp-server/resto-cohttp-server.0.3/opam
@@ -16,7 +16,7 @@ depends: [
   "dune" { >= "1.7" }
   "resto-directory" {= version }
   "resto-cohttp" {= version }
-  "cohttp-lwt-unix" { >= "1.0.0" & < "3.0.0" }
+  "cohttp-lwt-unix" { >= "1.0.0"}
   "lwt" { >= "3.0.0" & <= "5.0.0" }
 ]
 url {

diff --git a/packages/resto-cohttp-server/resto-cohttp-server.0.4/opam b/packages/resto-cohttp-server/resto-cohttp-server.0.4/opam
@@ -16,7 +16,7 @@ depends: [
   "dune" { >= "1.7" }
   "resto-directory" {= version }
   "resto-cohttp" {= version }
-  "cohttp-lwt-unix" { >= "1.0.0" & < "3.0.0" }
+  "cohttp-lwt-unix" { >= "1.0.0"}
   "lwt" { >= "3.0.0" }
 ]
 url {

diff --git a/packages/resto-cohttp-server/resto-cohttp-server.0.5/opam b/packages/resto-cohttp-server/resto-cohttp-server.0.5/opam
@@ -16,7 +16,7 @@ depends: [
   "dune" { >= "1.7" }
   "resto-directory" {= version }
   "resto-cohttp" {= version }
-  "cohttp-lwt-unix" { >= "1.0.0" & < "3.0.0" }
+  "cohttp-lwt-unix" { >= "1.0.0"}
   "lwt" { >= "3.0.0" & < "6.0.0" }
 ]
 url {

diff --git a/packages/resto-cohttp-server/resto-cohttp-server.0.6.1/opam b/packages/resto-cohttp-server/resto-cohttp-server.0.6.1/opam
@@ -17,7 +17,7 @@ depends: [
   "resto-directory" {= version }
   "resto-cohttp" {= version }
   "resto-acl" {= version }
-  "cohttp-lwt-unix" { >= "2.0.0" & < "3.0.0" }
+  "cohttp-lwt-unix" { >= "2.0.0"}
   "conduit-lwt-unix" { >= "2.0.0" & < "3.0.0" }
   "lwt" { >= "3.0.0" & < "6.0.0" }
 ]

diff --git a/packages/resto-cohttp-server/resto-cohttp-server.0.6/opam b/packages/resto-cohttp-server/resto-cohttp-server.0.6/opam
@@ -17,7 +17,7 @@ depends: [
   "resto-directory" {= version }
   "resto-cohttp" {= version }
   "resto-acl" {= version }
-  "cohttp-lwt-unix" { >= "2.0.0" & < "3.0.0" }
+  "cohttp-lwt-unix" { >= "2.0.0"}
   "conduit-lwt-unix" { >= "2.0.0" & < "3.0.0" }
   "lwt" { >= "3.0.0" & < "6.0.0" }
 ]

diff --git a/packages/sihl/sihl.0.1.10/opam b/packages/sihl/sihl.0.1.10/opam
@@ -33,7 +33,7 @@ depends: [
   "ppx_sexp_conv" {>= "v0.13.0"}
   "alcotest" {>= "1.2.0"}
   "alcotest-lwt" {>= "1.2.0" & < "3.0.0" & with-test}
-  "cohttp-lwt-unix" {>= "2.5.1" & < "3.0.0" & with-test}
+  "cohttp-lwt-unix" {>= "2.5.1"& with-test}
   "odoc" {with-doc}
 ]
 build: [