Bump lwt version (#179)

esy.lock/index.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "877469f58c938ef5111eddae35c6d387",
+  "checksum": "86639fadcd1e64d0a2f50e5be6313905",
   "root": "fnm@link-dev:./package.json",
   "node": {
     "yargs-parser@16.1.0@d41d8cd9": {
@@ -2985,7 +2985,7 @@
         "@opam/ppx_deriving_yojson@opam:3.5.1@06a1c37f",
         "@opam/ppx_deriving@opam:4.4@21d6c7a5",
         "@opam/lwt_ppx@opam:2.0.0@9a61dd37",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/lambdasoup@opam:0.6.4@cf8a508f",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@opam/cohttp-lwt-unix@opam:2.5.0@df4c7548",
@@ -4743,7 +4743,7 @@
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/nocrypto@opam:0.5.4-2@723e1f42",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/fmt@opam:0.8.8@01c3a23c",
         "@opam/domain-name@opam:0.3.0@af116067",
         "@opam/cstruct-sexp@opam:5.1.1@58ce0491",
@@ -5441,6 +5441,42 @@
         "@opam/base@opam:v0.12.2@d687150c"
       ]
     },
+    "@opam/ocplib-endian@opam:1.0@aa720242": {
+      "id": "@opam/ocplib-endian@opam:1.0@aa720242",
+      "name": "@opam/ocplib-endian",
+      "version": "opam:1.0",
+      "source": {
+        "type": "install",
+        "source": [
+          "archive:https://opam.ocaml.org/cache/md5/74/74b45ba33e189283170a748c2a3ed477#md5:74b45ba33e189283170a748c2a3ed477",
+          "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz#md5:74b45ba33e189283170a748c2a3ed477"
+        ],
+        "opam": {
+          "name": "ocplib-endian",
+          "version": "1.0",
+          "path": "esy.lock/opam/ocplib-endian.1.0"
+        }
+      },
+      "overrides": [
+        {
+          "opamoverride": "esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override"
+        }
+      ],
+      "dependencies": [
+        "ocaml@4.6.1000@d41d8cd9",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
+        "@opam/cppo@opam:1.6.6@f4f83858",
+        "@opam/base-bytes@opam:base@19d0c2ff",
+        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+      ],
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/cppo@opam:1.6.6@f4f83858",
+        "@opam/base-bytes@opam:base@19d0c2ff"
+      ]
+    },
     "@opam/ocb-stubblr@opam:0.1.1-1@fa95dcc0": {
       "id": "@opam/ocb-stubblr@opam:0.1.1-1@fa95dcc0",
       "name": "@opam/ocb-stubblr",
@@ -5649,7 +5685,7 @@
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/mirage-no-xen@opam:1@0d45465b",
         "@opam/mirage-no-solo5@opam:1@84049e1f",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/cstruct-lwt@opam:5.1.1@8923fbc9",
         "@opam/cstruct@opam:5.1.1@e0b5aafd",
         "@opam/cpuid@opam:0.1.2@469a8b76",
@@ -5663,7 +5699,7 @@
         "@opam/ppx_deriving@opam:4.4@21d6c7a5",
         "@opam/mirage-no-xen@opam:1@0d45465b",
         "@opam/mirage-no-solo5@opam:1@84049e1f",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/cstruct-lwt@opam:5.1.1@8923fbc9",
         "@opam/cstruct@opam:5.1.1@e0b5aafd"
       ]
@@ -5925,7 +5961,7 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80",
         "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
@@ -5933,24 +5969,24 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80",
         "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/dune@opam:1.11.4@a7ccb7ae"
       ]
     },
