From cf90591cbf49cc1a484c99cdb5fb850d5001b886 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 1 Apr 2023 15:10:26 -0700 Subject: [PATCH 1/5] feat: Relax the js_of_ocaml version range --- esy.lock/index.json | 537 ++++++++++-------- .../opam | 8 +- .../opam | 8 +- .../opam | 8 +- .../{dune-rpc.3.6.0 => dune-rpc.3.6.2}/opam | 8 +- esy.lock/opam/{dune.3.6.0 => dune.3.7.0}/opam | 8 +- esy.lock/opam/{dyn.3.6.0 => dyn.3.6.2}/opam | 8 +- .../opam/{fiber.3.6.0 => fiber.3.6.2}/opam | 8 +- esy.lock/opam/gen.1.1/opam | 31 + esy.lock/opam/js_of_ocaml-compiler.4.1.0/opam | 53 -- ...en-installing-with-a-system-compiler.patch | 26 - .../files/0001-Harden-test-for-OCaml-5.patch | 12 + .../{ocamlfind.1.9.5 => ocamlfind.1.9.6}/opam | 15 +- .../opam | 8 +- esy.lock/opam/ocamlformat.0.24.1/opam | 2 +- .../{ordering.3.6.0 => ordering.3.6.2}/opam | 8 +- .../{ppxlib.0.28.0 => ppxlib.0.29.1}/opam | 8 +- esy.lock/opam/sedlex.3.1/opam | 48 ++ .../opam/{stdune.3.6.0 => stdune.3.6.2}/opam | 8 +- .../opam/{topkg.1.0.6 => topkg.1.0.7}/opam | 4 +- esy.lock/opam/{xdg.3.6.0 => xdg.3.7.0}/opam | 8 +- .../files/findlib.patch | 485 ---------------- .../files/findlib.patch | 11 + .../package.json | 0 libbinaryen.opam | 2 +- package.json | 3 +- 26 files changed, 458 insertions(+), 867 deletions(-) rename esy.lock/opam/{chrome-trace.3.6.0 => chrome-trace.3.7.0}/opam (69%) rename esy.lock/opam/{dune-build-info.3.6.0 => dune-build-info.3.7.0}/opam (75%) rename esy.lock/opam/{dune-configurator.3.6.0 => dune-configurator.3.7.0}/opam (75%) rename esy.lock/opam/{dune-rpc.3.6.0 => dune-rpc.3.6.2}/opam (69%) rename esy.lock/opam/{dune.3.6.0 => dune.3.7.0}/opam (83%) rename esy.lock/opam/{dyn.3.6.0 => dyn.3.6.2}/opam (67%) rename esy.lock/opam/{fiber.3.6.0 => fiber.3.6.2}/opam (69%) create mode 100644 esy.lock/opam/gen.1.1/opam delete mode 100644 esy.lock/opam/js_of_ocaml-compiler.4.1.0/opam delete mode 100644 esy.lock/opam/ocamlfind.1.9.5/files/0001-Fix-bug-when-installing-with-a-system-compiler.patch create mode 100644 esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch rename esy.lock/opam/{ocamlfind.1.9.5 => ocamlfind.1.9.6}/opam (70%) rename esy.lock/opam/{ocamlformat-rpc-lib.0.24.1 => ocamlformat-rpc-lib.0.25.1}/opam (73%) rename esy.lock/opam/{ordering.3.6.0 => ordering.3.6.2}/opam (66%) rename esy.lock/opam/{ppxlib.0.28.0 => ppxlib.0.29.1}/opam (81%) create mode 100644 esy.lock/opam/sedlex.3.1/opam rename esy.lock/opam/{stdune.3.6.0 => stdune.3.6.2}/opam (71%) rename esy.lock/opam/{topkg.1.0.6 => topkg.1.0.7}/opam (89%) rename esy.lock/opam/{xdg.3.6.0 => xdg.3.7.0}/opam (68%) delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/files/findlib.patch create mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch rename esy.lock/overrides/{opam__s__ocamlfind_opam__c__1.9.5_opam_override => opam__s__ocamlfind_opam__c__1.9.6_opam_override}/package.json (100%) diff --git a/esy.lock/index.json b/esy.lock/index.json index 17769b7..f8cd483 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "c6e43906dd79291af8c22ce49e471ae7", + "checksum": "5e5890436da313bf572c15a89449d3df", "root": "@grain/libbinaryen@link-dev:./package.json", "node": { "ocaml@4.14.0@d41d8cd9": { @@ -35,37 +35,37 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.6.0@79688ccb", "@opam/cppo@opam:1.6.9@db929a12", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.6.0@79688ccb" + "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/xdg@opam:3.6.0@a0d64bb5": { - "id": "@opam/xdg@opam:3.6.0@a0d64bb5", + "@opam/xdg@opam:3.7.0@449d6490": { + "id": "@opam/xdg@opam:3.7.0@449d6490", "name": "@opam/xdg", - "version": "opam:3.6.0", + "version": "opam:3.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", + "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" ], "opam": { "name": "xdg", - "version": "3.6.0", - "path": "esy.lock/opam/xdg.3.6.0" + "version": "3.7.0", + "path": "esy.lock/opam/xdg.3.7.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/uutf@opam:1.0.3@47c95a18": { @@ -86,8 +86,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/topkg@opam:1.0.6@da3f4ab1", - "@opam/ocamlfind@opam:1.9.5@c23112ba", + "ocaml@4.14.0@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@opam/cmdliner@opam:1.1.1@03763729", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -113,8 +113,8 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/uucp@opam:15.0.0@55460339", "@opam/topkg@opam:1.0.6@da3f4ab1", - "@opam/ocamlfind@opam:1.9.5@c23112ba", + "@opam/uucp@opam:15.0.0@55460339", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@opam/cmdliner@opam:1.1.1@03763729", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -142,33 +142,33 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/topkg@opam:1.0.6@da3f4ab1", - "@opam/ocamlfind@opam:1.9.5@c23112ba", + "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@opam/cmdliner@opam:1.1.1@03763729", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, - "@opam/topkg@opam:1.0.6@da3f4ab1": { - "id": "@opam/topkg@opam:1.0.6@da3f4ab1", + "@opam/topkg@opam:1.0.7@7ee47d76": { + "id": "@opam/topkg@opam:1.0.7@7ee47d76", "name": "@opam/topkg", - "version": "opam:1.0.6", + "version": "opam:1.0.7", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/8e/8e34391e2f499cec332b79454a4edb36a35db6fe22437f017fd5c80ae065160dc967ac02d894a94d08d62dd476521e63733f4cadc3b9b6b314b6aa5b2b4ede78#sha512:8e34391e2f499cec332b79454a4edb36a35db6fe22437f017fd5c80ae065160dc967ac02d894a94d08d62dd476521e63733f4cadc3b9b6b314b6aa5b2b4ede78", - "archive:https://erratique.ch/software/topkg/releases/topkg-1.0.6.tbz#sha512:8e34391e2f499cec332b79454a4edb36a35db6fe22437f017fd5c80ae065160dc967ac02d894a94d08d62dd476521e63733f4cadc3b9b6b314b6aa5b2b4ede78" + "archive:https://opam.ocaml.org/cache/sha512/09/09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535#sha512:09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535", + "archive:https://erratique.ch/software/topkg/releases/topkg-1.0.7.tbz#sha512:09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535" ], "opam": { "name": "topkg", - "version": "1.0.6", - "path": "esy.lock/opam/topkg.1.0.6" + "version": "1.0.7", + "path": "esy.lock/opam/topkg.1.0.7" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c23112ba", + "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -176,35 +176,35 @@ "ocaml@4.14.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.2@c6163b28" ] }, - "@opam/stdune@opam:3.6.0@a5e22dd3": { - "id": "@opam/stdune@opam:3.6.0@a5e22dd3", + "@opam/stdune@opam:3.6.2@47d75c4b": { + "id": "@opam/stdune@opam:3.6.2@47d75c4b", "name": "@opam/stdune", - "version": "opam:3.6.0", + "version": "opam:3.6.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/b6/b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c", + "archive:https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" ], "opam": { "name": "stdune", - "version": "3.6.0", - "path": "esy.lock/opam/stdune.3.6.0" + "version": "3.6.2", + "path": "esy.lock/opam/stdune.3.6.2" } }, "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ordering@opam:3.6.0@d25a6afc", - "@opam/dyn@opam:3.6.0@cdd7d871", "@opam/dune@opam:3.6.0@79688ccb", + "@opam/ordering@opam:3.6.2@37bc3093", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ordering@opam:3.6.0@d25a6afc", - "@opam/dyn@opam:3.6.0@cdd7d871", "@opam/dune@opam:3.6.0@79688ccb", + "@opam/ordering@opam:3.6.2@37bc3093", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/base-unix@opam:base@87d0b2eb" ] @@ -227,11 +227,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/stdio@opam:v0.15.0@aeefdf96": { @@ -252,12 +252,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base@opam:v0.15.1@e8a71f35" ] }, @@ -279,11 +279,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/sexplib0@opam:v0.15.1@51111c0c": { @@ -304,11 +304,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -330,6 +330,33 @@ ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, + "@opam/sedlex@opam:3.1@d4f1d2e2": { + "id": "@opam/sedlex@opam:3.1@d4f1d2e2", + "name": "@opam/sedlex", + "version": "opam:3.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/e9/e9d423a4cb194af3f39cc38eeb033eeb#md5:e9d423a4cb194af3f39cc38eeb033eeb", + "archive:https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.1.tar.gz#md5:e9d423a4cb194af3f39cc38eeb033eeb" + ], + "opam": { + "name": "sedlex", + "version": "3.1", + "path": "esy.lock/opam/sedlex.3.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/ppxlib@opam:0.29.1@8414c948", + "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.7.0@95218dc4", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/ppxlib@opam:0.29.1@8414c948", + "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.7.0@95218dc4" + ] + }, "@opam/result@opam:1.5@1c6a6533": { "id": "@opam/result@opam:1.5@1c6a6533", "name": "@opam/result", @@ -348,11 +375,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/re@opam:1.10.4@c4910ba6": { @@ -374,27 +401,27 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.6.0@79688ccb", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.6.0@79688ccb" + "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/ppxlib@opam:0.28.0@8c51d241": { - "id": "@opam/ppxlib@opam:0.28.0@8c51d241", + "@opam/ppxlib@opam:0.29.1@8414c948": { + "id": "@opam/ppxlib@opam:0.29.1@8414c948", "name": "@opam/ppxlib", - "version": "opam:0.28.0", + "version": "opam:0.29.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d8/d87ae5f9a081206308ca964809b50a66aeb8e83d254801e8b9675448b60cf377#sha256:d87ae5f9a081206308ca964809b50a66aeb8e83d254801e8b9675448b60cf377", - "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.28.0/ppxlib-0.28.0.tbz#sha256:d87ae5f9a081206308ca964809b50a66aeb8e83d254801e8b9675448b60cf377" + "archive:https://opam.ocaml.org/cache/sha256/c8/c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79#sha256:c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79", + "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.29.1/ppxlib-0.29.1.tbz#sha256:c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79" ], "opam": { "name": "ppxlib", - "version": "0.28.0", - "path": "esy.lock/opam/ppxlib.0.28.0" + "version": "0.29.1", + "path": "esy.lock/opam/ppxlib.0.29.1" } }, "overrides": [], @@ -403,14 +430,14 @@ "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.6.0@79688ccb", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.6.0@79688ccb" + "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/ppx_yojson_conv_lib@opam:v0.15.0@773058a7": { @@ -432,11 +459,11 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/dune@opam:3.6.0@79688ccb", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/dune@opam:3.6.0@79688ccb" + "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/ppx_derivers@opam:1.2.1@e2cbad12": { @@ -457,11 +484,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/pp@opam:1.1.2@89ad03b5": { @@ -482,36 +509,36 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/ordering@opam:3.6.0@d25a6afc": { - "id": "@opam/ordering@opam:3.6.0@d25a6afc", + "@opam/ordering@opam:3.6.2@37bc3093": { + "id": "@opam/ordering@opam:3.6.2@37bc3093", "name": "@opam/ordering", - "version": "opam:3.6.0", + "version": "opam:3.6.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/b6/b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c", + "archive:https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" ], "opam": { "name": "ordering", - "version": "3.6.0", - "path": "esy.lock/opam/ordering.3.6.0" + "version": "3.6.2", + "path": "esy.lock/opam/ordering.3.6.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/omd@opam:1.3.2@511d53d2": { @@ -532,13 +559,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0" ] @@ -562,14 +589,14 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.6.0@79688ccb", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/camlp-streams@opam:5.0.1@daaa0f94", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.6.0@79688ccb", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/camlp-streams@opam:5.0.1@daaa0f94", "@opam/astring@opam:0.8.5@1300cee8" ] @@ -592,11 +619,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/ocp-indent@opam:1.7.0@2da3c6e5": { @@ -617,47 +644,47 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c23112ba", - "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/cmdliner@opam:1.1.1@03763729", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c23112ba", - "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/cmdliner@opam:1.1.1@03763729", "@opam/base-bytes@opam:base@19d0c2ff" ] }, - "@opam/ocamlformat-rpc-lib@opam:0.24.1@4b5db4b3": { - "id": "@opam/ocamlformat-rpc-lib@opam:0.24.1@4b5db4b3", + "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e": { + "id": "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e", "name": "@opam/ocamlformat-rpc-lib", - "version": "opam:0.24.1", + "version": "opam:0.25.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/02/023425e9818f80ea50537b2371a4a766c149a9957d05807e88a004d2d5f441ce#sha256:023425e9818f80ea50537b2371a4a766c149a9957d05807e88a004d2d5f441ce", - "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.24.1/ocamlformat-0.24.1.tbz#sha256:023425e9818f80ea50537b2371a4a766c149a9957d05807e88a004d2d5f441ce" + "archive:https://opam.ocaml.org/cache/sha256/dc/dc8f2a330ca3930b36cacb2623bb360ed8bdf6e4a8acd293dbd9e2241a6fd33d#sha256:dc8f2a330ca3930b36cacb2623bb360ed8bdf6e4a8acd293dbd9e2241a6fd33d", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.25.1/ocamlformat-0.25.1.tbz#sha256:dc8f2a330ca3930b36cacb2623bb360ed8bdf6e4a8acd293dbd9e2241a6fd33d" ], "opam": { "name": "ocamlformat-rpc-lib", - "version": "0.24.1", - "path": "esy.lock/opam/ocamlformat-rpc-lib.0.24.1" + "version": "0.25.1", + "path": "esy.lock/opam/ocamlformat-rpc-lib.0.25.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, - "@opam/ocamlformat@opam:0.24.1@80ba1b34": { - "id": "@opam/ocamlformat@opam:0.24.1@80ba1b34", + "@opam/ocamlformat@opam:0.24.1@9aca58ad": { + "id": "@opam/ocamlformat@opam:0.24.1@9aca58ad", "name": "@opam/ocamlformat", "version": "opam:0.24.1", "source": { @@ -686,8 +713,8 @@ "@opam/fpath@opam:0.7.3@674d8125", "@opam/fix@opam:20220121@17b9a1a4", "@opam/either@opam:1.0.0@be5a1416", - "@opam/dune-build-info@opam:3.6.0@889e8e4f", - "@opam/dune@opam:3.6.0@79688ccb", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/dune-build-info@opam:3.7.0@ce68449d", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/cmdliner@opam:1.1.1@03763729", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -705,32 +732,32 @@ "@opam/fpath@opam:0.7.3@674d8125", "@opam/fix@opam:20220121@17b9a1a4", "@opam/either@opam:1.0.0@be5a1416", - "@opam/dune-build-info@opam:3.6.0@889e8e4f", - "@opam/dune@opam:3.6.0@79688ccb", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/dune-build-info@opam:3.7.0@ce68449d", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/cmdliner@opam:1.1.1@03763729", "@opam/base@opam:v0.15.1@e8a71f35" ] }, - "@opam/ocamlfind@opam:1.9.5@c23112ba": { - "id": "@opam/ocamlfind@opam:1.9.5@c23112ba", + "@opam/ocamlfind@opam:1.9.6@da5169c7": { + "id": "@opam/ocamlfind@opam:1.9.6@da5169c7", "name": "@opam/ocamlfind", - "version": "opam:1.9.5", + "version": "opam:1.9.6", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/8b/8b893525ce36cb3d4d4952483bcc7cf4#md5:8b893525ce36cb3d4d4952483bcc7cf4", - "archive:http://download.camlcity.org/download/findlib-1.9.5.tar.gz#md5:8b893525ce36cb3d4d4952483bcc7cf4" + "archive:https://opam.ocaml.org/cache/md5/96/96c6ee50a32cca9ca277321262dbec57#md5:96c6ee50a32cca9ca277321262dbec57", + "archive:http://download.camlcity.org/download/findlib-1.9.6.tar.gz#md5:96c6ee50a32cca9ca277321262dbec57" ], "opam": { "name": "ocamlfind", - "version": "1.9.5", - "path": "esy.lock/opam/ocamlfind.1.9.5" + "version": "1.9.6", + "path": "esy.lock/opam/ocamlfind.1.9.6" } }, "overrides": [ { "opamoverride": - "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override" + "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override" } ], "dependencies": [ @@ -783,11 +810,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770": { @@ -809,36 +836,36 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/xdg@opam:3.6.0@a0d64bb5", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.6.0@a5e22dd3", + "@opam/xdg@opam:3.7.0@449d6490", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", "@opam/ppx_yojson_conv_lib@opam:v0.15.0@773058a7", - "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.0@d25a6afc", + "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", "@opam/omd@opam:1.3.2@511d53d2", "@opam/octavius@opam:1.2.2@2205cc65", - "@opam/ocamlformat-rpc-lib@opam:0.24.1@4b5db4b3", - "@opam/fiber@opam:3.6.0@6dd9114e", "@opam/dyn@opam:3.6.0@cdd7d871", - "@opam/dune-rpc@opam:3.6.0@ff4fbfea", - "@opam/dune-build-info@opam:3.6.0@889e8e4f", - "@opam/dune@opam:3.6.0@79688ccb", "@opam/csexp@opam:1.5.1@8a8fb3a7", - "@opam/chrome-trace@opam:3.6.0@e39574ee", + "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e", + "@opam/fiber@opam:3.6.2@349136be", "@opam/dyn@opam:3.6.2@38120dfc", + "@opam/dune-rpc@opam:3.6.2@d874b9d2", + "@opam/dune-build-info@opam:3.7.0@ce68449d", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/chrome-trace@opam:3.7.0@6448e71e", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/xdg@opam:3.6.0@a0d64bb5", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.6.0@a5e22dd3", + "@opam/xdg@opam:3.7.0@449d6490", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", "@opam/ppx_yojson_conv_lib@opam:v0.15.0@773058a7", - "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.0@d25a6afc", + "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", "@opam/omd@opam:1.3.2@511d53d2", "@opam/octavius@opam:1.2.2@2205cc65", - "@opam/ocamlformat-rpc-lib@opam:0.24.1@4b5db4b3", - "@opam/fiber@opam:3.6.0@6dd9114e", "@opam/dyn@opam:3.6.0@cdd7d871", - "@opam/dune-rpc@opam:3.6.0@ff4fbfea", - "@opam/dune-build-info@opam:3.6.0@889e8e4f", - "@opam/dune@opam:3.6.0@79688ccb", "@opam/csexp@opam:1.5.1@8a8fb3a7", - "@opam/chrome-trace@opam:3.6.0@e39574ee" + "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e", + "@opam/fiber@opam:3.6.2@349136be", "@opam/dyn@opam:3.6.2@38120dfc", + "@opam/dune-rpc@opam:3.6.2@d874b9d2", + "@opam/dune-build-info@opam:3.7.0@ce68449d", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/chrome-trace@opam:3.7.0@6448e71e" ] }, "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882": { @@ -859,11 +886,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/menhirSdk@opam:20220210@fe146ed3": { @@ -884,11 +911,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/menhirLib@opam:20220210@9afeb270": { @@ -909,11 +936,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/menhir@opam:20220210@ff5ea9a7": { @@ -936,52 +963,76 @@ "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/dune@opam:3.6.0@79688ccb", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/dune@opam:3.6.0@79688ccb" + "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/js_of_ocaml-compiler@opam:4.1.0@4d526669": { - "id": "@opam/js_of_ocaml-compiler@opam:4.1.0@4d526669", + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839@d41d8cd9": { + "id": + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839@d41d8cd9", "name": "@opam/js_of_ocaml-compiler", - "version": "opam:4.1.0", + "version": + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/91/91793f29a5af3deaba3f7d35ceab11e739cfe0a5cc30556f6201461a6d4236ef#sha256:91793f29a5af3deaba3f7d35ceab11e739cfe0a5cc30556f6201461a6d4236ef", - "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/4.1.0/js_of_ocaml-4.1.0.tbz#sha256:91793f29a5af3deaba3f7d35ceab11e739cfe0a5cc30556f6201461a6d4236ef" - ], - "opam": { - "name": "js_of_ocaml-compiler", - "version": "4.1.0", - "path": "esy.lock/opam/js_of_ocaml-compiler.4.1.0" - } + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839" + ] }, "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/ppxlib@opam:0.28.0@8c51d241", - "@opam/ocamlfind@opam:1.9.5@c23112ba", + "@opam/sedlex@opam:3.1@d4f1d2e2", + "@opam/ppxlib@opam:0.29.1@8414c948", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", "@opam/menhir@opam:20220210@ff5ea9a7", - "@opam/dune@opam:3.6.0@79688ccb", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/cmdliner@opam:1.1.1@03763729", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/ppxlib@opam:0.28.0@8c51d241", + "@opam/sedlex@opam:3.1@d4f1d2e2", + "@opam/ppxlib@opam:0.29.1@8414c948", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", "@opam/menhir@opam:20220210@ff5ea9a7", - "@opam/dune@opam:3.6.0@79688ccb", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/cmdliner@opam:1.1.1@03763729" ] }, + "@opam/gen@opam:1.1@059b2731": { + "id": "@opam/gen@opam:1.1@059b2731", + "name": "@opam/gen", + "version": "opam:1.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/fa/fa8066511b693815fe659fd022f4c6bc#md5:fa8066511b693815fe659fd022f4c6bc", + "archive:https://github.com/c-cube/gen/archive/v1.1.tar.gz#md5:fa8066511b693815fe659fd022f4c6bc" + ], + "opam": { + "name": "gen", + "version": "1.1", + "path": "esy.lock/opam/gen.1.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.7.0@95218dc4" + ] + }, "@opam/fpath@opam:0.7.3@674d8125": { "id": "@opam/fpath@opam:0.7.3@674d8125", "name": "@opam/fpath", @@ -1000,8 +1051,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/topkg@opam:1.0.6@da3f4ab1", - "@opam/ocamlfind@opam:1.9.5@c23112ba", + "ocaml@4.14.0@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1028,38 +1079,38 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/fiber@opam:3.6.0@6dd9114e": { - "id": "@opam/fiber@opam:3.6.0@6dd9114e", + "@opam/fiber@opam:3.6.2@349136be": { + "id": "@opam/fiber@opam:3.6.2@349136be", "name": "@opam/fiber", - "version": "opam:3.6.0", + "version": "opam:3.6.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/b6/b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c", + "archive:https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" ], "opam": { "name": "fiber", - "version": "3.6.0", - "path": "esy.lock/opam/fiber.3.6.0" + "version": "3.6.2", + "path": "esy.lock/opam/fiber.3.6.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/stdune@opam:3.6.0@a5e22dd3", - "@opam/dyn@opam:3.6.0@cdd7d871", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/stdune@opam:3.6.2@47d75c4b", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/stdune@opam:3.6.0@a5e22dd3", - "@opam/dyn@opam:3.6.0@cdd7d871", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/stdune@opam:3.6.2@47d75c4b", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/either@opam:1.0.0@be5a1416": { @@ -1080,136 +1131,136 @@ }, "overrides": [], "dependencies": [ - "@opam/dune@opam:3.6.0@79688ccb", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:3.6.0@79688ccb" ] + "devDependencies": [ "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/dyn@opam:3.6.0@cdd7d871": { - "id": "@opam/dyn@opam:3.6.0@cdd7d871", + "@opam/dyn@opam:3.6.2@38120dfc": { + "id": "@opam/dyn@opam:3.6.2@38120dfc", "name": "@opam/dyn", - "version": "opam:3.6.0", + "version": "opam:3.6.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/b6/b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c", + "archive:https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" ], "opam": { "name": "dyn", - "version": "3.6.0", - "path": "esy.lock/opam/dyn.3.6.0" + "version": "3.6.2", + "path": "esy.lock/opam/dyn.3.6.2" } }, "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ordering@opam:3.6.0@d25a6afc", - "@opam/dune@opam:3.6.0@79688ccb", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ordering@opam:3.6.2@37bc3093", + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ordering@opam:3.6.0@d25a6afc", - "@opam/dune@opam:3.6.0@79688ccb" + "@opam/ordering@opam:3.6.2@37bc3093", + "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/dune-rpc@opam:3.6.0@ff4fbfea": { - "id": "@opam/dune-rpc@opam:3.6.0@ff4fbfea", + "@opam/dune-rpc@opam:3.6.2@d874b9d2": { + "id": "@opam/dune-rpc@opam:3.6.2@d874b9d2", "name": "@opam/dune-rpc", - "version": "opam:3.6.0", + "version": "opam:3.6.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/b6/b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c", + "archive:https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz#sha256:b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" ], "opam": { "name": "dune-rpc", - "version": "3.6.0", - "path": "esy.lock/opam/dune-rpc.3.6.0" + "version": "3.6.2", + "path": "esy.lock/opam/dune-rpc.3.6.2" } }, "overrides": [], "dependencies": [ - "@opam/xdg@opam:3.6.0@a0d64bb5", "@opam/stdune@opam:3.6.0@a5e22dd3", - "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.0@d25a6afc", - "@opam/dyn@opam:3.6.0@cdd7d871", "@opam/dune@opam:3.6.0@79688ccb", + "@opam/xdg@opam:3.7.0@449d6490", "@opam/stdune@opam:3.6.2@47d75c4b", + "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/xdg@opam:3.6.0@a0d64bb5", "@opam/stdune@opam:3.6.0@a5e22dd3", - "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.0@d25a6afc", - "@opam/dyn@opam:3.6.0@cdd7d871", "@opam/dune@opam:3.6.0@79688ccb", + "@opam/xdg@opam:3.7.0@449d6490", "@opam/stdune@opam:3.6.2@47d75c4b", + "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, - "@opam/dune-configurator@opam:3.6.0@3ecc1753": { - "id": "@opam/dune-configurator@opam:3.6.0@3ecc1753", + "@opam/dune-configurator@opam:3.7.0@4fa6f76e": { + "id": "@opam/dune-configurator@opam:3.7.0@4fa6f76e", "name": "@opam/dune-configurator", - "version": "opam:3.6.0", + "version": "opam:3.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", + "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" ], "opam": { "name": "dune-configurator", - "version": "3.6.0", - "path": "esy.lock/opam/dune-configurator.3.6.0" + "version": "3.7.0", + "path": "esy.lock/opam/dune-configurator.3.7.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/dune-build-info@opam:3.6.0@889e8e4f": { - "id": "@opam/dune-build-info@opam:3.6.0@889e8e4f", + "@opam/dune-build-info@opam:3.7.0@ce68449d": { + "id": "@opam/dune-build-info@opam:3.7.0@ce68449d", "name": "@opam/dune-build-info", - "version": "opam:3.6.0", + "version": "opam:3.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", + "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" ], "opam": { "name": "dune-build-info", - "version": "3.6.0", - "path": "esy.lock/opam/dune-build-info.3.6.0" + "version": "3.7.0", + "path": "esy.lock/opam/dune-build-info.3.7.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/dune@opam:3.6.0@79688ccb": { - "id": "@opam/dune@opam:3.6.0@79688ccb", + "@opam/dune@opam:3.7.0@95218dc4": { + "id": "@opam/dune@opam:3.7.0@95218dc4", "name": "@opam/dune", - "version": "opam:3.6.0", + "version": "opam:3.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", + "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" ], "opam": { "name": "dune", - "version": "3.6.0", - "path": "esy.lock/opam/dune.3.6.0" + "version": "3.7.0", + "path": "esy.lock/opam/dune.3.7.0" } }, "overrides": [], @@ -1241,11 +1292,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/cppo@opam:1.6.9@db929a12": { @@ -1266,12 +1317,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -1313,29 +1364,29 @@ ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, - "@opam/chrome-trace@opam:3.6.0@e39574ee": { - "id": "@opam/chrome-trace@opam:3.6.0@e39574ee", + "@opam/chrome-trace@opam:3.7.0@6448e71e": { + "id": "@opam/chrome-trace@opam:3.7.0@6448e71e", "name": "@opam/chrome-trace", - "version": "opam:3.6.0", + "version": "opam:3.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/08/08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278", - "archive:https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz#sha256:08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" + "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", + "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" ], "opam": { "name": "chrome-trace", - "version": "3.6.0", - "path": "esy.lock/opam/chrome-trace.3.6.0" + "version": "3.7.0", + "path": "esy.lock/opam/chrome-trace.3.7.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/camlp-streams@opam:5.0.1@daaa0f94": { @@ -1356,11 +1407,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.6.0@79688ccb" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -1412,11 +1463,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c23112ba", + "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c23112ba" + "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7" ] }, "@opam/base-bigarray@opam:base@b03491b0": { @@ -1455,13 +1506,13 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune-configurator@opam:3.6.0@3ecc1753", - "@opam/dune@opam:3.6.0@79688ccb", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-configurator@opam:3.7.0@4fa6f76e", + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune-configurator@opam:3.6.0@3ecc1753", - "@opam/dune@opam:3.6.0@79688ccb" + "@opam/dune-configurator@opam:3.7.0@4fa6f76e", + "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/astring@opam:0.8.5@1300cee8": { @@ -1482,8 +1533,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/topkg@opam:1.0.6@da3f4ab1", - "@opam/ocamlfind@opam:1.9.5@c23112ba", + "ocaml@4.14.0@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1501,14 +1552,14 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", - "@opam/dune-configurator@opam:3.6.0@3ecc1753", - "@opam/dune@opam:3.6.0@79688ccb", + "@opam/dune-configurator@opam:3.7.0@4fa6f76e", + "@opam/dune@opam:3.7.0@95218dc4", "@opam/conf-cmake@github:grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869@d41d8cd9" ], "devDependencies": [ - "@opam/ocamlformat@opam:0.24.1@80ba1b34", + "@opam/ocamlformat@opam:0.24.1@9aca58ad", "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", - "@opam/js_of_ocaml-compiler@opam:4.1.0@4d526669" + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839@d41d8cd9" ], "installConfig": { "pnp": false } }, diff --git a/esy.lock/opam/chrome-trace.3.6.0/opam b/esy.lock/opam/chrome-trace.3.7.0/opam similarity index 69% rename from esy.lock/opam/chrome-trace.3.6.0/opam rename to esy.lock/opam/chrome-trace.3.7.0/opam index b1d9e32..46cf1c7 100644 --- a/esy.lock/opam/chrome-trace.3.6.0/opam +++ b/esy.lock/opam/chrome-trace.3.7.0/opam @@ -30,10 +30,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" diff --git a/esy.lock/opam/dune-build-info.3.6.0/opam b/esy.lock/opam/dune-build-info.3.7.0/opam similarity index 75% rename from esy.lock/opam/dune-build-info.3.6.0/opam rename to esy.lock/opam/dune-build-info.3.7.0/opam index 4d65ee3..059e6e1 100644 --- a/esy.lock/opam/dune-build-info.3.6.0/opam +++ b/esy.lock/opam/dune-build-info.3.7.0/opam @@ -36,10 +36,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" diff --git a/esy.lock/opam/dune-configurator.3.6.0/opam b/esy.lock/opam/dune-configurator.3.7.0/opam similarity index 75% rename from esy.lock/opam/dune-configurator.3.6.0/opam rename to esy.lock/opam/dune-configurator.3.7.0/opam index 828af61..c5555e8 100644 --- a/esy.lock/opam/dune-configurator.3.6.0/opam +++ b/esy.lock/opam/dune-configurator.3.7.0/opam @@ -40,10 +40,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" diff --git a/esy.lock/opam/dune-rpc.3.6.0/opam b/esy.lock/opam/dune-rpc.3.6.2/opam similarity index 69% rename from esy.lock/opam/dune-rpc.3.6.0/opam rename to esy.lock/opam/dune-rpc.3.6.2/opam index 359c967..6a6c7fe 100644 --- a/esy.lock/opam/dune-rpc.3.6.0/opam +++ b/esy.lock/opam/dune-rpc.3.6.2/opam @@ -34,10 +34,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" + "sha512=d0dd69ada2f1583319a2d6f679b8d49998059117c3258805ee69ae3e71d47bfab7a9c646f19b5fc43a6ccdef934eb87de5bb81205fcd60968bed8bf1790cf0a3" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "c939c2b0f7a470cedd189988c61cd307a3cedace" diff --git a/esy.lock/opam/dune.3.6.0/opam b/esy.lock/opam/dune.3.7.0/opam similarity index 83% rename from esy.lock/opam/dune.3.6.0/opam rename to esy.lock/opam/dune.3.7.0/opam index 212c7ce..c9207f2 100644 --- a/esy.lock/opam/dune.3.6.0/opam +++ b/esy.lock/opam/dune.3.7.0/opam @@ -47,10 +47,10 @@ depends: [ "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" diff --git a/esy.lock/opam/dyn.3.6.0/opam b/esy.lock/opam/dyn.3.6.2/opam similarity index 67% rename from esy.lock/opam/dyn.3.6.0/opam rename to esy.lock/opam/dyn.3.6.2/opam index 4812584..ad73e2f 100644 --- a/esy.lock/opam/dyn.3.6.0/opam +++ b/esy.lock/opam/dyn.3.6.2/opam @@ -31,10 +31,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" + "sha512=d0dd69ada2f1583319a2d6f679b8d49998059117c3258805ee69ae3e71d47bfab7a9c646f19b5fc43a6ccdef934eb87de5bb81205fcd60968bed8bf1790cf0a3" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "c939c2b0f7a470cedd189988c61cd307a3cedace" diff --git a/esy.lock/opam/fiber.3.6.0/opam b/esy.lock/opam/fiber.3.6.2/opam similarity index 69% rename from esy.lock/opam/fiber.3.6.0/opam rename to esy.lock/opam/fiber.3.6.2/opam index 7522dc3..304d921 100644 --- a/esy.lock/opam/fiber.3.6.0/opam +++ b/esy.lock/opam/fiber.3.6.2/opam @@ -32,10 +32,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" + "sha512=d0dd69ada2f1583319a2d6f679b8d49998059117c3258805ee69ae3e71d47bfab7a9c646f19b5fc43a6ccdef934eb87de5bb81205fcd60968bed8bf1790cf0a3" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "c939c2b0f7a470cedd189988c61cd307a3cedace" diff --git a/esy.lock/opam/gen.1.1/opam b/esy.lock/opam/gen.1.1/opam new file mode 100644 index 0000000..30e8e33 --- /dev/null +++ b/esy.lock/opam/gen.1.1/opam @@ -0,0 +1,31 @@ +opam-version: "2.0" +maintainer: "simon.cruanes.2007@m4x.org" +synopsis: "Iterators for OCaml, both restartable and consumable" +license: "BSD-2-Clause" +build: [ + ["dune" "build" "@install" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} +] +depends: [ + "dune" {>= "1.1"} + "seq" + "odoc" {with-doc} + "qcheck" {with-test} + "qtest" {with-test} + "ounit2" {with-test} + "ocaml" { >= "4.03.0" } +] +tags: [ "gen" "iterator" "iter" "fold" ] +homepage: "https://github.com/c-cube/gen/" +doc: "https://c-cube.github.io/gen/" +bug-reports: "https://github.com/c-cube/gen/issues" +dev-repo: "git+https://github.com/c-cube/gen.git" +authors: ["Simon Cruanes" "ELLIOTTCABLE"] +url { + src: "https://github.com/c-cube/gen/archive/v1.1.tar.gz" + checksum: [ + "md5=fa8066511b693815fe659fd022f4c6bc" + "sha512=71a4b5c3666a7c11935398a78feea7383f61d2c549dfb96e324d40783ffa87b5ec492c5ec468803aabfb9b48e7d0ebaa30b24d2b974540afc7cca5feea3121c1" + ] +} diff --git a/esy.lock/opam/js_of_ocaml-compiler.4.1.0/opam b/esy.lock/opam/js_of_ocaml-compiler.4.1.0/opam deleted file mode 100644 index d8faf0a..0000000 --- a/esy.lock/opam/js_of_ocaml-compiler.4.1.0/opam +++ /dev/null @@ -1,53 +0,0 @@ -opam-version: "2.0" -synopsis: "Compiler from OCaml bytecode to JavaScript" -description: - "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js" -maintainer: ["Ocsigen team "] -authors: ["Ocsigen team "] -license: - "GPL-2.0-or-later AND LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" -doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" -bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues" -depends: [ - "dune" {>= "3.2"} - "ocaml" {>= "4.04" & < "5.1"} - "num" {with-test} - "ppx_expect" {>= "v0.14.2" & with-test} - "ppxlib" {>= "0.15.0"} - "re" {with-test} - "cmdliner" {>= "1.1.0"} - "menhir" - "menhirLib" - "menhirSdk" - "yojson" - "odoc" {with-doc} -] -depopts: ["ocamlfind"] -conflicts: [ - "ocamlfind" {< "1.5.1"} - "js_of_ocaml" {< "3.0"} -] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: - "https://github.com/ocsigen/js_of_ocaml/releases/download/4.1.0/js_of_ocaml-4.1.0.tbz" - checksum: [ - "sha256=91793f29a5af3deaba3f7d35ceab11e739cfe0a5cc30556f6201461a6d4236ef" - "sha512=43f91c1f37939dfc894558a23a8ca163e6f316db442bdd0a5909bd095f5b0eb596d0943883452f4b78641da71222a775476877ea9ba0500583700d1fb35e04a5" - ] -} -x-commit-hash: "9cb30b78c1a4bde6176652b94c96b26e1140f8a4" diff --git a/esy.lock/opam/ocamlfind.1.9.5/files/0001-Fix-bug-when-installing-with-a-system-compiler.patch b/esy.lock/opam/ocamlfind.1.9.5/files/0001-Fix-bug-when-installing-with-a-system-compiler.patch deleted file mode 100644 index c050899..0000000 --- a/esy.lock/opam/ocamlfind.1.9.5/files/0001-Fix-bug-when-installing-with-a-system-compiler.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f53247f546375972789b96c3f612cd7f524bf2aa Mon Sep 17 00:00:00 2001 -From: Louis Gesbert -Date: Mon, 11 Jul 2022 18:12:18 +0200 -Subject: [PATCH] Fix bug when installing with a system compiler - -See https://discuss.ocaml.org/t/problem-installing-ocamlfind-on-latest-ocamlpro-alpine-docker-image/10147 ---- - src/findlib/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/findlib/Makefile b/src/findlib/Makefile -index 84514b6f22..ea23f4a10c 100644 ---- a/src/findlib/Makefile -+++ b/src/findlib/Makefile -@@ -123,7 +123,7 @@ clean: - install: all - $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" - $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" -- $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" -+ test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" - test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLFILE) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/" - files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config \ - findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs \ --- -2.35.1 - diff --git a/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch b/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch new file mode 100644 index 0000000..8011238 --- /dev/null +++ b/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch @@ -0,0 +1,12 @@ +diff a/configure b/configure +--- a/configure ++++ b/configure +@@ -294,7 +294,7 @@ + # If findlib has been configured -sitelib $(ocamlc -where) then there's + # nothing to do, but otherwise we need to put OCaml's Standard Library + # into the path setting. +- if [ ! -e "${ocaml_sitelib}/stdlib/META" ]; then ++ if [ ! -e "${ocaml_sitelib}/stdlib.cmi" ]; then + ocamlpath="${ocaml_core_stdlib}${path_sep}${ocamlpath}" + fi + fi diff --git a/esy.lock/opam/ocamlfind.1.9.5/opam b/esy.lock/opam/ocamlfind.1.9.6/opam similarity index 70% rename from esy.lock/opam/ocamlfind.1.9.5/opam rename to esy.lock/opam/ocamlfind.1.9.6/opam index 73b6d69..a81f0c5 100644 --- a/esy.lock/opam/ocamlfind.1.9.5/opam +++ b/esy.lock/opam/ocamlfind.1.9.6/opam @@ -13,7 +13,7 @@ authors: "Gerd Stolpmann " homepage: "http://projects.camlcity.org/projects/findlib.html" bug-reports: "https://github.com/ocaml/ocamlfind/issues" depends: [ - "ocaml" {>= "4.00.0"} + "ocaml" {>= "3.08.0"} ] depopts: ["graphics"] build: [ @@ -34,14 +34,15 @@ install: [ [make "install"] ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} ] -extra-files: ["0001-Fix-bug-when-installing-with-a-system-compiler.patch" "md5=130d3d6fe399948ed7991b7756f50dc3"] -patches: ["0001-Fix-bug-when-installing-with-a-system-compiler.patch"] +extra-files: ["0001-Harden-test-for-OCaml-5.patch" "md5=3cddbf72164c29d4e50e077a92a37c6c"] +# See https://github.com/ocaml/ocamlfind/pull/61 +patches: ["0001-Harden-test-for-OCaml-5.patch"] dev-repo: "git+https://github.com/ocaml/ocamlfind.git" url { - src: "http://download.camlcity.org/download/findlib-1.9.5.tar.gz" + src: "http://download.camlcity.org/download/findlib-1.9.6.tar.gz" checksum: [ - "md5=8b893525ce36cb3d4d4952483bcc7cf4" - "sha512=03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715" + "md5=96c6ee50a32cca9ca277321262dbec57" + "sha512=cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027" ] } - +available: os != "win32" diff --git a/esy.lock/opam/ocamlformat-rpc-lib.0.24.1/opam b/esy.lock/opam/ocamlformat-rpc-lib.0.25.1/opam similarity index 73% rename from esy.lock/opam/ocamlformat-rpc-lib.0.24.1/opam rename to esy.lock/opam/ocamlformat-rpc-lib.0.25.1/opam index 063a147..e6e4ec1 100644 --- a/esy.lock/opam/ocamlformat-rpc-lib.0.24.1/opam +++ b/esy.lock/opam/ocamlformat-rpc-lib.0.25.1/opam @@ -30,10 +30,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git" url { src: - "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.24.1/ocamlformat-0.24.1.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.25.1/ocamlformat-0.25.1.tbz" checksum: [ - "sha256=023425e9818f80ea50537b2371a4a766c149a9957d05807e88a004d2d5f441ce" - "sha512=753b6128be68042895202f99959b360ce954db6f82b19b83b4bb346761a8e9cfdfc2b4b25e2070e60601b555562e78f9ebb02760ff127464e0b66cedbddca304" + "sha256=dc8f2a330ca3930b36cacb2623bb360ed8bdf6e4a8acd293dbd9e2241a6fd33d" + "sha512=b28f545425fb5375447c90022d065dc7fd51ed2f66d8c1f65a71a6ad2465d039a8686e8f18249e5ad3a2362fee6149c855ef30eb45fb9d06d743a53d26b3e26f" ] } -x-commit-hash: "86938aa4435b251af1a3b081f7fbed90f982cf62" +x-commit-hash: "651f767b48e14ba6b24db9421306942d9e51adcc" diff --git a/esy.lock/opam/ocamlformat.0.24.1/opam b/esy.lock/opam/ocamlformat.0.24.1/opam index 14b3980..f9ffdab 100644 --- a/esy.lock/opam/ocamlformat.0.24.1/opam +++ b/esy.lock/opam/ocamlformat.0.24.1/opam @@ -19,7 +19,7 @@ depends: [ "menhir" {>= "20201216"} "menhirLib" {>= "20201216"} "menhirSdk" {>= "20201216"} - "ocaml-version" {>= "3.3.0"} + "ocaml-version" {>= "3.3.0" & < "3.6.0"} "ocamlformat-rpc-lib" {with-test & = version} "ocp-indent" "odoc-parser" {>= "2.0.0" & < "3.0.0"} diff --git a/esy.lock/opam/ordering.3.6.0/opam b/esy.lock/opam/ordering.3.6.2/opam similarity index 66% rename from esy.lock/opam/ordering.3.6.0/opam rename to esy.lock/opam/ordering.3.6.2/opam index 415b82c..ea64f90 100644 --- a/esy.lock/opam/ordering.3.6.0/opam +++ b/esy.lock/opam/ordering.3.6.2/opam @@ -29,10 +29,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" + "sha512=d0dd69ada2f1583319a2d6f679b8d49998059117c3258805ee69ae3e71d47bfab7a9c646f19b5fc43a6ccdef934eb87de5bb81205fcd60968bed8bf1790cf0a3" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "c939c2b0f7a470cedd189988c61cd307a3cedace" diff --git a/esy.lock/opam/ppxlib.0.28.0/opam b/esy.lock/opam/ppxlib.0.29.1/opam similarity index 81% rename from esy.lock/opam/ppxlib.0.28.0/opam rename to esy.lock/opam/ppxlib.0.29.1/opam index 5b805a3..4170d25 100644 --- a/esy.lock/opam/ppxlib.0.28.0/opam +++ b/esy.lock/opam/ppxlib.0.29.1/opam @@ -54,10 +54,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git" url { src: - "https://github.com/ocaml-ppx/ppxlib/releases/download/0.28.0/ppxlib-0.28.0.tbz" + "https://github.com/ocaml-ppx/ppxlib/releases/download/0.29.1/ppxlib-0.29.1.tbz" checksum: [ - "sha256=d87ae5f9a081206308ca964809b50a66aeb8e83d254801e8b9675448b60cf377" - "sha512=03270d43e91485e63c7dc115a71933ffd8cb2910c273d605d2800fa69f523dcd4de1fbe31fd6c2f6979675c681343bcf4e35be06934565bf28edf4ea03f5da8e" + "sha256=c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79" + "sha512=edc468e9111cc26e31825e475fd72f55123a22fe86548e07e7d111796fecb8d60359b1b53c7eac383e5e2114cbae74dfd9c166f330e84cbeab4ddfd5797e322f" ] } -x-commit-hash: "e027461818a8580e860e59d90ccae28f25cd40d4" +x-commit-hash: "36fcba0408b78963a730e0be92abdbab00b0ea26" diff --git a/esy.lock/opam/sedlex.3.1/opam b/esy.lock/opam/sedlex.3.1/opam new file mode 100644 index 0000000..61433b2 --- /dev/null +++ b/esy.lock/opam/sedlex.3.1/opam @@ -0,0 +1,48 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "An OCaml lexer generator for Unicode" +description: """ +sedlex is a lexer generator for OCaml. It is similar to ocamllex, but supports +Unicode. Unlike ocamllex, sedlex allows lexer specifications within regular +OCaml source files. Lexing specific constructs are provided via a ppx syntax +extension.""" +maintainer: ["Alain Frisch "] +authors: [ + "Alain Frisch " + "https://github.com/ocaml-community/sedlex/graphs/contributors" +] +license: "MIT" +homepage: "https://github.com/ocaml-community/sedlex" +bug-reports: "https://github.com/ocaml-community/sedlex/issues" +depends: [ + "ocaml" {>= "4.14"} + "dune" {>= "2.8"} + "ppxlib" {>= "0.26.0"} + "gen" + "ppx_expect" {with-test} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/ocaml-community/sedlex.git" +doc: "https://ocaml-community.github.io/sedlex/index.html" +url { + src: + "https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.1.tar.gz" + checksum: [ + "md5=e9d423a4cb194af3f39cc38eeb033eeb" + "sha512=27c7954c03a9d78f252167708afe7d91648ad3d3aa529e00c73da75bac49c2cf552cc9d27d29f1d9a04b1e2b47b7c6de9e9850c53124ad9f311d0a8f54bb9cae" + ] +} diff --git a/esy.lock/opam/stdune.3.6.0/opam b/esy.lock/opam/stdune.3.6.2/opam similarity index 71% rename from esy.lock/opam/stdune.3.6.0/opam rename to esy.lock/opam/stdune.3.6.2/opam index 9d54747..446f26e 100644 --- a/esy.lock/opam/stdune.3.6.0/opam +++ b/esy.lock/opam/stdune.3.6.2/opam @@ -35,10 +35,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=b6d4ab848efb04aa2a325d0015d32ed4414ed7130ec7aa12f98158eff445cf3c" + "sha512=d0dd69ada2f1583319a2d6f679b8d49998059117c3258805ee69ae3e71d47bfab7a9c646f19b5fc43a6ccdef934eb87de5bb81205fcd60968bed8bf1790cf0a3" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "c939c2b0f7a470cedd189988c61cd307a3cedace" diff --git a/esy.lock/opam/topkg.1.0.6/opam b/esy.lock/opam/topkg.1.0.7/opam similarity index 89% rename from esy.lock/opam/topkg.1.0.6/opam rename to esy.lock/opam/topkg.1.0.7/opam index d8c8d66..83fc06f 100644 --- a/esy.lock/opam/topkg.1.0.6/opam +++ b/esy.lock/opam/topkg.1.0.7/opam @@ -41,7 +41,7 @@ depends: [ build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--dev-pkg" "%{dev}%"] dev-repo: "git+https://erratique.ch/repos/topkg.git" url { - src: "https://erratique.ch/software/topkg/releases/topkg-1.0.6.tbz" + src: "https://erratique.ch/software/topkg/releases/topkg-1.0.7.tbz" checksum: - "sha512=8e34391e2f499cec332b79454a4edb36a35db6fe22437f017fd5c80ae065160dc967ac02d894a94d08d62dd476521e63733f4cadc3b9b6b314b6aa5b2b4ede78" + "sha512=09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535" } \ No newline at end of file diff --git a/esy.lock/opam/xdg.3.6.0/opam b/esy.lock/opam/xdg.3.7.0/opam similarity index 68% rename from esy.lock/opam/xdg.3.6.0/opam rename to esy.lock/opam/xdg.3.7.0/opam index c9aab85..fe21970 100644 --- a/esy.lock/opam/xdg.3.6.0/opam +++ b/esy.lock/opam/xdg.3.7.0/opam @@ -30,10 +30,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.6.0/dune-3.6.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" checksum: [ - "sha256=08a0c6c9521604e60cf36afba036ecf1b107df51eed14a2fb7eef6cfdd2bf278" - "sha512=71b94cb7cad4c6f998da5bd59fe3c6d0b4a4188896ae04aa0ffff7142ced0b93bce3a88c3b5b7b7c8c948d10ccfb2fb81fcf764aa421b595e061ac3049fa8870" + "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" ] } -x-commit-hash: "c3b75bdfd3763b39aaac8baa5104312ac701d501" +x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/files/findlib.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/files/findlib.patch deleted file mode 100644 index 3aa5aa6..0000000 --- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/files/findlib.patch +++ /dev/null @@ -1,485 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -281,10 +281,8 @@ - - - let identify_dir d = -- if is_win then -- failwith "identify_dir"; (* not available *) - let s = Unix.stat d in -- (s.Unix.st_dev, s.Unix.st_ino) -+ (s.Unix.st_dev, s.Unix.st_ino) - ;; - - diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch new file mode 100644 index 0000000..d545632 --- /dev/null +++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch @@ -0,0 +1,11 @@ +--- ./Makefile ++++ ./Makefile +@@ -55,7 +55,7 @@ + export USE_CYGPATH; \ + cat findlib.conf.in | \ + $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' | \ +- $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' -p >findlib.conf ++ $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ + echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ + fi diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json similarity index 100% rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/package.json rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json diff --git a/libbinaryen.opam b/libbinaryen.opam index b1cc05d..bb6b178 100644 --- a/libbinaryen.opam +++ b/libbinaryen.opam @@ -15,7 +15,7 @@ depends: [ "conf-cmake" {build} "dune" {>= "3.0.0"} "dune-configurator" {>= "3.0.0"} - "js_of_ocaml-compiler" {with-test & >= "4.1.0" < "5.0.0"} + "js_of_ocaml-compiler" {with-test & >= "4.1.0" < "6.0.0"} "ocaml" {>= "4.12"} ] depexts: [ diff --git a/package.json b/package.json index bb7e537..c1a3af3 100644 --- a/package.json +++ b/package.json @@ -11,11 +11,12 @@ "@opam/dune-configurator": ">= 3.0.0" }, "devDependencies": { - "@opam/js_of_ocaml-compiler": ">= 4.1.0 < 5.0.0", + "@opam/js_of_ocaml-compiler": "*", "@opam/ocamlformat": "0.24.1", "@opam/ocaml-lsp-server": "> 1.9.1 < 1.13.0" }, "resolutions": { + "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839", "@opam/ocp-indent": "1.7.0" }, "esy": { From 4c3cb5f0fd594a439ad8ff8c89067f0ce17104bb Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 1 Apr 2023 15:17:07 -0700 Subject: [PATCH 2/5] add pin-depends --- libbinaryen.opam | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libbinaryen.opam b/libbinaryen.opam index bb6b178..9c423a5 100644 --- a/libbinaryen.opam +++ b/libbinaryen.opam @@ -21,3 +21,6 @@ depends: [ depexts: [ ["gcc-g++"] { os-distribution = "cygwinports" } ] +pin-depends: [ + ["js_of_ocaml-compiler.5.1.2" "git+https://github.com/ocsigen/js_of_ocaml#2b51785a55422f5edc67e687cc35065f662d8839"] +] From 77b93a5f090cbd86d0746d6bcf77a2078ee168c9 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Tue, 18 Apr 2023 17:14:32 -0700 Subject: [PATCH 3/5] update jsoo to ocsigen/js_of_ocaml#1449 --- esy.lock/index.json | 380 +++++++++--------- .../opam | 8 +- .../{cmdliner.1.1.1 => cmdliner.1.2.0}/opam | 4 +- .../opam | 8 +- .../opam | 8 +- esy.lock/opam/{dune.3.7.0 => dune.3.7.1}/opam | 10 +- .../{menhir.20220210 => menhir.20230415}/opam | 8 +- .../opam | 8 +- .../opam | 8 +- esy.lock/opam/{xdg.3.7.0 => xdg.3.7.1}/opam | 8 +- libbinaryen.opam | 2 +- package.json | 2 +- 12 files changed, 227 insertions(+), 227 deletions(-) rename esy.lock/opam/{chrome-trace.3.7.0 => chrome-trace.3.7.1}/opam (69%) rename esy.lock/opam/{cmdliner.1.1.1 => cmdliner.1.2.0}/opam (90%) rename esy.lock/opam/{dune-build-info.3.7.0 => dune-build-info.3.7.1}/opam (75%) rename esy.lock/opam/{dune-configurator.3.7.0 => dune-configurator.3.7.1}/opam (75%) rename esy.lock/opam/{dune.3.7.0 => dune.3.7.1}/opam (79%) rename esy.lock/opam/{menhir.20220210 => menhir.20230415}/opam (66%) rename esy.lock/opam/{menhirLib.20220210 => menhirLib.20230415}/opam (67%) rename esy.lock/opam/{menhirSdk.20220210 => menhirSdk.20230415}/opam (67%) rename esy.lock/opam/{xdg.3.7.0 => xdg.3.7.1}/opam (68%) diff --git a/esy.lock/index.json b/esy.lock/index.json index f8cd483..7877639 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "5e5890436da313bf572c15a89449d3df", + "checksum": "bd08202d5d56aaad45b7a5ce5d20c674", "root": "@grain/libbinaryen@link-dev:./package.json", "node": { "ocaml@4.14.0@d41d8cd9": { @@ -35,37 +35,37 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.7.0@95218dc4", "@opam/cppo@opam:1.6.9@db929a12", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.7.0@95218dc4" + "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/xdg@opam:3.7.0@449d6490": { - "id": "@opam/xdg@opam:3.7.0@449d6490", + "@opam/xdg@opam:3.7.1@387cb889": { + "id": "@opam/xdg@opam:3.7.1@387cb889", "name": "@opam/xdg", - "version": "opam:3.7.0", + "version": "opam:3.7.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", - "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "archive:https://opam.ocaml.org/cache/sha256/ad/adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3", + "archive:https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" ], "opam": { "name": "xdg", - "version": "3.7.0", - "path": "esy.lock/opam/xdg.3.7.0" + "version": "3.7.1", + "path": "esy.lock/opam/xdg.3.7.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/uutf@opam:1.0.3@47c95a18": { @@ -89,7 +89,7 @@ "ocaml@4.14.0@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", - "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] @@ -116,7 +116,7 @@ "@opam/uucp@opam:15.0.0@55460339", "@opam/topkg@opam:1.0.7@7ee47d76", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", - "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -145,7 +145,7 @@ "@opam/topkg@opam:1.0.7@7ee47d76", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2@c6163b28", - "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] @@ -196,7 +196,7 @@ "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", - "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -204,7 +204,7 @@ "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", - "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/base-unix@opam:base@87d0b2eb" ] @@ -227,11 +227,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/stdio@opam:v0.15.0@aeefdf96": { @@ -252,12 +252,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/base@opam:v0.15.1@e8a71f35" ] }, @@ -279,11 +279,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/sexplib0@opam:v0.15.1@51111c0c": { @@ -304,11 +304,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -349,12 +349,12 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/ppxlib@opam:0.29.1@8414c948", - "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.7.0@95218dc4", + "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/ppxlib@opam:0.29.1@8414c948", - "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.7.0@95218dc4" + "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/result@opam:1.5@1c6a6533": { @@ -375,11 +375,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/re@opam:1.10.4@c4910ba6": { @@ -401,11 +401,11 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.7.0@95218dc4" + "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/ppxlib@opam:0.29.1@8414c948": { @@ -430,14 +430,14 @@ "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.7.0@95218dc4" + "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/ppx_yojson_conv_lib@opam:v0.15.0@773058a7": { @@ -459,11 +459,11 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/dune@opam:3.7.0@95218dc4" + "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/ppx_derivers@opam:1.2.1@e2cbad12": { @@ -484,11 +484,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/pp@opam:1.1.2@89ad03b5": { @@ -509,11 +509,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/ordering@opam:3.6.2@37bc3093": { @@ -534,11 +534,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/omd@opam:1.3.2@511d53d2": { @@ -559,13 +559,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0" ] @@ -589,14 +589,14 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/camlp-streams@opam:5.0.1@daaa0f94", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/camlp-streams@opam:5.0.1@daaa0f94", "@opam/astring@opam:0.8.5@1300cee8" ] @@ -619,11 +619,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/ocp-indent@opam:1.7.0@2da3c6e5": { @@ -645,15 +645,15 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.7.0@95218dc4", - "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/dune@opam:3.7.1@40db2f22", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.7.0@95218dc4", - "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/dune@opam:3.7.1@40db2f22", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -675,11 +675,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, @@ -707,15 +707,15 @@ "@opam/odoc-parser@opam:2.0.0@a08011a0", "@opam/ocp-indent@opam:1.7.0@2da3c6e5", "@opam/ocaml-version@opam:3.5.0@6bef55f5", - "@opam/menhirSdk@opam:20220210@fe146ed3", - "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/menhir@opam:20220210@ff5ea9a7", + "@opam/menhirSdk@opam:20230415@2aa219cc", + "@opam/menhirLib@opam:20230415@78be630c", + "@opam/menhir@opam:20230415@ce1c9ac7", "@opam/fpath@opam:0.7.3@674d8125", "@opam/fix@opam:20220121@17b9a1a4", "@opam/either@opam:1.0.0@be5a1416", - "@opam/dune-build-info@opam:3.7.0@ce68449d", - "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", - "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/dune-build-info@opam:3.7.1@adf0d411", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -726,15 +726,15 @@ "@opam/odoc-parser@opam:2.0.0@a08011a0", "@opam/ocp-indent@opam:1.7.0@2da3c6e5", "@opam/ocaml-version@opam:3.5.0@6bef55f5", - "@opam/menhirSdk@opam:20220210@fe146ed3", - "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/menhir@opam:20220210@ff5ea9a7", + "@opam/menhirSdk@opam:20230415@2aa219cc", + "@opam/menhirLib@opam:20230415@78be630c", + "@opam/menhir@opam:20230415@ce1c9ac7", "@opam/fpath@opam:0.7.3@674d8125", "@opam/fix@opam:20220121@17b9a1a4", "@opam/either@opam:1.0.0@be5a1416", - "@opam/dune-build-info@opam:3.7.0@ce68449d", - "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", - "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/dune-build-info@opam:3.7.1@adf0d411", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/base@opam:v0.15.1@e8a71f35" ] }, @@ -810,11 +810,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770": { @@ -836,7 +836,7 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/xdg@opam:3.7.0@449d6490", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/xdg@opam:3.7.1@387cb889", "@opam/uutf@opam:1.0.3@47c95a18", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", "@opam/ppx_yojson_conv_lib@opam:v0.15.0@773058a7", @@ -846,14 +846,14 @@ "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e", "@opam/fiber@opam:3.6.2@349136be", "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune-rpc@opam:3.6.2@d874b9d2", - "@opam/dune-build-info@opam:3.7.0@ce68449d", - "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", - "@opam/chrome-trace@opam:3.7.0@6448e71e", + "@opam/dune-build-info@opam:3.7.1@adf0d411", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/chrome-trace@opam:3.7.1@92d3c503", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", - "@opam/xdg@opam:3.7.0@449d6490", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/xdg@opam:3.7.1@387cb889", "@opam/uutf@opam:1.0.3@47c95a18", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", "@opam/ppx_yojson_conv_lib@opam:v0.15.0@773058a7", @@ -863,9 +863,9 @@ "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e", "@opam/fiber@opam:3.6.2@349136be", "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune-rpc@opam:3.6.2@d874b9d2", - "@opam/dune-build-info@opam:3.7.0@ce68449d", - "@opam/dune@opam:3.7.0@95218dc4", "@opam/csexp@opam:1.5.1@8a8fb3a7", - "@opam/chrome-trace@opam:3.7.0@6448e71e" + "@opam/dune-build-info@opam:3.7.1@adf0d411", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/chrome-trace@opam:3.7.1@92d3c503" ] }, "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882": { @@ -886,101 +886,101 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/menhirSdk@opam:20220210@fe146ed3": { - "id": "@opam/menhirSdk@opam:20220210@fe146ed3", + "@opam/menhirSdk@opam:20230415@2aa219cc": { + "id": "@opam/menhirSdk@opam:20230415@2aa219cc", "name": "@opam/menhirSdk", - "version": "opam:20220210", + "version": "opam:20230415", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/e3/e3cef220f676c4b1c16cbccb174cefe3#md5:e3cef220f676c4b1c16cbccb174cefe3", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz#md5:e3cef220f676c4b1c16cbccb174cefe3" + "archive:https://opam.ocaml.org/cache/md5/7c/7c4b51e1b666711af04f7832ebc90618#md5:7c4b51e1b666711af04f7832ebc90618", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20230415/archive.tar.gz#md5:7c4b51e1b666711af04f7832ebc90618" ], "opam": { "name": "menhirSdk", - "version": "20220210", - "path": "esy.lock/opam/menhirSdk.20220210" + "version": "20230415", + "path": "esy.lock/opam/menhirSdk.20230415" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/menhirLib@opam:20220210@9afeb270": { - "id": "@opam/menhirLib@opam:20220210@9afeb270", + "@opam/menhirLib@opam:20230415@78be630c": { + "id": "@opam/menhirLib@opam:20230415@78be630c", "name": "@opam/menhirLib", - "version": "opam:20220210", + "version": "opam:20230415", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/e3/e3cef220f676c4b1c16cbccb174cefe3#md5:e3cef220f676c4b1c16cbccb174cefe3", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz#md5:e3cef220f676c4b1c16cbccb174cefe3" + "archive:https://opam.ocaml.org/cache/md5/7c/7c4b51e1b666711af04f7832ebc90618#md5:7c4b51e1b666711af04f7832ebc90618", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20230415/archive.tar.gz#md5:7c4b51e1b666711af04f7832ebc90618" ], "opam": { "name": "menhirLib", - "version": "20220210", - "path": "esy.lock/opam/menhirLib.20220210" + "version": "20230415", + "path": "esy.lock/opam/menhirLib.20230415" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/menhir@opam:20220210@ff5ea9a7": { - "id": "@opam/menhir@opam:20220210@ff5ea9a7", + "@opam/menhir@opam:20230415@ce1c9ac7": { + "id": "@opam/menhir@opam:20230415@ce1c9ac7", "name": "@opam/menhir", - "version": "opam:20220210", + "version": "opam:20230415", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/e3/e3cef220f676c4b1c16cbccb174cefe3#md5:e3cef220f676c4b1c16cbccb174cefe3", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz#md5:e3cef220f676c4b1c16cbccb174cefe3" + "archive:https://opam.ocaml.org/cache/md5/7c/7c4b51e1b666711af04f7832ebc90618#md5:7c4b51e1b666711af04f7832ebc90618", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20230415/archive.tar.gz#md5:7c4b51e1b666711af04f7832ebc90618" ], "opam": { "name": "menhir", - "version": "20220210", - "path": "esy.lock/opam/menhir.20220210" + "version": "20230415", + "path": "esy.lock/opam/menhir.20230415" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", - "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.0@d41d8cd9", "@opam/menhirSdk@opam:20230415@2aa219cc", + "@opam/menhirLib@opam:20230415@78be630c", + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", - "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/menhirSdk@opam:20230415@2aa219cc", + "@opam/menhirLib@opam:20230415@78be630c", + "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839@d41d8cd9": { + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf@d41d8cd9": { "id": - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839@d41d8cd9", + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf@d41d8cd9", "name": "@opam/js_of_ocaml-compiler", "version": - "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839", + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf", "source": { "type": "install", "source": [ - "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839" + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf" ] }, "overrides": [], @@ -989,22 +989,22 @@ "@opam/sedlex@opam:3.1@d4f1d2e2", "@opam/ppxlib@opam:0.29.1@8414c948", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/menhirSdk@opam:20220210@fe146ed3", - "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/menhir@opam:20220210@ff5ea9a7", - "@opam/dune@opam:3.7.0@95218dc4", - "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/menhirSdk@opam:20230415@2aa219cc", + "@opam/menhirLib@opam:20230415@78be630c", + "@opam/menhir@opam:20230415@ce1c9ac7", + "@opam/dune@opam:3.7.1@40db2f22", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", "@opam/sedlex@opam:3.1@d4f1d2e2", "@opam/ppxlib@opam:0.29.1@8414c948", - "@opam/menhirSdk@opam:20220210@fe146ed3", - "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/menhir@opam:20220210@ff5ea9a7", - "@opam/dune@opam:3.7.0@95218dc4", - "@opam/cmdliner@opam:1.1.1@03763729" + "@opam/menhirSdk@opam:20230415@2aa219cc", + "@opam/menhirLib@opam:20230415@78be630c", + "@opam/menhir@opam:20230415@ce1c9ac7", + "@opam/dune@opam:3.7.1@40db2f22", + "@opam/cmdliner@opam:1.2.0@b0c6143c" ] }, "@opam/gen@opam:1.1@059b2731": { @@ -1026,11 +1026,11 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.7.0@95218dc4" + "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/fpath@opam:0.7.3@674d8125": { @@ -1079,11 +1079,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/fiber@opam:3.6.2@349136be": { @@ -1105,12 +1105,12 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/stdune@opam:3.6.2@47d75c4b", - "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/stdune@opam:3.6.2@47d75c4b", - "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4" + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/either@opam:1.0.0@be5a1416": { @@ -1131,9 +1131,9 @@ }, "overrides": [], "dependencies": [ - "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:3.7.0@95218dc4" ] + "devDependencies": [ "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/dyn@opam:3.6.2@38120dfc": { "id": "@opam/dyn@opam:3.6.2@38120dfc", @@ -1155,12 +1155,12 @@ "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", - "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", - "@opam/dune@opam:3.7.0@95218dc4" + "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/dune-rpc@opam:3.6.2@d874b9d2": { @@ -1181,86 +1181,86 @@ }, "overrides": [], "dependencies": [ - "@opam/xdg@opam:3.7.0@449d6490", "@opam/stdune@opam:3.6.2@47d75c4b", + "@opam/xdg@opam:3.7.1@387cb889", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", - "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/xdg@opam:3.7.0@449d6490", "@opam/stdune@opam:3.6.2@47d75c4b", + "@opam/xdg@opam:3.7.1@387cb889", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", - "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, - "@opam/dune-configurator@opam:3.7.0@4fa6f76e": { - "id": "@opam/dune-configurator@opam:3.7.0@4fa6f76e", + "@opam/dune-configurator@opam:3.7.1@32ab7c21": { + "id": "@opam/dune-configurator@opam:3.7.1@32ab7c21", "name": "@opam/dune-configurator", - "version": "opam:3.7.0", + "version": "opam:3.7.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", - "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "archive:https://opam.ocaml.org/cache/sha256/ad/adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3", + "archive:https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" ], "opam": { "name": "dune-configurator", - "version": "3.7.0", - "path": "esy.lock/opam/dune-configurator.3.7.0" + "version": "3.7.1", + "path": "esy.lock/opam/dune-configurator.3.7.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/dune-build-info@opam:3.7.0@ce68449d": { - "id": "@opam/dune-build-info@opam:3.7.0@ce68449d", + "@opam/dune-build-info@opam:3.7.1@adf0d411": { + "id": "@opam/dune-build-info@opam:3.7.1@adf0d411", "name": "@opam/dune-build-info", - "version": "opam:3.7.0", + "version": "opam:3.7.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", - "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "archive:https://opam.ocaml.org/cache/sha256/ad/adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3", + "archive:https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" ], "opam": { "name": "dune-build-info", - "version": "3.7.0", - "path": "esy.lock/opam/dune-build-info.3.7.0" + "version": "3.7.1", + "path": "esy.lock/opam/dune-build-info.3.7.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/dune@opam:3.7.0@95218dc4": { - "id": "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dune@opam:3.7.1@40db2f22": { + "id": "@opam/dune@opam:3.7.1@40db2f22", "name": "@opam/dune", - "version": "opam:3.7.0", + "version": "opam:3.7.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", - "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "archive:https://opam.ocaml.org/cache/sha256/ad/adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3", + "archive:https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" ], "opam": { "name": "dune", - "version": "3.7.0", - "path": "esy.lock/opam/dune.3.7.0" + "version": "3.7.1", + "path": "esy.lock/opam/dune.3.7.1" } }, "overrides": [], @@ -1292,11 +1292,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/cppo@opam:1.6.9@db929a12": { @@ -1317,12 +1317,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -1342,20 +1342,20 @@ "dependencies": [], "devDependencies": [] }, - "@opam/cmdliner@opam:1.1.1@03763729": { - "id": "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/cmdliner@opam:1.2.0@b0c6143c": { + "id": "@opam/cmdliner@opam:1.2.0@b0c6143c", "name": "@opam/cmdliner", - "version": "opam:1.1.1", + "version": "opam:1.2.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/54/5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e#sha512:5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e", - "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-1.1.1.tbz#sha512:5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e" + "archive:https://opam.ocaml.org/cache/sha512/6f/6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b#sha512:6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b", + "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-1.2.0.tbz#sha512:6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b" ], "opam": { "name": "cmdliner", - "version": "1.1.1", - "path": "esy.lock/opam/cmdliner.1.1.1" + "version": "1.2.0", + "path": "esy.lock/opam/cmdliner.1.2.0" } }, "overrides": [], @@ -1364,29 +1364,29 @@ ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, - "@opam/chrome-trace@opam:3.7.0@6448e71e": { - "id": "@opam/chrome-trace@opam:3.7.0@6448e71e", + "@opam/chrome-trace@opam:3.7.1@92d3c503": { + "id": "@opam/chrome-trace@opam:3.7.1@92d3c503", "name": "@opam/chrome-trace", - "version": "opam:3.7.0", + "version": "opam:3.7.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", - "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "archive:https://opam.ocaml.org/cache/sha256/ad/adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3", + "archive:https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz#sha256:adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" ], "opam": { "name": "chrome-trace", - "version": "3.7.0", - "path": "esy.lock/opam/chrome-trace.3.7.0" + "version": "3.7.1", + "path": "esy.lock/opam/chrome-trace.3.7.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/camlp-streams@opam:5.0.1@daaa0f94": { @@ -1407,11 +1407,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -1506,13 +1506,13 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune-configurator@opam:3.7.0@4fa6f76e", - "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-configurator@opam:3.7.1@32ab7c21", + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune-configurator@opam:3.7.0@4fa6f76e", - "@opam/dune@opam:3.7.0@95218dc4" + "@opam/dune-configurator@opam:3.7.1@32ab7c21", + "@opam/dune@opam:3.7.1@40db2f22" ] }, "@opam/astring@opam:0.8.5@1300cee8": { @@ -1552,14 +1552,14 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", - "@opam/dune-configurator@opam:3.7.0@4fa6f76e", - "@opam/dune@opam:3.7.0@95218dc4", + "@opam/dune-configurator@opam:3.7.1@32ab7c21", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/conf-cmake@github:grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869@d41d8cd9" ], "devDependencies": [ "@opam/ocamlformat@opam:0.24.1@9aca58ad", "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839@d41d8cd9" + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf@d41d8cd9" ], "installConfig": { "pnp": false } }, diff --git a/esy.lock/opam/chrome-trace.3.7.0/opam b/esy.lock/opam/chrome-trace.3.7.1/opam similarity index 69% rename from esy.lock/opam/chrome-trace.3.7.0/opam rename to esy.lock/opam/chrome-trace.3.7.1/opam index 46cf1c7..74649f9 100644 --- a/esy.lock/opam/chrome-trace.3.7.0/opam +++ b/esy.lock/opam/chrome-trace.3.7.1/opam @@ -30,10 +30,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz" checksum: [ - "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" - "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" + "sha256=adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" + "sha512=a74cd77ac7714f9434b5991c6dc02c6e6a2f46071d993a8985a9c9f0105182bb9e310ae2bcf7cf1d411c848d1a665e0fc0111b3597e5b1c6b634c1d398bea432" ] } -x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" +x-commit-hash: "e2b2d6aa984e3a5ddffa5ea00dd4f042dbf529a1" diff --git a/esy.lock/opam/cmdliner.1.1.1/opam b/esy.lock/opam/cmdliner.1.2.0/opam similarity index 90% rename from esy.lock/opam/cmdliner.1.1.1/opam rename to esy.lock/opam/cmdliner.1.2.0/opam index 702b586..b29bd29 100644 --- a/esy.lock/opam/cmdliner.1.1.1/opam +++ b/esy.lock/opam/cmdliner.1.2.0/opam @@ -33,7 +33,7 @@ install: [ ] dev-repo: "git+https://erratique.ch/repos/cmdliner.git" url { - src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.1.1.tbz" + src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.2.0.tbz" checksum: - "sha512=5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e" + "sha512=6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b" } \ No newline at end of file diff --git a/esy.lock/opam/dune-build-info.3.7.0/opam b/esy.lock/opam/dune-build-info.3.7.1/opam similarity index 75% rename from esy.lock/opam/dune-build-info.3.7.0/opam rename to esy.lock/opam/dune-build-info.3.7.1/opam index 059e6e1..45de352 100644 --- a/esy.lock/opam/dune-build-info.3.7.0/opam +++ b/esy.lock/opam/dune-build-info.3.7.1/opam @@ -36,10 +36,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz" checksum: [ - "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" - "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" + "sha256=adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" + "sha512=a74cd77ac7714f9434b5991c6dc02c6e6a2f46071d993a8985a9c9f0105182bb9e310ae2bcf7cf1d411c848d1a665e0fc0111b3597e5b1c6b634c1d398bea432" ] } -x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" +x-commit-hash: "e2b2d6aa984e3a5ddffa5ea00dd4f042dbf529a1" diff --git a/esy.lock/opam/dune-configurator.3.7.0/opam b/esy.lock/opam/dune-configurator.3.7.1/opam similarity index 75% rename from esy.lock/opam/dune-configurator.3.7.0/opam rename to esy.lock/opam/dune-configurator.3.7.1/opam index c5555e8..be511df 100644 --- a/esy.lock/opam/dune-configurator.3.7.0/opam +++ b/esy.lock/opam/dune-configurator.3.7.1/opam @@ -40,10 +40,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz" checksum: [ - "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" - "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" + "sha256=adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" + "sha512=a74cd77ac7714f9434b5991c6dc02c6e6a2f46071d993a8985a9c9f0105182bb9e310ae2bcf7cf1d411c848d1a665e0fc0111b3597e5b1c6b634c1d398bea432" ] } -x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" +x-commit-hash: "e2b2d6aa984e3a5ddffa5ea00dd4f042dbf529a1" diff --git a/esy.lock/opam/dune.3.7.0/opam b/esy.lock/opam/dune.3.7.1/opam similarity index 79% rename from esy.lock/opam/dune.3.7.0/opam rename to esy.lock/opam/dune.3.7.1/opam index c9207f2..4a73962 100644 --- a/esy.lock/opam/dune.3.7.0/opam +++ b/esy.lock/opam/dune.3.7.1/opam @@ -42,15 +42,15 @@ build: [ depends: [ # Please keep the lower bound in sync with .github/workflows/workflow.yml, # dune-project and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) + ("ocaml" {>= "4.08"} | ("ocaml" {>= "4.02" & < "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz" checksum: [ - "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" - "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" + "sha256=adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" + "sha512=a74cd77ac7714f9434b5991c6dc02c6e6a2f46071d993a8985a9c9f0105182bb9e310ae2bcf7cf1d411c848d1a665e0fc0111b3597e5b1c6b634c1d398bea432" ] } -x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" +x-commit-hash: "e2b2d6aa984e3a5ddffa5ea00dd4f042dbf529a1" diff --git a/esy.lock/opam/menhir.20220210/opam b/esy.lock/opam/menhir.20230415/opam similarity index 66% rename from esy.lock/opam/menhir.20220210/opam rename to esy.lock/opam/menhir.20230415/opam index 498658b..d61711f 100644 --- a/esy.lock/opam/menhir.20220210/opam +++ b/esy.lock/opam/menhir.20230415/opam @@ -8,7 +8,7 @@ authors: [ homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues" -license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" +license: "GPL-2.0-only" build: [ ["dune" "build" "-p" name "-j" jobs] ] @@ -21,9 +21,9 @@ depends: [ synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20230415/archive.tar.gz" checksum: [ - "md5=e3cef220f676c4b1c16cbccb174cefe3" - "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" + "md5=7c4b51e1b666711af04f7832ebc90618" + "sha512=aa8a34c173d9a82d3503919de8377f1b8c9ff721882486f0b5ae2bdb9b22ee7f5ba8f6ef25e00fbb35704fac9fc3bda71908512ed4cbd345d9dc29d6ede149b2" ] } diff --git a/esy.lock/opam/menhirLib.20220210/opam b/esy.lock/opam/menhirLib.20230415/opam similarity index 67% rename from esy.lock/opam/menhirLib.20220210/opam rename to esy.lock/opam/menhirLib.20230415/opam index d2097ae..6673506 100644 --- a/esy.lock/opam/menhirLib.20220210/opam +++ b/esy.lock/opam/menhirLib.20230415/opam @@ -8,7 +8,7 @@ authors: [ homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues" -license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" +license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" build: [ ["dune" "build" "-p" name "-j" jobs] ] @@ -22,9 +22,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20230415/archive.tar.gz" checksum: [ - "md5=e3cef220f676c4b1c16cbccb174cefe3" - "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" + "md5=7c4b51e1b666711af04f7832ebc90618" + "sha512=aa8a34c173d9a82d3503919de8377f1b8c9ff721882486f0b5ae2bdb9b22ee7f5ba8f6ef25e00fbb35704fac9fc3bda71908512ed4cbd345d9dc29d6ede149b2" ] } diff --git a/esy.lock/opam/menhirSdk.20220210/opam b/esy.lock/opam/menhirSdk.20230415/opam similarity index 67% rename from esy.lock/opam/menhirSdk.20220210/opam rename to esy.lock/opam/menhirSdk.20230415/opam index 585d2ca..57f8ea8 100644 --- a/esy.lock/opam/menhirSdk.20220210/opam +++ b/esy.lock/opam/menhirSdk.20230415/opam @@ -8,7 +8,7 @@ authors: [ homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues" -license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" +license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" build: [ ["dune" "build" "-p" name "-j" jobs] ] @@ -22,9 +22,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20230415/archive.tar.gz" checksum: [ - "md5=e3cef220f676c4b1c16cbccb174cefe3" - "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" + "md5=7c4b51e1b666711af04f7832ebc90618" + "sha512=aa8a34c173d9a82d3503919de8377f1b8c9ff721882486f0b5ae2bdb9b22ee7f5ba8f6ef25e00fbb35704fac9fc3bda71908512ed4cbd345d9dc29d6ede149b2" ] } diff --git a/esy.lock/opam/xdg.3.7.0/opam b/esy.lock/opam/xdg.3.7.1/opam similarity index 68% rename from esy.lock/opam/xdg.3.7.0/opam rename to esy.lock/opam/xdg.3.7.1/opam index fe21970..1877839 100644 --- a/esy.lock/opam/xdg.3.7.0/opam +++ b/esy.lock/opam/xdg.3.7.1/opam @@ -30,10 +30,10 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/3.7.1/dune-3.7.1.tbz" checksum: [ - "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" - "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" + "sha256=adfc38f14c0188a2ad80d61451d011d27ab8839b717492d7ad42f7cb911c54c3" + "sha512=a74cd77ac7714f9434b5991c6dc02c6e6a2f46071d993a8985a9c9f0105182bb9e310ae2bcf7cf1d411c848d1a665e0fc0111b3597e5b1c6b634c1d398bea432" ] } -x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" +x-commit-hash: "e2b2d6aa984e3a5ddffa5ea00dd4f042dbf529a1" diff --git a/libbinaryen.opam b/libbinaryen.opam index 9c423a5..dc22ca4 100644 --- a/libbinaryen.opam +++ b/libbinaryen.opam @@ -22,5 +22,5 @@ depexts: [ ["gcc-g++"] { os-distribution = "cygwinports" } ] pin-depends: [ - ["js_of_ocaml-compiler.5.1.2" "git+https://github.com/ocsigen/js_of_ocaml#2b51785a55422f5edc67e687cc35065f662d8839"] + ["js_of_ocaml-compiler.5.1.2" "git+https://github.com/ocsigen/js_of_ocaml#880e44f8971d66de9a67f90944a7a27443cbf9bf"] ] diff --git a/package.json b/package.json index c1a3af3..8f232dc 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@opam/ocaml-lsp-server": "> 1.9.1 < 1.13.0" }, "resolutions": { - "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#2b51785a55422f5edc67e687cc35065f662d8839", + "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf", "@opam/ocp-indent": "1.7.0" }, "esy": { From 930994466b4be69d50796ff24ed7a0e65682e928 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 6 May 2023 16:08:49 -0700 Subject: [PATCH 4/5] remove pins --- esy.lock/index.json | 98 ++++++++++--------- .../opam/{csexp.1.5.1 => csexp.1.5.2}/opam | 16 ++- esy.lock/opam/js_of_ocaml-compiler.5.2.0/opam | 55 +++++++++++ esy.lock/opam/ppxlib.0.29.1/opam | 2 +- .../opam/{yojson.2.0.2 => yojson.2.1.0}/opam | 56 ++++++----- libbinaryen.opam | 3 - package.json | 1 - 7 files changed, 147 insertions(+), 84 deletions(-) rename esy.lock/opam/{csexp.1.5.1 => csexp.1.5.2}/opam (70%) create mode 100644 esy.lock/opam/js_of_ocaml-compiler.5.2.0/opam rename esy.lock/opam/{yojson.2.0.2 => yojson.2.1.0}/opam (57%) diff --git a/esy.lock/index.json b/esy.lock/index.json index 7877639..b6815b0 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "bd08202d5d56aaad45b7a5ce5d20c674", + "checksum": "7dbb44cd21308f027783f0b6e6520281", "root": "@grain/libbinaryen@link-dev:./package.json", "node": { "ocaml@4.14.0@d41d8cd9": { @@ -16,20 +16,20 @@ "dependencies": [], "devDependencies": [] }, - "@opam/yojson@opam:2.0.2@eb65f292": { - "id": "@opam/yojson@opam:2.0.2@eb65f292", + "@opam/yojson@opam:2.1.0@157478b0": { + "id": "@opam/yojson@opam:2.1.0@157478b0", "name": "@opam/yojson", - "version": "opam:2.0.2", + "version": "opam:2.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/87/876bb6f38af73a84a29438a3da35e4857c60a14556a606525b148c6fdbe5461b#sha256:876bb6f38af73a84a29438a3da35e4857c60a14556a606525b148c6fdbe5461b", - "archive:https://github.com/ocaml-community/yojson/releases/download/2.0.2/yojson-2.0.2.tbz#sha256:876bb6f38af73a84a29438a3da35e4857c60a14556a606525b148c6fdbe5461b" + "archive:https://opam.ocaml.org/cache/sha256/9f/9fcb1ff2db58ab259f9228796b0ada4794eae97177b1833371380c4e4f90b15d#sha256:9fcb1ff2db58ab259f9228796b0ada4794eae97177b1833371380c4e4f90b15d", + "archive:https://github.com/ocaml-community/yojson/releases/download/2.1.0/yojson-2.1.0.tbz#sha256:9fcb1ff2db58ab259f9228796b0ada4794eae97177b1833371380c4e4f90b15d" ], "opam": { "name": "yojson", - "version": "2.0.2", - "path": "esy.lock/opam/yojson.2.0.2" + "version": "2.1.0", + "path": "esy.lock/opam/yojson.2.1.0" } }, "overrides": [], @@ -197,7 +197,7 @@ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", - "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -205,7 +205,7 @@ "ocaml@4.14.0@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", - "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -348,12 +348,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/ppxlib@opam:0.29.1@8414c948", + "ocaml@4.14.0@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/ppxlib@opam:0.29.1@8414c948", + "ocaml@4.14.0@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.7.1@40db2f22" ] }, @@ -408,8 +408,8 @@ "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/ppxlib@opam:0.29.1@8414c948": { - "id": "@opam/ppxlib@opam:0.29.1@8414c948", + "@opam/ppxlib@opam:0.29.1@a8bb9506": { + "id": "@opam/ppxlib@opam:0.29.1@a8bb9506", "name": "@opam/ppxlib", "version": "opam:0.29.1", "source": { @@ -458,11 +458,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", + "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", + "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", "@opam/dune@opam:3.7.1@40db2f22" ] }, @@ -676,11 +676,11 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", - "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", - "@opam/csexp@opam:1.5.1@8a8fb3a7" + "@opam/csexp@opam:1.5.2@46614bf4" ] }, "@opam/ocamlformat@opam:0.24.1@9aca58ad": { @@ -714,7 +714,7 @@ "@opam/fix@opam:20220121@17b9a1a4", "@opam/either@opam:1.0.0@be5a1416", "@opam/dune-build-info@opam:3.7.1@adf0d411", - "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -733,7 +733,7 @@ "@opam/fix@opam:20220121@17b9a1a4", "@opam/either@opam:1.0.0@be5a1416", "@opam/dune-build-info@opam:3.7.1@adf0d411", - "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/base@opam:v0.15.1@e8a71f35" ] @@ -835,7 +835,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", + "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", "@opam/xdg@opam:3.7.1@387cb889", "@opam/uutf@opam:1.0.3@47c95a18", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", @@ -847,12 +847,12 @@ "@opam/fiber@opam:3.6.2@349136be", "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune-rpc@opam:3.6.2@d874b9d2", "@opam/dune-build-info@opam:3.7.1@adf0d411", - "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/chrome-trace@opam:3.7.1@92d3c503", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", + "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", "@opam/xdg@opam:3.7.1@387cb889", "@opam/uutf@opam:1.0.3@47c95a18", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", @@ -864,7 +864,7 @@ "@opam/fiber@opam:3.6.2@349136be", "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune-rpc@opam:3.6.2@d874b9d2", "@opam/dune-build-info@opam:3.7.1@adf0d411", - "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/dune@opam:3.7.1@40db2f22", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/chrome-trace@opam:3.7.1@92d3c503" ] }, @@ -971,23 +971,27 @@ "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf@d41d8cd9": { - "id": - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf@d41d8cd9", + "@opam/js_of_ocaml-compiler@opam:5.2.0@5bbea5b0": { + "id": "@opam/js_of_ocaml-compiler@opam:5.2.0@5bbea5b0", "name": "@opam/js_of_ocaml-compiler", - "version": - "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf", + "version": "opam:5.2.0", "source": { "type": "install", "source": [ - "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf" - ] + "archive:https://opam.ocaml.org/cache/sha256/65/650ab0a4ffa6a505716b73adb293428fa7bfd6a0293349bf186123338a7fceb5#sha256:650ab0a4ffa6a505716b73adb293428fa7bfd6a0293349bf186123338a7fceb5", + "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/5.2.0/js_of_ocaml-5.2.0.tbz#sha256:650ab0a4ffa6a505716b73adb293428fa7bfd6a0293349bf186123338a7fceb5" + ], + "opam": { + "name": "js_of_ocaml-compiler", + "version": "5.2.0", + "path": "esy.lock/opam/js_of_ocaml-compiler.5.2.0" + } }, "overrides": [], "dependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", + "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", "@opam/sedlex@opam:3.1@d4f1d2e2", - "@opam/ppxlib@opam:0.29.1@8414c948", + "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/menhirSdk@opam:20230415@2aa219cc", "@opam/menhirLib@opam:20230415@78be630c", @@ -997,9 +1001,9 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.0.2@eb65f292", + "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", "@opam/sedlex@opam:3.1@d4f1d2e2", - "@opam/ppxlib@opam:0.29.1@8414c948", + "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/menhirSdk@opam:20230415@2aa219cc", "@opam/menhirLib@opam:20230415@78be630c", "@opam/menhir@opam:20230415@ce1c9ac7", @@ -1184,13 +1188,13 @@ "@opam/xdg@opam:3.7.1@387cb889", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", - "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/xdg@opam:3.7.1@387cb889", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", "@opam/dyn@opam:3.6.2@38120dfc", "@opam/dune@opam:3.7.1@40db2f22", - "@opam/csexp@opam:1.5.1@8a8fb3a7" + "@opam/csexp@opam:1.5.2@46614bf4" ] }, "@opam/dune-configurator@opam:3.7.1@32ab7c21": { @@ -1212,13 +1216,13 @@ "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", - "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", - "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -1274,20 +1278,20 @@ "@opam/base-threads@opam:base@36803084" ] }, - "@opam/csexp@opam:1.5.1@8a8fb3a7": { - "id": "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/csexp@opam:1.5.2@46614bf4": { + "id": "@opam/csexp@opam:1.5.2@46614bf4", "name": "@opam/csexp", - "version": "opam:1.5.1", + "version": "opam:1.5.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d6/d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02#sha256:d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02", - "archive:https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz#sha256:d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02" + "archive:https://opam.ocaml.org/cache/sha256/1a/1a14dd04bb4379a41990248550628c77913a9c07f3c35c1370b6960e697787ff#sha256:1a14dd04bb4379a41990248550628c77913a9c07f3c35c1370b6960e697787ff", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.5.2/csexp-1.5.2.tbz#sha256:1a14dd04bb4379a41990248550628c77913a9c07f3c35c1370b6960e697787ff" ], "opam": { "name": "csexp", - "version": "1.5.1", - "path": "esy.lock/opam/csexp.1.5.1" + "version": "1.5.2", + "path": "esy.lock/opam/csexp.1.5.2" } }, "overrides": [], @@ -1559,7 +1563,7 @@ "devDependencies": [ "@opam/ocamlformat@opam:0.24.1@9aca58ad", "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf@d41d8cd9" + "@opam/js_of_ocaml-compiler@opam:5.2.0@5bbea5b0" ], "installConfig": { "pnp": false } }, diff --git a/esy.lock/opam/csexp.1.5.1/opam b/esy.lock/opam/csexp.1.5.2/opam similarity index 70% rename from esy.lock/opam/csexp.1.5.1/opam rename to esy.lock/opam/csexp.1.5.2/opam index 59324f9..7d511ab 100644 --- a/esy.lock/opam/csexp.1.5.1/opam +++ b/esy.lock/opam/csexp.1.5.2/opam @@ -20,7 +20,7 @@ module of this library is parameterised by the type of S-expressions. maintainer: ["Jeremie Dimino "] authors: [ "Quentin Hocquet " - "Jane Street Group, LLC" + "Jane Street Group, LLC " "Jeremie Dimino " ] license: "MIT" @@ -28,9 +28,8 @@ homepage: "https://github.com/ocaml-dune/csexp" doc: "https://ocaml-dune.github.io/csexp/" bug-reports: "https://github.com/ocaml-dune/csexp/issues" depends: [ - "dune" {>= "1.11"} + "dune" {>= "3.4"} "ocaml" {>= "4.03.0"} -# "ppx_expect" {with-test & >= "v0.14"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml-dune/csexp.git" @@ -44,17 +43,16 @@ build: [ "-j" jobs "@install" -# Tests disabled because of a cyclic dependency with csexp, dune-configurator and ppx_expect -# "@runtest" {with-test} +# "@runtest" {with-test & ocaml:version >= "4.04"} "@doc" {with-doc} ] ] -x-commit-hash: "7eeb86206819d2b1782d6cde1be9d6cf8b5fc851" url { src: - "https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz" + "https://github.com/ocaml-dune/csexp/releases/download/1.5.2/csexp-1.5.2.tbz" checksum: [ - "sha256=d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02" - "sha512=d785bbabaff9f6bf601399149ef0a42e5e99647b54e27f97ef1625907793dda22a45bf83e0e8a1eba2c63634c5484b54739ff0904ef556f5fc592efa38af7505" + "sha256=1a14dd04bb4379a41990248550628c77913a9c07f3c35c1370b6960e697787ff" + "sha512=be281018bcfc20d4db14894ef51c4b836d6338d2fdfe22e63d46f405f8dea7349e16f1c0ecd65f73d4c85a2a80e618cdbb8c9dafcbb9f229f04f1adca5b1973c" ] } +x-commit-hash: "e6c4768e10c61bcb04d09748744dad55602149c6" diff --git a/esy.lock/opam/js_of_ocaml-compiler.5.2.0/opam b/esy.lock/opam/js_of_ocaml-compiler.5.2.0/opam new file mode 100644 index 0000000..fcf2869 --- /dev/null +++ b/esy.lock/opam/js_of_ocaml-compiler.5.2.0/opam @@ -0,0 +1,55 @@ +opam-version: "2.0" +synopsis: "Compiler from OCaml bytecode to JavaScript" +description: + "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js" +maintainer: ["Ocsigen team "] +authors: ["Ocsigen team "] +license: [ + "GPL-2.0-or-later" "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +] +homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" +doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" +bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues" +depends: [ + "dune" {>= "3.7"} + "ocaml" {>= "4.08" & < "5.1"} + "num" {with-test} + "ppx_expect" {>= "v0.14.2" & with-test} + "ppxlib" {>= "0.15.0"} + "re" {with-test} + "cmdliner" {>= "1.1.0"} + "sedlex" {>= "2.3"} + "menhir" + "menhirLib" + "menhirSdk" + "yojson" + "odoc" {with-doc} +] +depopts: ["ocamlfind"] +conflicts: [ + "ocamlfind" {< "1.5.1"} + "js_of_ocaml" {< "3.0"} +] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: + "https://github.com/ocsigen/js_of_ocaml/releases/download/5.2.0/js_of_ocaml-5.2.0.tbz" + checksum: [ + "sha256=650ab0a4ffa6a505716b73adb293428fa7bfd6a0293349bf186123338a7fceb5" + "sha512=f1b12ed23ffd653fc1199f208d7ba61ea3d15c81baecf5d195893ae3422dd09670d077467c2e6d910b400b96000ed6261d5ee820acc0ed1b316715fd1da0b323" + ] +} +x-commit-hash: "3b3f66ba0f2755ff96c5f0a5ae41d2fb2fb1f8ea" diff --git a/esy.lock/opam/ppxlib.0.29.1/opam b/esy.lock/opam/ppxlib.0.29.1/opam index 4170d25..0a04c32 100644 --- a/esy.lock/opam/ppxlib.0.29.1/opam +++ b/esy.lock/opam/ppxlib.0.29.1/opam @@ -29,7 +29,7 @@ depends: [ "ocamlfind" {with-test} "re" {with-test & >= "1.9.0"} "cinaps" {with-test & >= "v0.12.1"} - "base" {with-test} + "base" {with-test & < "v0.16.0" } "stdio" {with-test} "odoc" {with-doc} ] diff --git a/esy.lock/opam/yojson.2.0.2/opam b/esy.lock/opam/yojson.2.1.0/opam similarity index 57% rename from esy.lock/opam/yojson.2.0.2/opam rename to esy.lock/opam/yojson.2.1.0/opam index 3b22e38..4e90c15 100644 --- a/esy.lock/opam/yojson.2.0.2/opam +++ b/esy.lock/opam/yojson.2.1.0/opam @@ -1,38 +1,48 @@ opam-version: "2.0" -maintainer: ["nathan@cryptosense.com" "marek@xivilization.net"] +synopsis: + "Yojson is an optimized parsing and printing library for the JSON format" +description: """ +Yojson is an optimized parsing and printing library for the JSON format. + +ydump is a pretty-printing command-line program provided with the +yojson package.""" +maintainer: [ + "paul-elliot@tarides.com" "nathan@tarides.com" "marek@tarides.com" +] authors: ["Martin Jambon"] +license: "BSD-3-Clause" homepage: "https://github.com/ocaml-community/yojson" +doc: "https://ocaml-community.github.io/yojson" bug-reports: "https://github.com/ocaml-community/yojson/issues" -dev-repo: "git+https://github.com/ocaml-community/yojson.git" -doc: "https://ocaml-community.github.io/yojson/" -license: "BSD-3-Clause" -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} - ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} -] depends: [ + "dune" {>= "2.7"} "ocaml" {>= "4.02.3"} - "dune" {>= "2.0"} "cppo" {build} "alcotest" {with-test & >= "0.8.5"} - "odoc" {with-doc} "seq" {>= "0.2.2"} + "odoc" {with-doc} ] -synopsis: - "Yojson is an optimized parsing and printing library for the JSON format" -description: """ -Yojson is an optimized parsing and printing library for the JSON format. - -ydump is a pretty-printing command-line program provided with the -yojson package.""" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/ocaml-community/yojson.git" url { src: - "https://github.com/ocaml-community/yojson/releases/download/2.0.2/yojson-2.0.2.tbz" + "https://github.com/ocaml-community/yojson/releases/download/2.1.0/yojson-2.1.0.tbz" checksum: [ - "sha256=876bb6f38af73a84a29438a3da35e4857c60a14556a606525b148c6fdbe5461b" - "sha512=9e150689a814a64e53e361e336fe826df5a3e3851d1367fda4a001392175c29348de55db0b7d7ba18539dec2cf78198efcb7f41b77a9861763f5aa97c05509ad" + "sha256=9fcb1ff2db58ab259f9228796b0ada4794eae97177b1833371380c4e4f90b15d" + "sha512=31ab8580e0e4e8a05459fbec2fb9424a3df4cf5aef6df21fc577dbe3d32e81103a632c6a511c4dcf1f51819e88b38d2ce7d6888545bc3f359e69e070f8d2e69c" ] } -x-commit-hash: "17ca03c5877a4346f0691443f35ed9678f99962f" +x-commit-hash: "42fa0887cb870bdbd1751d98cd23f99d6b29751d" diff --git a/libbinaryen.opam b/libbinaryen.opam index dc22ca4..bb6b178 100644 --- a/libbinaryen.opam +++ b/libbinaryen.opam @@ -21,6 +21,3 @@ depends: [ depexts: [ ["gcc-g++"] { os-distribution = "cygwinports" } ] -pin-depends: [ - ["js_of_ocaml-compiler.5.1.2" "git+https://github.com/ocsigen/js_of_ocaml#880e44f8971d66de9a67f90944a7a27443cbf9bf"] -] diff --git a/package.json b/package.json index 8f232dc..0c2e1ac 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "@opam/ocaml-lsp-server": "> 1.9.1 < 1.13.0" }, "resolutions": { - "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#880e44f8971d66de9a67f90944a7a27443cbf9bf", "@opam/ocp-indent": "1.7.0" }, "esy": { From 4dc5d6741bfb3f2ac554b3aebb44c0f8d9a8f7d4 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 6 May 2023 16:14:52 -0700 Subject: [PATCH 5/5] range for esy --- esy.lock/index.json | 159 ++++++++++++++++-- esy.lock/opam/angstrom.0.15.0/opam | 34 ++++ esy.lock/opam/bigstringaf.0.9.1/opam | 48 ++++++ .../opam | 9 +- esy.lock/opam/ocaml-syntax-shims.1.0.0/opam | 39 +++++ esy.lock/opam/stringext.1.6.0/opam | 31 ++++ esy.lock/opam/uri.4.2.0/opam | 36 ++++ package.json | 2 +- 8 files changed, 342 insertions(+), 16 deletions(-) create mode 100644 esy.lock/opam/angstrom.0.15.0/opam create mode 100644 esy.lock/opam/bigstringaf.0.9.1/opam rename esy.lock/opam/{ocaml-lsp-server.1.12.4 => ocaml-lsp-server.1.12.3}/opam (77%) create mode 100644 esy.lock/opam/ocaml-syntax-shims.1.0.0/opam create mode 100644 esy.lock/opam/stringext.1.6.0/opam create mode 100644 esy.lock/opam/uri.4.2.0/opam diff --git a/esy.lock/index.json b/esy.lock/index.json index b6815b0..b26e771 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "7dbb44cd21308f027783f0b6e6520281", + "checksum": "2e1f8c9898bb55ba5d075270654ef785", "root": "@grain/libbinaryen@link-dev:./package.json", "node": { "ocaml@4.14.0@d41d8cd9": { @@ -150,6 +150,35 @@ ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, + "@opam/uri@opam:4.2.0@9c45eeb8": { + "id": "@opam/uri@opam:4.2.0@9c45eeb8", + "name": "@opam/uri", + "version": "opam:4.2.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/c5/c5c013d940dbb6731ea2ee75c2bf991d3435149c3f3659ec2e55476f5473f16b#sha256:c5c013d940dbb6731ea2ee75c2bf991d3435149c3f3659ec2e55476f5473f16b", + "archive:https://github.com/mirage/ocaml-uri/releases/download/v4.2.0/uri-v4.2.0.tbz#sha256:c5c013d940dbb6731ea2ee75c2bf991d3435149c3f3659ec2e55476f5473f16b" + ], + "opam": { + "name": "uri", + "version": "4.2.0", + "path": "esy.lock/opam/uri.4.2.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/stringext@opam:1.6.0@ac4f328b", + "@opam/dune@opam:3.7.1@40db2f22", + "@opam/angstrom@opam:0.15.0@105656d9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/stringext@opam:1.6.0@ac4f328b", + "@opam/dune@opam:3.7.1@40db2f22", + "@opam/angstrom@opam:0.15.0@105656d9" + ] + }, "@opam/topkg@opam:1.0.7@7ee47d76": { "id": "@opam/topkg@opam:1.0.7@7ee47d76", "name": "@opam/topkg", @@ -176,6 +205,31 @@ "ocaml@4.14.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.2@c6163b28" ] }, + "@opam/stringext@opam:1.6.0@ac4f328b": { + "id": "@opam/stringext@opam:1.6.0@ac4f328b", + "name": "@opam/stringext", + "version": "opam:1.6.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/db/db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea", + "archive:https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" + ], + "opam": { + "name": "stringext", + "version": "1.6.0", + "path": "esy.lock/opam/stringext.1.6.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" + ] + }, "@opam/stdune@opam:3.6.2@47d75c4b": { "id": "@opam/stdune@opam:3.6.2@47d75c4b", "name": "@opam/stdune", @@ -817,27 +871,52 @@ "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, - "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770": { - "id": "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", + "@opam/ocaml-syntax-shims@opam:1.0.0@9f361fbb": { + "id": "@opam/ocaml-syntax-shims@opam:1.0.0@9f361fbb", + "name": "@opam/ocaml-syntax-shims", + "version": "opam:1.0.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/89/89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8#sha256:89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8", + "archive:https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz#sha256:89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" + ], + "opam": { + "name": "ocaml-syntax-shims", + "version": "1.0.0", + "path": "esy.lock/opam/ocaml-syntax-shims.1.0.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" + ] + }, + "@opam/ocaml-lsp-server@opam:1.12.3@709d4f1b": { + "id": "@opam/ocaml-lsp-server@opam:1.12.3@709d4f1b", "name": "@opam/ocaml-lsp-server", - "version": "opam:1.12.4", + "version": "opam:1.12.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/91/919b98027cbc56359dabe8a911d3d24d1706cea8cd04e8173a2d1d3b06f9d846#sha256:919b98027cbc56359dabe8a911d3d24d1706cea8cd04e8173a2d1d3b06f9d846", - "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.12.4/lsp-1.12.4.tbz#sha256:919b98027cbc56359dabe8a911d3d24d1706cea8cd04e8173a2d1d3b06f9d846" + "archive:https://opam.ocaml.org/cache/sha256/6e/6ef4a5445ba53baf1cf18a59fb712cc20d3d3257d0ce7d8f0e24408bf0aadbf3#sha256:6ef4a5445ba53baf1cf18a59fb712cc20d3d3257d0ce7d8f0e24408bf0aadbf3", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.12.3/lsp-1.12.3.tbz#sha256:6ef4a5445ba53baf1cf18a59fb712cc20d3d3257d0ce7d8f0e24408bf0aadbf3" ], "opam": { "name": "ocaml-lsp-server", - "version": "1.12.4", - "path": "esy.lock/opam/ocaml-lsp-server.1.12.4" + "version": "1.12.3", + "path": "esy.lock/opam/ocaml-lsp-server.1.12.3" } }, "overrides": [], "dependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", "@opam/xdg@opam:3.7.1@387cb889", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.6.2@47d75c4b", + "@opam/uri@opam:4.2.0@9c45eeb8", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", "@opam/ppx_yojson_conv_lib@opam:v0.15.0@773058a7", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", @@ -854,7 +933,7 @@ "devDependencies": [ "ocaml@4.14.0@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", "@opam/xdg@opam:3.7.1@387cb889", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.6.2@47d75c4b", + "@opam/uri@opam:4.2.0@9c45eeb8", "@opam/stdune@opam:3.6.2@47d75c4b", "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", "@opam/ppx_yojson_conv_lib@opam:v0.15.0@773058a7", "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.6.2@37bc3093", @@ -1418,6 +1497,34 @@ "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.1@40db2f22" ] }, + "@opam/bigstringaf@opam:0.9.1@e6f2e882": { + "id": "@opam/bigstringaf@opam:0.9.1@e6f2e882", + "name": "@opam/bigstringaf", + "version": "opam:0.9.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/90/909fdc277cf03096a35b565325d5314a#md5:909fdc277cf03096a35b565325d5314a", + "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.9.1.tar.gz#md5:909fdc277cf03096a35b565325d5314a" + ], + "opam": { + "name": "bigstringaf", + "version": "0.9.1", + "path": "esy.lock/opam/bigstringaf.0.9.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.14.0@d41d8cd9", + "@opam/dune-configurator@opam:3.7.1@32ab7c21", + "@opam/dune@opam:3.7.1@40db2f22", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.14.0@d41d8cd9", + "@opam/dune-configurator@opam:3.7.1@32ab7c21", + "@opam/dune@opam:3.7.1@40db2f22" + ] + }, "@opam/base-unix@opam:base@87d0b2eb": { "id": "@opam/base-unix@opam:base@87d0b2eb", "name": "@opam/base-unix", @@ -1544,6 +1651,36 @@ ], "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, + "@opam/angstrom@opam:0.15.0@105656d9": { + "id": "@opam/angstrom@opam:0.15.0@105656d9", + "name": "@opam/angstrom", + "version": "opam:0.15.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/51/5104768c404ea92fd0a53a5b0f75cd50#md5:5104768c404ea92fd0a53a5b0f75cd50", + "archive:https://github.com/inhabitedtype/angstrom/archive/0.15.0.tar.gz#md5:5104768c404ea92fd0a53a5b0f75cd50" + ], + "opam": { + "name": "angstrom", + "version": "0.15.0", + "path": "esy.lock/opam/angstrom.0.15.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "@opam/ocaml-syntax-shims@opam:1.0.0@9f361fbb", + "@opam/dune@opam:3.7.1@40db2f22", + "@opam/bigstringaf@opam:0.9.1@e6f2e882", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "@opam/dune@opam:3.7.1@40db2f22", + "@opam/bigstringaf@opam:0.9.1@e6f2e882" + ] + }, "@grain/libbinaryen@link-dev:./package.json": { "id": "@grain/libbinaryen@link-dev:./package.json", "name": "@grain/libbinaryen", @@ -1562,7 +1699,7 @@ ], "devDependencies": [ "@opam/ocamlformat@opam:0.24.1@9aca58ad", - "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", + "@opam/ocaml-lsp-server@opam:1.12.3@709d4f1b", "@opam/js_of_ocaml-compiler@opam:5.2.0@5bbea5b0" ], "installConfig": { "pnp": false } diff --git a/esy.lock/opam/angstrom.0.15.0/opam b/esy.lock/opam/angstrom.0.15.0/opam new file mode 100644 index 0000000..2d67a6b --- /dev/null +++ b/esy.lock/opam/angstrom.0.15.0/opam @@ -0,0 +1,34 @@ +opam-version: "2.0" +maintainer: "Spiros Eliopoulos " +authors: [ "Spiros Eliopoulos " ] +license: "BSD-3-clause" +homepage: "https://github.com/inhabitedtype/angstrom" +bug-reports: "https://github.com/inhabitedtype/angstrom/issues" +dev-repo: "git+https://github.com/inhabitedtype/angstrom.git" +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {>= "1.8"} + "alcotest" {with-test & >= "0.8.1"} + "bigstringaf" + "result" + "ppx_let" {with-test & >= "0.14.0"} + "ocaml-syntax-shims" {build} +] +synopsis: "Parser combinators built for speed and memory-efficiency" +description: """ +Angstrom is a parser-combinator library that makes it easy to write efficient, +expressive, and reusable parsers suitable for high-performance applications. It +exposes monadic and applicative interfaces for composition, and supports +incremental input through buffered and unbuffered interfaces. Both interfaces +give the user total control over the blocking behavior of their application, +with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by +default and support unbounded lookahead.""" +url { + src: "https://github.com/inhabitedtype/angstrom/archive/0.15.0.tar.gz" + checksum: "md5=5104768c404ea92fd0a53a5b0f75cd50" +} diff --git a/esy.lock/opam/bigstringaf.0.9.1/opam b/esy.lock/opam/bigstringaf.0.9.1/opam new file mode 100644 index 0000000..8ef7b7c --- /dev/null +++ b/esy.lock/opam/bigstringaf.0.9.1/opam @@ -0,0 +1,48 @@ +opam-version: "2.0" +maintainer: "Spiros Eliopoulos " +authors: [ "Spiros Eliopoulos " ] +license: "BSD-3-clause" +homepage: "https://github.com/inhabitedtype/bigstringaf" +bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues" +dev-repo: "git+https://github.com/inhabitedtype/bigstringaf.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +depends: [ + "dune" {>= "3.0"} + "dune-configurator" {>= "3.0"} + "alcotest" {with-test} + "ocaml" {>= "4.08.0"} +] +conflicts: [ + "mirage-xen" {< "6.0.0"} + "ocaml-freestanding" + "js_of_ocaml" {< "3.5.0"} +] +synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove" +description: """ +Bigstring intrinsics and fast blits based on memcpy/memmove + +The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not +widely-known, sometimes misused, and so programs that use Bigstrings are slower +than they have to be. And even if a library got that part right and exposed the +intrinsics properly, the compiler doesn't have any fast blits between +Bigstrings and other string-like types. + +So here they are. Go crazy. +""" +url { + src: "https://github.com/inhabitedtype/bigstringaf/archive/0.9.1.tar.gz" + checksum: "md5=909fdc277cf03096a35b565325d5314a" +} diff --git a/esy.lock/opam/ocaml-lsp-server.1.12.4/opam b/esy.lock/opam/ocaml-lsp-server.1.12.3/opam similarity index 77% rename from esy.lock/opam/ocaml-lsp-server.1.12.4/opam rename to esy.lock/opam/ocaml-lsp-server.1.12.3/opam index 44bd9a0..9110ecb 100644 --- a/esy.lock/opam/ocaml-lsp-server.1.12.4/opam +++ b/esy.lock/opam/ocaml-lsp-server.1.12.3/opam @@ -20,6 +20,7 @@ bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" depends: [ "dune" {>= "3.0"} "yojson" + "uri" {>= "4.0.0"} "re" {>= "1.5.0"} "ppx_yojson_conv_lib" {>= "v0.14"} "dune-rpc" @@ -54,10 +55,10 @@ build: [ ] url { src: - "https://github.com/ocaml/ocaml-lsp/releases/download/1.12.4/lsp-1.12.4.tbz" + "https://github.com/ocaml/ocaml-lsp/releases/download/1.12.3/lsp-1.12.3.tbz" checksum: [ - "sha256=919b98027cbc56359dabe8a911d3d24d1706cea8cd04e8173a2d1d3b06f9d846" - "sha512=68898112f13b7ee13040933ed95597e59f83e42ac9d6ead375baa2d1248b1614b5b80ae5e0d839f7f5a8372fd1f47e6bf308d331ca1df90cb4b9927825f89635" + "sha256=6ef4a5445ba53baf1cf18a59fb712cc20d3d3257d0ce7d8f0e24408bf0aadbf3" + "sha512=33156e369c2b539767c382644d020627fc925eceae4552cc14a361254d2dbae3d6261d502d717e98709c1e1a74c73f10d8e66ac3f26c781d0080b330bb46eb9d" ] } -x-commit-hash: "f53ad362aa2c47216dd96d32b22bb95ee3e774e4" +x-commit-hash: "3ea0bb30ba32bbf0b79934d06266b16f873169c1" diff --git a/esy.lock/opam/ocaml-syntax-shims.1.0.0/opam b/esy.lock/opam/ocaml-syntax-shims.1.0.0/opam new file mode 100644 index 0000000..53c23f6 --- /dev/null +++ b/esy.lock/opam/ocaml-syntax-shims.1.0.0/opam @@ -0,0 +1,39 @@ +opam-version: "2.0" +synopsis: "Backport new syntax to older OCaml versions" +description: """ +This packages backports new features of the language to older +compilers, such as let+. +""" +maintainer: ["jeremie@dimino.org"] +authors: ["Jérémie Dimino "] +license: "MIT" +homepage: "https://github.com/ocaml-ppx/ocaml-syntax-shims" +doc: "https://ocaml-ppx.github.io/ocaml-syntax-shims/" +bug-reports: "https://github.com/ocaml-ppx/ocaml-syntax-shims/issues" +depends: [ + "dune" {>= "2.0"} + "ocaml" {>= "4.02.3"} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/ocaml-ppx/ocaml-syntax-shims.git" +url { + src: + "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz" + checksum: [ + "sha256=89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" + "sha512=75c4c6b0bfa1267a8a49a82ba494d08cf0823fc8350863d6d3d4971528cb09e5a2a29e2981d04c75e76ad0f49360b05a432c9efeff9a4fbc1ec6b28960399852" + ] +} diff --git a/esy.lock/opam/stringext.1.6.0/opam b/esy.lock/opam/stringext.1.6.0/opam new file mode 100644 index 0000000..3955914 --- /dev/null +++ b/esy.lock/opam/stringext.1.6.0/opam @@ -0,0 +1,31 @@ +opam-version: "2.0" +maintainer: "rudi.grinberg@gmail.com" +authors: "Rudi Grinberg" +license: "MIT" +homepage: "https://github.com/rgrinberg/stringext" +bug-reports: "https://github.com/rgrinberg/stringext/issues" +depends: [ + "ocaml" {>= "4.02.3"} + "dune" {>= "1.0"} + "ounit" {with-test} + "qtest" {with-test & >= "2.2"} +] +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +dev-repo: "git+https://github.com/rgrinberg/stringext.git" +synopsis: "Extra string functions for OCaml" +description: """ +Extra string functions for OCaml. Mainly splitting. All functions are in the +Stringext module. +""" +url { + src: + "https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz" + checksum: [ + "sha256=db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" + "sha512=d8ebe40f42b598a9bd99f1ef4b00ba93458385a4accd121af66a0bf3b3f8d7135f576740adf1a43081dd409977c2219fd4bdbb5b3d1308890d301d553ed49900" + ] +} diff --git a/esy.lock/opam/uri.4.2.0/opam b/esy.lock/opam/uri.4.2.0/opam new file mode 100644 index 0000000..64f60ea --- /dev/null +++ b/esy.lock/opam/uri.4.2.0/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +maintainer: "anil@recoil.org" +authors: ["Anil Madhavapeddy" "David Sheets" "Rudi Grinberg"] +license: "ISC" +tags: ["url" "uri" "org:mirage" "org:xapi-project"] +homepage: "https://github.com/mirage/ocaml-uri" +bug-reports: "https://github.com/mirage/ocaml-uri/issues" +dev-repo: "git+https://github.com/mirage/ocaml-uri.git" +doc: "https://mirage.github.io/ocaml-uri/" +synopsis: "An RFC3986 URI/URL parsing library" +description: """ +This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification +for parsing URI or URLs. +""" +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {>= "1.2.0"} + "ounit" {with-test & >= "1.0.2"} + "ppx_sexp_conv" {with-test & >= "v0.9.0"} + "stringext" {>= "1.4.0"} + "angstrom" {>= "0.14.0"} +] +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +x-commit-hash: "0ff3efbbc235bef5a7d67cc01bc1dadbe2e859b9" +url { + src: + "https://github.com/mirage/ocaml-uri/releases/download/v4.2.0/uri-v4.2.0.tbz" + checksum: [ + "sha256=c5c013d940dbb6731ea2ee75c2bf991d3435149c3f3659ec2e55476f5473f16b" + "sha512=119e39bf53db9e94383a4e3a3df492b60b2db097266b3a8660de431ad85bc87997718305972fd2abbfb529973475ce6b210ba5e34d12e85a5dabbb0e24130aa1" + ] +} diff --git a/package.json b/package.json index 0c2e1ac..8f2e99a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@opam/dune-configurator": ">= 3.0.0" }, "devDependencies": { - "@opam/js_of_ocaml-compiler": "*", + "@opam/js_of_ocaml-compiler": ">= 4.1.0 < 6.0.0", "@opam/ocamlformat": "0.24.1", "@opam/ocaml-lsp-server": "> 1.9.1 < 1.13.0" },