Revert "Update to cohttp 2.0"

This reverts commit 5217f00. A change in the base64 library makes cohttp 2.0 incompatible with core_extended.base64. To avoid breaking things, this reverts us back to the last version of cohttp/base64 that doesn't break the rest of the universe. See: https://discuss.ocaml.org/t/what-to-do-about-files-both-define-module-base64/3426 mirage/ocaml-base64#17
arenadotio · Mar 19, 2019 · f95d813 · f95d813
1 parent 9075d59
commit f95d813
Show file tree

Hide file tree

Showing 19 changed files with 392 additions and 389 deletions.
diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/esy.lock/opam/base.v0.11.1/opam b/esy.lock/opam/base.v0.11.1/opam
@@ -9,7 +9,7 @@ build: [
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml" {>= "4.04.1"}
+  "ocaml" {>= "4.04.1" & < "4.08.0"}
   "sexplib0" {>= "v0.11" & < "v0.12"}
   "jbuilder" {build & >= "1.0+beta18.1"}
 ]

diff --git a/esy.lock/opam/base64.3.1.0/opam → esy.lock/opam/base64.2.3.0/opam b/esy.lock/opam/base64.3.1.0/opam → esy.lock/opam/base64.2.3.0/opam
@@ -15,7 +15,6 @@ binary data in an ASCII string format by translating it into a radix-64
 representation.  It is specified in RFC 4648.
 """
 depends: [
-  "ocaml" {>="4.03.0"}
   "base-bytes"
   "dune" {build & >= "1.0.1"}
   "bos" {with-test}
@@ -27,12 +26,8 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name] {with-test}
 ]
-conflicts: [
-  "extlib"
-  "extlib-compat"
-]
 url {
   src:
-    "https://github.com/mirage/ocaml-base64/releases/download/v3.1.0/base64-v3.1.0.tbz"
-  checksum: "md5=9847073feb4272e513d8c832904e1af7"
+    "https://github.com/mirage/ocaml-base64/releases/download/v2.3.0/base64-v2.3.0.tbz"
+  checksum: "md5=f0b29524dbaff3ac6eb4d6c578b1b80d"
 }
diff --git a/esy.lock/opam/cohttp-async.1.2.0/opam b/esy.lock/opam/cohttp-async.1.2.0/opam
@@ -0,0 +1,71 @@
+opam-version: "2.0"
+synopsis: "An OCaml library for HTTP clients and servers"
+description: """
+[![Join the chat at https://gitter.im/mirage/ocaml-cohttp](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mirage/ocaml-cohttp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+Cohttp is an OCaml library for creating HTTP daemons. It has a portable
+HTTP parser, and implementations using various asynchronous programming
+libraries:
+
+* `Cohttp_lwt_unix` uses the [Lwt](https://ocsigen.org/lwt/) library, and
+  specifically the UNIX bindings.
+* `Cohttp_async` uses the [Async](https://realworldocaml.org/v1/en/html/concurrent-programming-with-async.html)
+  library.
+* `Cohttp_lwt` exposes an OS-independent Lwt interface, which is used
+  by the [Mirage](https://mirage.io/) interface to generate standalone
+  microkernels (use the cohttp-mirage subpackage).
+* `Cohttp_lwt_xhr` compiles to a JavaScript module that maps the Cohttp
+  calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
+  the GitHub bindings to JavaScript and still run efficiently.
+
+You can implement other targets using the parser very easily. Look at the `IO`
+signature in `lib/s.mli` and implement that in the desired backend.
+
+You can activate some runtime debugging by setting `COHTTP_DEBUG` to any
+value, and all requests and responses will be written to stderr.  Further
+debugging of the connection layer can be obtained by setting `CONDUIT_DEBUG`
+to any value."""
+maintainer: "[email protected]"
+authors: [
+  "Anil Madhavapeddy"
+  "Stefano Zacchiroli"
+  "David Sheets"
+  "Thomas Gazagnaire"
+  "David Scott"
+  "Rudi Grinberg"
+  "Andy Ray"
+]
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-cohttp"
+doc: "https://mirage.github.io/ocaml-cohttp/"
+bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+depends: [
+  "ocaml" {>= "4.04.1"}
+  "dune" {build & >= "1.1.0"}
+  "async_kernel" {>= "v0.11.0" & < "v0.12"}
+  "async_unix" {>= "v0.11.0" & < "v0.12"}
+  "async_extra" {>= "v0.11.0" & < "v0.12"}
+  "base" {>= "v0.11.0" & < "v0.12"}
+  "core" {with-test & < "v0.12"}
+  "cohttp"
+  "conduit-async" {>= "1.2.0"}
+  "magic-mime"
+  "logs"
+  "fmt" {>= "0.8.2"}
+  "sexplib0" {< "v0.12"}
+  "ppx_sexp_conv" {>= "v0.9.0" & < "v0.12"}
+  "ounit" {with-test}
+  "uri" {>= "2.0.0"}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test & os != "macos"}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v1.2.0/cohttp-v1.2.0.tbz"
+  checksum: "md5=7aa3d4582848afff9a62f866b23173e1"
+}
diff --git a/esy.lock/opam/cohttp-async.2.0.0/opam b/esy.lock/opam/cohttp-async.2.0.0/opam
diff --git a/esy.lock/opam/cohttp.2.0.0/opam → esy.lock/opam/cohttp.1.2.0/opam b/esy.lock/opam/cohttp.2.0.0/opam → esy.lock/opam/cohttp.1.2.0/opam
@@ -1,23 +1,22 @@
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: [
-  "Anil Madhavapeddy"
-  "Stefano Zacchiroli"
-  "David Sheets"
-  "Thomas Gazagnaire"
-  "David Scott"
-  "Rudi Grinberg"
-  "Andy Ray"
-]
 synopsis: "An OCaml library for HTTP clients and servers"
 description: """
+[![Join the chat at https://gitter.im/mirage/ocaml-cohttp](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mirage/ocaml-cohttp?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Cohttp is an OCaml library for creating HTTP daemons. It has a portable
 HTTP parser, and implementations using various asynchronous programming
-libraries.
+libraries:
 
-See the cohttp-async, cohttp-lwt, cohttp-lwt-unix, cohttp-lwt-jsoo and
-cohttp-mirage libraries for concrete implementations for particular
-targets.
+* `Cohttp_lwt_unix` uses the [Lwt](https://ocsigen.org/lwt/) library, and
+  specifically the UNIX bindings.
+* `Cohttp_async` uses the [Async](https://realworldocaml.org/v1/en/html/concurrent-programming-with-async.html)
+  library.
+* `Cohttp_lwt` exposes an OS-independent Lwt interface, which is used
+  by the [Mirage](https://mirage.io/) interface to generate standalone
+  microkernels (use the cohttp-mirage subpackage).
+* `Cohttp_lwt_xhr` compiles to a JavaScript module that maps the Cohttp
+  calls to XMLHTTPRequests.  This is used to compile OCaml libraries like
+  the GitHub bindings to JavaScript and still run efficiently.
 
 You can implement other targets using the parser very easily. Look at the `IO`
 signature in `lib/s.mli` and implement that in the desired backend.
@@ -26,6 +25,16 @@ You can activate some runtime debugging by setting `COHTTP_DEBUG` to any
 value, and all requests and responses will be written to stderr.  Further
 debugging of the connection layer can be obtained by setting `CONDUIT_DEBUG`
 to any value."""
+maintainer: "[email protected]"
+authors: [
+  "Anil Madhavapeddy"
+  "Stefano Zacchiroli"
+  "David Sheets"
+  "Thomas Gazagnaire"
+  "David Scott"
+  "Rudi Grinberg"
+  "Andy Ray"
+]
 license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-cohttp"
@@ -41,7 +50,7 @@ depends: [
   "ppx_fields_conv" {>= "v0.9.0" & < "v0.12"}
   "ppx_sexp_conv" {>= "v0.9.0" & < "v0.12"}
   "stringext"
-  "base64" {>= "3.1.0"}
+  "base64" {>= "2.0.0" & < "3.0.0"}
   "fmt" {with-test}
   "jsonm" {build}
   "alcotest" {with-test}
@@ -54,6 +63,6 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.0.0/cohttp-v2.0.0.tbz"
-  checksum: "md5=c354599fdb4f2625b6510182de0fc86b"
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v1.2.0/cohttp-v1.2.0.tbz"
+  checksum: "md5=7aa3d4582848afff9a62f866b23173e1"
 }
diff --git a/esy.lock/opam/conf-m4.1/opam b/esy.lock/opam/conf-m4.1/opam
@@ -14,8 +14,8 @@ depexts: [
   ["m4"] {os-distribution = "alpine"}
   ["m4"] {os-distribution = "nixos"}
   ["m4"] {os-family = "suse"}
-  ["m4"] {os-distribution = "oraclelinux"}
-  ["m4"] {os-distribution = "archlinux"}
+  ["m4"] {os-distribution = "ol"}
+  ["m4"] {os-distribution = "arch"}
 ]
 synopsis: "Virtual package relying on m4"
 description:

diff --git a/esy.lock/opam/conf-which.1/opam b/esy.lock/opam/conf-which.1/opam
@@ -12,7 +12,7 @@ depexts: [
   ["debianutils"] {os-distribution = "debian"}
   ["debianutils"] {os-distribution = "ubuntu"}
   ["which"] {os-distribution = "nixos"}
-  ["which"] {os-distribution = "archlinux"}
+  ["which"] {os-distribution = "arch"}
 ]
 synopsis: "Virtual package relying on which"
 description:

diff --git a/esy.lock/opam/configurator.v0.11.0/opam b/esy.lock/opam/configurator.v0.11.0/opam
@@ -11,8 +11,8 @@ build: [
 conflicts: [ "jbuilder" { = "1.0+beta19" } ]
 depends: [
   "ocaml" {>= "4.04.1"}
-  "base" {>= "v0.11" & < "v0.12"}
-  "stdio" {>= "v0.11" & < "v0.12"}
+  "base" {>= "v0.11"}
+  "stdio" {>= "v0.11"}
   "jbuilder" {build & >= "1.0+beta18.1"}
 ]
 synopsis: "Helper library for gathering system configuration"

diff --git a/esy.lock/opam/cstruct.3.5.0/opam → esy.lock/opam/cstruct.3.7.0/opam b/esy.lock/opam/cstruct.3.5.0/opam → esy.lock/opam/cstruct.3.7.0/opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 maintainer:   "[email protected]"
 authors:      ["Anil Madhavapeddy" "Richard Mortier" "Thomas Gazagnaire"
                "Pierre Chambart" "David Kaloper" "Jeremy Yallop" "David Scott"
-               "Mindy Preston" "Thomas Leonard" "Anton Kochkov" ]
+               "Mindy Preston" "Thomas Leonard" "Anton Kochkov" "Etienne Millon" ]
 homepage:     "https://github.com/mirage/ocaml-cstruct"
 license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
@@ -28,6 +28,6 @@ structures directly from OCaml.  It supports both reading and writing to these
 structures, and they are accessed via the `Bigarray` module."""
 url {
   src:
-    "https://github.com/mirage/ocaml-cstruct/releases/download/v3.5.0/cstruct-v3.5.0.tbz"
-  checksum: "md5=019c59aa18690fc05b80be1720efb6e5"
+    "https://github.com/mirage/ocaml-cstruct/releases/download/v3.7.0/cstruct-v3.7.0.tbz"
+  checksum: "md5=60a83c96f5871a3caae091fd116f4f24"
 }
diff --git a/esy.lock/opam/dune.1.7.3/opam → esy.lock/opam/dune.1.8.2/opam b/esy.lock/opam/dune.1.7.3/opam → esy.lock/opam/dune.1.8.2/opam
@@ -42,6 +42,6 @@ packages across several versions of OCaml and gives cross-compilation
 for free.
 """
 url {
-  src: "https://github.com/ocaml/dune/releases/download/1.7.3/dune-1.7.3.tbz"
-  checksum: "md5=644f0c1419d70b9daccac4b4e5664523"
+  src: "https://github.com/ocaml/dune/releases/download/1.8.2/dune-1.8.2.tbz"
+  checksum: "md5=2b7f45a6e14865f2318d34f12221ec1e"
 }
diff --git a/esy.lock/opam/ipaddr.3.0.0/opam → esy.lock/opam/ipaddr.3.1.0/opam b/esy.lock/opam/ipaddr.3.0.0/opam → esy.lock/opam/ipaddr.3.1.0/opam
@@ -30,9 +30,9 @@ depends: [
   "ocaml" {>= "4.04.0"}
   "dune" {build}
   "macaddr"
-  "sexplib0" {< "v0.12"}
+  "sexplib0"
   "ounit" {with-test}
-  "ppx_sexp_conv" {with-test & < "v0.12"}
+  "ppx_sexp_conv" {with-test}
 ]
 build: [
   ["dune" "subst"] {pinned}
@@ -42,6 +42,6 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-ipaddr.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-ipaddr/releases/download/3.0.0/ipaddr-3.0.0.tbz"
-  checksum: "md5=29248b09ead9ac272cd0f4c8ae934082"
+    "https://github.com/mirage/ocaml-ipaddr/releases/download/v3.1.0/ipaddr-v3.1.0.tbz"
+  checksum: "md5=471a594563bb9c3dd91ae912b5ffd6ed"
 }
diff --git a/esy.lock/opam/macaddr.3.0.0/opam → esy.lock/opam/macaddr.3.1.0/opam b/esy.lock/opam/macaddr.3.0.0/opam → esy.lock/opam/macaddr.3.1.0/opam
@@ -2,17 +2,6 @@ opam-version: "2.0"
 maintainer: "[email protected]"
 authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"]
 synopsis: "A library for manipulation of MAC address representations"
-description: """
-Manipulate 48-bit Ethernet MAC addresses using this library.
-
-There are the following ocamlfind libraries included as part of this
-package:
-
-- `macaddr`: The `Macaddr` module for MAC address manipulation.
-- `macaddr.top`: Toplevel printers for Macaddr.
-- `macaddr.sexp`: S-expression converters for Macaddr.
-"""
-
 license: "ISC"
 tags: ["org:mirage" "org:xapi-project"]
 homepage: "https://github.com/mirage/ocaml-ipaddr"
@@ -21,9 +10,9 @@ bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues"
 depends: [
   "ocaml" {>= "4.04.0"}
   "dune" {build}
-  "sexplib0" {< "v0.12"}
+  "sexplib0"
   "ounit" {with-test}
-  "ppx_sexp_conv" {with-test & < "v0.12"}
+  "ppx_sexp_conv" {with-test}
 ]
 conflicts: [ "ipaddr" {< "3.0.0"} ]
 build: [
@@ -33,6 +22,6 @@ build: [
 dev-repo: "git+https://github.com/mirage/ocaml-ipaddr.git"
 url {
   src:
-    "https://github.com/mirage/ocaml-ipaddr/releases/download/3.0.0/ipaddr-3.0.0.tbz"
-  checksum: "md5=29248b09ead9ac272cd0f4c8ae934082"
+    "https://github.com/mirage/ocaml-ipaddr/releases/download/v3.1.0/ipaddr-v3.1.0.tbz"
+  checksum: "md5=471a594563bb9c3dd91ae912b5ffd6ed"
 }
diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam b/esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam
@@ -17,7 +17,7 @@ depends: [
   "result"
   "ppx_derivers"
   "dune" {build & >= "1.6.0"}
-  "ocaml" {>= "4.02.3"}
+  "ocaml" {>= "4.02.3" & < "4.08.0"}
 ]
 synopsis: "Convert OCaml parsetrees between different versions"
 description: """

diff --git a/esy.lock/opam/re2.v0.11.0/opam b/esy.lock/opam/re2.v0.11.0/opam
@@ -18,7 +18,7 @@ depends: [
 ]
 depexts: [
   ["gcc-c++"] {os-distribution = "fedora"}
-  ["gcc-c++"] {os-distribution = "oraclelinux"}
+  ["gcc-c++"] {os-distribution = "ol"}
 ]
 synopsis: "OCaml bindings for RE2, Google's regular expression library"
 url {