-    "@opam/lwt@opam:4.2.1@08ba7e51": {
+    "@opam/lwt@opam:5.0.1@777d5f18": {
-      "id": "@opam/lwt@opam:4.2.1@08ba7e51",
+      "id": "@opam/lwt@opam:5.0.1@777d5f18",
       "name": "@opam/lwt",
-      "version": "opam:4.2.1",
+      "version": "opam:5.0.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/9d/9d648386ca0a9978eb9487de36b781cc#md5:9d648386ca0a9978eb9487de36b781cc",
+          "archive:https://opam.ocaml.org/cache/md5/70/70d107a5ff1247840e8012b6a3793c15#md5:70d107a5ff1247840e8012b6a3793c15",
-          "archive:https://github.com/ocsigen/lwt/archive/4.2.1.tar.gz#md5:9d648386ca0a9978eb9487de36b781cc"
+          "archive:https://github.com/ocsigen/lwt/archive/5.0.1.tar.gz#md5:70d107a5ff1247840e8012b6a3793c15"
         ],
         "opam": {
           "name": "lwt",
-          "version": "4.2.1",
+          "version": "5.0.1",
-          "path": "esy.lock/opam/lwt.4.2.1"
+          "path": "esy.lock/opam/lwt.5.0.1"
         }
       },
       "overrides": [],
@@ -5958,7 +5994,9 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/seq@opam:0.2.2@e9144e45",
         "@opam/result@opam:1.4@dc720aef",
+        "@opam/ocplib-endian@opam:1.0@aa720242",
         "@opam/mmap@opam:1.1.0@b85334ff",
+        "@opam/dune-configurator@opam:1.0.0@4873acd8",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@opam/cppo@opam:1.6.6@f4f83858",
         "@opam/base-unix@opam:base@87d0b2eb",
@@ -5969,7 +6007,9 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/seq@opam:0.2.2@e9144e45",
         "@opam/result@opam:1.4@dc720aef",
+        "@opam/ocplib-endian@opam:1.0@aa720242",
         "@opam/mmap@opam:1.1.0@b85334ff",
+        "@opam/dune-configurator@opam:1.0.0@4873acd8",
         "@opam/dune@opam:1.11.4@a7ccb7ae"
       ]
     },
@@ -5995,7 +6035,7 @@
         "@opam/topkg@opam:1.0.1@a42c631e",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/fmt@opam:0.8.8@01c3a23c",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-threads@opam:base@36803084",
@@ -6428,7 +6468,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.6.1000@d41d8cd9",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@opam/cstruct@opam:5.1.1@e0b5aafd",
         "@opam/base-unix@opam:base@87d0b2eb",
@@ -6436,7 +6476,7 @@
       ],
       "devDependencies": [
         "ocaml@4.6.1000@d41d8cd9",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@opam/cstruct@opam:5.1.1@e0b5aafd",
         "@opam/base-unix@opam:base@87d0b2eb"
@@ -6597,7 +6637,7 @@
         "@opam/uri@opam:3.1.0@d38ac0ae",
         "@opam/tls@opam:0.10.5@e1ff77a3",
         "@opam/ppx_sexp_conv@opam:v0.12.0@6e30d275",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/ipaddr-sexp@opam:4.0.0@eee6f9bd",
         "@opam/ipaddr@opam:4.0.0@af37ddc7",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
@@ -6609,7 +6649,7 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/uri@opam:3.1.0@d38ac0ae",
         "@opam/ppx_sexp_conv@opam:v0.12.0@6e30d275",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/ipaddr-sexp@opam:4.0.0@eee6f9bd",
         "@opam/ipaddr@opam:4.0.0@af37ddc7",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
@@ -6638,7 +6678,7 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/sexplib@opam:v0.12.0@7033807f",
         "@opam/ppx_sexp_conv@opam:v0.12.0@6e30d275",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@opam/conduit@opam:2.0.2@2891d9d4",
         "@opam/base-unix@opam:base@87d0b2eb",
@@ -6648,7 +6688,7 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/sexplib@opam:v0.12.0@7033807f",
         "@opam/ppx_sexp_conv@opam:v0.12.0@6e30d275",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@opam/conduit@opam:2.0.2@2891d9d4",
         "@opam/base-unix@opam:base@87d0b2eb"
@@ -6715,7 +6755,7 @@
       "dependencies": [
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/magic-mime@opam:1.1.2@980f82fb",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/logs@opam:0.7.0@1d03143e",
         "@opam/fmt@opam:0.8.8@01c3a23c",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
@@ -6728,7 +6768,7 @@
       "devDependencies": [
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/magic-mime@opam:1.1.2@980f82fb",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/logs@opam:0.7.0@1d03143e",
         "@opam/fmt@opam:0.8.8@01c3a23c",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
@@ -6759,7 +6799,7 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/sexplib0@opam:v0.12.0@e432406d",
         "@opam/ppx_sexp_conv@opam:v0.12.0@6e30d275",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/logs@opam:0.7.0@1d03143e",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@opam/cohttp@opam:2.4.0@330d5a69",
@@ -6769,7 +6809,7 @@
         "ocaml@4.6.1000@d41d8cd9",
         "@opam/sexplib0@opam:v0.12.0@e432406d",
         "@opam/ppx_sexp_conv@opam:v0.12.0@6e30d275",
-        "@opam/lwt@opam:4.2.1@08ba7e51",
+        "@opam/lwt@opam:5.0.1@777d5f18",
         "@opam/logs@opam:0.7.0@1d03143e",
         "@opam/dune@opam:1.11.4@a7ccb7ae",
         "@opam/cohttp@opam:2.4.0@330d5a69"

esy.lock/opam/lwt.5.0.1/opam

@@ -2,6 +2,7 @@ opam-version: "2.0"
 
 synopsis: "Promises and event-driven I/O"
 
+version: "5.0.1"
 license: "MIT"
 homepage: "https://github.com/ocsigen/lwt"
 doc: "https://ocsigen.org/lwt/manual/"
@@ -13,22 +14,23 @@ authors: [
 ]
 maintainer: [
   "Anton Bachin <antonbachin@yahoo.com>"
-  "Mauricio Fernandez <mfp@acm.org>"
-  "Simon Cruanes <simon.cruanes.2007@m4x.org>"
 ]
 dev-repo: "git+https://github.com/ocsigen/lwt.git"
 
 depends: [
   "cppo" {build & >= "1.1.0"}
-  "dune"
+  "dune" {>= "1.7.0"}
-  "mmap"  # mmap is needed as long as Lwt supports OCaml < 4.06.0.
+  "dune-configurator"
+  "mmap" {>= "1.1.0"} # mmap is needed as long as Lwt supports OCaml < 4.06.0.
   "ocaml" {>= "4.02.0"}
+  "ocplib-endian"
   "result" # result is needed as long as Lwt supports OCaml 4.02.
   "seq" # seq is needed as long as Lwt supports OCaml < 4.07.0.
 
   "bisect_ppx" {dev & >= "1.3.0"}
   "ocamlfind" {dev & >= "1.7.3-1"}
 ]
+
 depopts: [
   "base-threads"
   "base-unix"
@@ -39,6 +41,11 @@ conflicts: [
   "ocaml-variants" {= "4.02.1+BER"}
 ]
 
+post-messages: [
+  "Lwt 5.0.0 has made some minor breaking changes. See
+  https://github.com/ocsigen/lwt/issues/584"
+]
+
 build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
@@ -53,6 +60,6 @@ a single thread by default. This reduces the need for locks or other
 synchronization primitives. Code can be run in parallel on an opt-in basis."
 
 url {
-  src: "https://github.com/ocsigen/lwt/archive/4.2.1.tar.gz"
+  src: "https://github.com/ocsigen/lwt/archive/5.0.1.tar.gz"
-  checksum: "md5=9d648386ca0a9978eb9487de36b781cc"
+  checksum: "md5=70d107a5ff1247840e8012b6a3793c15"
 }

esy.lock/opam/ocplib-endian.1.0/opam

@@ -0,0 +1,33 @@
+opam-version: "2.0"
+authors: "Pierre Chambart"
+maintainer: "pierre.chambart@ocamlpro.com"
+homepage: "https://github.com/OCamlPro/ocplib-endian"
+build: [
+  ["ocaml" "setup.ml" "-configure" "--disable-debug" "--prefix" prefix]
+  ["ocaml" "setup.ml" "-build"]
+]
+install: [
+  ["ocaml" "setup.ml" "-install"]
+]
+remove: ["ocamlfind" "remove" "ocplib-endian"]
+depends: [
+  "ocaml"
+  "base-bytes"
+  "ocamlfind"
+  "cppo" {>= "1.1.0"}
+  "ocamlbuild" {build}
+]
+dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git"
+bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues"
+synopsis:
+  "Optimised functions to read and write int16/32/64 from strings and bigarrays, based on new primitives added in version 4.01."
+description: """
+The library implements three modules:
+* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.cppo.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts;
+* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.cppo.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts;
+* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.cppo.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts;"""
+flags: light-uninstall
+url {
+  src: "https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz"
+  checksum: "md5=74b45ba33e189283170a748c2a3ed477"
+}

esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch

@@ -0,0 +1,13 @@
+--- ./setup.ml
++++ ./setup.ml
+@@ -6331,9 +6331,7 @@
+           [
+             "-classic-display";
+             "-no-log";
+-            "-no-links";
+-            "-install-lib-dir";
+-            (Filename.concat (standard_library ()) "ocamlbuild")
++            "-no-links"
+           ]
+         else
+           [];

esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch

@@ -0,0 +1,41 @@
+--- ./myocamlbuild.ml
++++ ./myocamlbuild.ml
+@@ -573,6 +573,24 @@
+    Add a dependency after dropping support for 4.01 and earlier. *)
+ let dispatch_cppo = function
+   | After_rules -> begin
++    let is_directory s =
++      let slen = String.length s in
++      let s =
++        if Sys.os_type <> "Win32" || slen < 2 then
++          s
++        else
++          match s.[slen-1] with
++          | '\\' | '/' ->
++              if slen <> 3 || s.[1] <> ':' then
++                String.sub s 0 (slen -1)
++              else
++                (match s.[0] with
++                | 'A' .. 'Z' | 'a' .. 'z' -> s
++                | _ -> String.sub s 0 (slen -1))
++          | _ -> s
++	    in
++      Pathname.is_directory s
++    in
+       let cppo_rules ext =
+         let dep   = "%(name).cppo"-.-ext
+         and prod1 = "%(name: <*> and not <*.cppo>)"-.-ext
+@@ -591,11 +609,11 @@
+       pflag ["cppo"] "cppo_D" (fun s -> S [A "-D"; A s]) ;
+       pflag ["cppo"] "cppo_U" (fun s -> S [A "-U"; A s]) ;
+       pflag ["cppo"] "cppo_I" (fun s ->
+-        if Pathname.is_directory s then S [A "-I"; P s]
++        if is_directory s then S [A "-I"; P s]
+         else S [A "-I"; P (Pathname.dirname s)]
+       ) ;
+       pdep ["cppo"] "cppo_I" (fun s ->
+-        if Pathname.is_directory s then [] else [s]) ;
++        if is_directory s then [] else [s]) ;
+       flag ["cppo"; "cppo_q"] (A "-q") ;
+       flag ["cppo"; "cppo_s"] (A "-s") ;
+       flag ["cppo"; "cppo_n"] (A "-n") ;

esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json

@@ -0,0 +1,34 @@
+{
+  "build": [
+    [
+      "bash",
+      "-c",
+      "#{os == 'windows' ? 'patch -p1 < ocplib-endian-0.8.patch' : 'true'}"
+    ],
+    [
+      "bash",
+      "-c",
+      "#{os == 'windows' ? 'patch -p1 < esy-fix.patch' : 'true'}"
+    ],
+    [
+      "ocaml",
+      "setup.ml",
+      "-configure",
+      "--disable-debug",
+      "--prefix",
+      "#{self.install}"
+    ],
+    [
+      "ocaml",
+      "setup.ml",
+      "-build"
+    ]
+  ],
+  "install": [
+    [
+      "ocaml",
+      "setup.ml",
+      "-install"
+    ]
+  ]
+}

package.json

@@ -93,8 +93,8 @@
     "@opam/cohttp-lwt-unix": "^2.0.0",
     "@opam/dune": "^1.9.3",
     "@opam/lambdasoup": "^0.6.3",
-    "@opam/lwt": "4.2.1",
+    "@opam/lwt": "< 6.0.0",
-    "@opam/lwt_ppx": "^1.2.2",
+    "@opam/lwt_ppx": "< 3.0.0",
     "@opam/ppx_deriving": "^4.2.1",
     "@opam/ppx_deriving_yojson": "3.5.1",
     "@opam/ppx_let": "v0.12.0",