diff --git a/.github/workflows/esy.yml b/.github/workflows/esy.yml index 0fa6188a..9b88739c 100644 --- a/.github/workflows/esy.yml +++ b/.github/workflows/esy.yml @@ -29,7 +29,7 @@ jobs: # It also adds `shx` globally for cross-platform shell commands - name: Setup environment run: | - npm i -g esy@0.6.14 + npm i -g esy npm i -g shx - name: Checkout project diff --git a/binaryen.opam b/binaryen.opam index 05102b66..6f6b392e 100644 --- a/binaryen.opam +++ b/binaryen.opam @@ -16,5 +16,5 @@ depends: [ "dune" {>= "3.0.0"} "dune-configurator" {>= "3.0.0"} "js_of_ocaml-compiler" {>= "4.1.0" < "6.0.0"} - "libbinaryen" {>= "112.0.0" < "113.0.0"} + "libbinaryen" {>= "113.0.0" < "114.0.0"} ] diff --git a/esy.lock/index.json b/esy.lock/index.json index 904afd51..97d5a01d 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "0c7cfe1ca4bb2c4a5338add2a63e9886", + "checksum": "2976b1dec7b367a04895ce0d5d5cd112", "root": "@grain/binaryen.ml@link-dev:./package.json", "node": { "ocaml@4.14.1000@d41d8cd9": { @@ -35,37 +35,37 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.9.1@a51b6e38", "@opam/cppo@opam:1.6.9@db929a12", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.9.1@a51b6e38" + "@opam/dune@opam:3.10.0@d5991a42" ] }, - "@opam/xdg@opam:3.9.1@b067fba7": { - "id": "@opam/xdg@opam:3.9.1@b067fba7", + "@opam/xdg@opam:3.10.0@620c5589": { + "id": "@opam/xdg@opam:3.10.0@620c5589", "name": "@opam/xdg", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "xdg", - "version": "3.9.1", - "path": "esy.lock/opam/xdg.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/xdg.3.10.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/uutf@opam:1.0.3@47c95a18": { @@ -94,55 +94,54 @@ ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] }, - "@opam/uuseg@opam:15.0.0@14085231": { - "id": "@opam/uuseg@opam:15.0.0@14085231", + "@opam/uuseg@opam:15.1.0@af4a84a3": { + "id": "@opam/uuseg@opam:15.1.0@af4a84a3", "name": "@opam/uuseg", - "version": "opam:15.0.0", + "version": "opam:15.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/37/37ea83b582dd779a026cfae11f08f5d67ef79fce65a2cf03f2a9aabc7eb5de60c8e812524fa7531e4ff6e22a3b18228e3438a0143ce43be95f23237cc283576f#sha512:37ea83b582dd779a026cfae11f08f5d67ef79fce65a2cf03f2a9aabc7eb5de60c8e812524fa7531e4ff6e22a3b18228e3438a0143ce43be95f23237cc283576f", - "archive:https://erratique.ch/software/uuseg/releases/uuseg-15.0.0.tbz#sha512:37ea83b582dd779a026cfae11f08f5d67ef79fce65a2cf03f2a9aabc7eb5de60c8e812524fa7531e4ff6e22a3b18228e3438a0143ce43be95f23237cc283576f" + "archive:https://opam.ocaml.org/cache/sha512/1e/1e9460dc5a856c985d40c61fd1560bdfdb8bbaf8d7430405814589b47d4a7f7869658d1e3198c7a9132412e9b4b85402ceb4bda5040da426b69e9aef4222a23a#sha512:1e9460dc5a856c985d40c61fd1560bdfdb8bbaf8d7430405814589b47d4a7f7869658d1e3198c7a9132412e9b4b85402ceb4bda5040da426b69e9aef4222a23a", + "archive:https://erratique.ch/software/uuseg/releases/uuseg-15.1.0.tbz#sha512:1e9460dc5a856c985d40c61fd1560bdfdb8bbaf8d7430405814589b47d4a7f7869658d1e3198c7a9132412e9b4b85402ceb4bda5040da426b69e9aef4222a23a" ], "opam": { "name": "uuseg", - "version": "15.0.0", - "path": "esy.lock/opam/uuseg.15.0.0" + "version": "15.1.0", + "path": "esy.lock/opam/uuseg.15.1.0" } }, "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/uucp@opam:15.0.0@55460339", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/uucp@opam:15.1.0@ef3e0a4e", "@opam/topkg@opam:1.0.7@7ee47d76", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uucp@opam:15.0.0@55460339" + "ocaml@4.14.1000@d41d8cd9", "@opam/uucp@opam:15.1.0@ef3e0a4e" ] }, - "@opam/uucp@opam:15.0.0@55460339": { - "id": "@opam/uucp@opam:15.0.0@55460339", + "@opam/uucp@opam:15.1.0@ef3e0a4e": { + "id": "@opam/uucp@opam:15.1.0@ef3e0a4e", "name": "@opam/uucp", - "version": "opam:15.0.0", + "version": "opam:15.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/ee/ee4acff5666961766321e85e287fb9d5b8d50533319f22bf6f4eceb943242df2d0e0f4e775c4a140f68ca142837938eaa5926e22362215a3365ffe7f8768923b#sha512:ee4acff5666961766321e85e287fb9d5b8d50533319f22bf6f4eceb943242df2d0e0f4e775c4a140f68ca142837938eaa5926e22362215a3365ffe7f8768923b", - "archive:https://erratique.ch/software/uucp/releases/uucp-15.0.0.tbz#sha512:ee4acff5666961766321e85e287fb9d5b8d50533319f22bf6f4eceb943242df2d0e0f4e775c4a140f68ca142837938eaa5926e22362215a3365ffe7f8768923b" + "archive:https://opam.ocaml.org/cache/sha512/99/998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364#sha512:998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364", + "archive:https://erratique.ch/software/uucp/releases/uucp-15.1.0.tbz#sha512:998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364" ], "opam": { "name": "uucp", - "version": "15.0.0", - "path": "esy.lock/opam/uucp.15.0.0" + "version": "15.1.0", + "path": "esy.lock/opam/uucp.15.1.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/topkg@opam:1.0.7@7ee47d76", + "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", "@opam/cmdliner@opam:1.2.0@b0c6143c", @@ -177,35 +176,35 @@ "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d" ] }, - "@opam/stdune@opam:3.9.1@49dddd6b": { - "id": "@opam/stdune@opam:3.9.1@49dddd6b", + "@opam/stdune@opam:3.10.0@7e2a8959": { + "id": "@opam/stdune@opam:3.10.0@7e2a8959", "name": "@opam/stdune", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "stdune", - "version": "3.9.1", - "path": "esy.lock/opam/stdune.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/stdune.3.10.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ordering@opam:3.9.1@db91b281", - "@opam/dyn@opam:3.9.1@92656c9f", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.10.0@eade5884", + "@opam/dyn@opam:3.10.0@0fc13d1c", "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ordering@opam:3.9.1@db91b281", - "@opam/dyn@opam:3.9.1@92656c9f", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.10.0@eade5884", + "@opam/dyn@opam:3.10.0@0fc13d1c", "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ] @@ -228,11 +227,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/stdio@opam:v0.16.0@a75c1ca1": { @@ -253,13 +252,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", - "@opam/base@opam:v0.16.1@f532ef9b", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", + "@opam/base@opam:v0.16.3@de1ba42e", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", - "@opam/base@opam:v0.16.1@f532ef9b" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", + "@opam/base@opam:v0.16.3@de1ba42e" ] }, "@opam/spawn@opam:v0.15.1@85e9d6f1": { @@ -280,11 +279,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/sexplib0@opam:v0.16.0@c0ffad0c": { @@ -305,11 +304,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -350,12 +349,12 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.9.1@a51b6e38" + "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/result@opam:1.5@1c6a6533": { @@ -376,37 +375,37 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, - "@opam/re@opam:1.10.4@c4910ba6": { - "id": "@opam/re@opam:1.10.4@c4910ba6", + "@opam/re@opam:1.11.0@87deb463": { + "id": "@opam/re@opam:1.11.0@87deb463", "name": "@opam/re", - "version": "opam:1.10.4", + "version": "opam:1.11.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/83/83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c#sha256:83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c", - "archive:https://github.com/ocaml/ocaml-re/releases/download/1.10.4/re-1.10.4.tbz#sha256:83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c" + "archive:https://opam.ocaml.org/cache/sha256/01/01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f#sha256:01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f", + "archive:https://github.com/ocaml/ocaml-re/releases/download/1.11.0/re-1.11.0.tbz#sha256:01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f" ], "opam": { "name": "re", - "version": "1.10.4", - "path": "esy.lock/opam/re.1.10.4" + "version": "1.11.0", + "path": "esy.lock/opam/re.1.11.0" } }, "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.9.1@a51b6e38", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.9.1@a51b6e38" + "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/ppxlib@opam:0.29.1@a8bb9506": { @@ -431,14 +430,14 @@ "@opam/sexplib0@opam:v0.16.0@c0ffad0c", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.9.1@a51b6e38", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.9.1@a51b6e38" + "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c": { @@ -460,11 +459,11 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", - "@opam/dune@opam:3.9.1@a51b6e38", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", - "@opam/dune@opam:3.9.1@a51b6e38" + "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/ppx_derivers@opam:1.2.1@e2cbad12": { @@ -485,61 +484,61 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, - "@opam/pp@opam:1.1.2@89ad03b5": { - "id": "@opam/pp@opam:1.1.2@89ad03b5", + "@opam/pp@opam:1.2.0@16430027": { + "id": "@opam/pp@opam:1.2.0@16430027", "name": "@opam/pp", - "version": "opam:1.1.2", + "version": "opam:1.2.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e4/e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56#sha256:e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56", - "archive:https://github.com/ocaml-dune/pp/releases/download/1.1.2/pp-1.1.2.tbz#sha256:e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56" + "archive:https://opam.ocaml.org/cache/sha256/a5/a5e822573c55afb42db29ec56eacd1f2acd8f65cf2df2878e291de374ce6909c#sha256:a5e822573c55afb42db29ec56eacd1f2acd8f65cf2df2878e291de374ce6909c", + "archive:https://github.com/ocaml-dune/pp/releases/download/1.2.0/pp-1.2.0.tbz#sha256:a5e822573c55afb42db29ec56eacd1f2acd8f65cf2df2878e291de374ce6909c" ], "opam": { "name": "pp", - "version": "1.1.2", - "path": "esy.lock/opam/pp.1.1.2" + "version": "1.2.0", + "path": "esy.lock/opam/pp.1.2.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, - "@opam/ordering@opam:3.9.1@db91b281": { - "id": "@opam/ordering@opam:3.9.1@db91b281", + "@opam/ordering@opam:3.10.0@eade5884": { + "id": "@opam/ordering@opam:3.10.0@eade5884", "name": "@opam/ordering", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "ordering", - "version": "3.9.1", - "path": "esy.lock/opam/ordering.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/ordering.3.10.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/omd@opam:1.3.2@511d53d2": { @@ -560,13 +559,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0" ] @@ -590,14 +589,14 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/dune@opam:3.10.0@d5991a42", "@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.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/camlp-streams@opam:5.0.1@daaa0f94", "@opam/astring@opam:0.8.5@1300cee8" ] @@ -620,11 +619,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/ocp-indent@opam:1.7.0@2da3c6e5": { @@ -646,41 +645,41 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/base-bytes@opam:base@19d0c2ff" ] }, - "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e": { - "id": "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e", + "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda": { + "id": "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", "name": "@opam/ocamlformat-rpc-lib", - "version": "opam:0.25.1", + "version": "opam:0.26.1", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/sha256/da/da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7#sha256:da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz#sha256:da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7" ], "opam": { "name": "ocamlformat-rpc-lib", - "version": "0.25.1", - "path": "esy.lock/opam/ocamlformat-rpc-lib.0.25.1" + "version": "0.26.1", + "path": "esy.lock/opam/ocamlformat-rpc-lib.0.26.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4" ] }, @@ -703,8 +702,8 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/uuseg@opam:15.0.0@14085231", - "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.10.4@c4910ba6", + "@opam/uuseg@opam:15.1.0@af4a84a3", + "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.11.0@87deb463", "@opam/odoc-parser@opam:2.0.0@a08011a0", "@opam/ocp-indent@opam:1.7.0@2da3c6e5", "@opam/ocaml-version@opam:3.5.0@6bef55f5", @@ -714,16 +713,16 @@ "@opam/fpath@opam:0.7.3@674d8125", "@opam/fix@opam:20230505@941a65ff", "@opam/either@opam:1.0.0@be5a1416", - "@opam/dune-build-info@opam:3.9.1@b055a69c", - "@opam/dune@opam:3.9.1@a51b6e38", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/dune-build-info@opam:3.10.0@457c29c8", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/cmdliner@opam:1.2.0@b0c6143c", - "@opam/base@opam:v0.16.1@f532ef9b", + "@opam/base@opam:v0.16.3@de1ba42e", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/uuseg@opam:15.0.0@14085231", - "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.10.4@c4910ba6", + "@opam/uuseg@opam:15.1.0@af4a84a3", + "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.11.0@87deb463", "@opam/odoc-parser@opam:2.0.0@a08011a0", "@opam/ocp-indent@opam:1.7.0@2da3c6e5", "@opam/ocaml-version@opam:3.5.0@6bef55f5", @@ -733,10 +732,10 @@ "@opam/fpath@opam:0.7.3@674d8125", "@opam/fix@opam:20230505@941a65ff", "@opam/either@opam:1.0.0@be5a1416", - "@opam/dune-build-info@opam:3.9.1@b055a69c", - "@opam/dune@opam:3.9.1@a51b6e38", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/dune-build-info@opam:3.10.0@457c29c8", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/cmdliner@opam:1.2.0@b0c6143c", - "@opam/base@opam:v0.16.1@f532ef9b" + "@opam/base@opam:v0.16.3@de1ba42e" ] }, "@opam/ocamlfind@opam:1.9.6@da5169c7": { @@ -820,11 +819,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770": { @@ -846,36 +845,38 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", - "@opam/xdg@opam:3.9.1@b067fba7", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.9.1@49dddd6b", - "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", + "@opam/xdg@opam:3.10.0@620c5589", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/stdune@opam:3.10.0@7e2a8959", + "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.11.0@87deb463", "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", - "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.9.1@db91b281", + "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.10.0@eade5884", "@opam/omd@opam:1.3.2@511d53d2", "@opam/octavius@opam:1.2.2@2205cc65", - "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e", - "@opam/fiber@opam:3.7.0@d70e2471", "@opam/dyn@opam:3.9.1@92656c9f", - "@opam/dune-rpc@opam:3.9.1@87450a88", - "@opam/dune-build-info@opam:3.9.1@b055a69c", - "@opam/dune@opam:3.9.1@a51b6e38", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.9.1@6e3f04ee", + "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", + "@opam/fiber@opam:3.7.0@d70e2471", "@opam/dyn@opam:3.10.0@0fc13d1c", + "@opam/dune-rpc@opam:3.10.0@c0378e53", + "@opam/dune-build-info@opam:3.10.0@457c29c8", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/chrome-trace@opam:3.10.0@62089f3e", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.0@157478b0", - "@opam/xdg@opam:3.9.1@b067fba7", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.9.1@49dddd6b", - "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.10.4@c4910ba6", + "@opam/xdg@opam:3.10.0@620c5589", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/stdune@opam:3.10.0@7e2a8959", + "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.11.0@87deb463", "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", - "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.9.1@db91b281", + "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.10.0@eade5884", "@opam/omd@opam:1.3.2@511d53d2", "@opam/octavius@opam:1.2.2@2205cc65", - "@opam/ocamlformat-rpc-lib@opam:0.25.1@fb9fa86e", - "@opam/fiber@opam:3.7.0@d70e2471", "@opam/dyn@opam:3.9.1@92656c9f", - "@opam/dune-rpc@opam:3.9.1@87450a88", - "@opam/dune-build-info@opam:3.9.1@b055a69c", - "@opam/dune@opam:3.9.1@a51b6e38", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.9.1@6e3f04ee" + "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", + "@opam/fiber@opam:3.7.0@d70e2471", "@opam/dyn@opam:3.10.0@0fc13d1c", + "@opam/dune-rpc@opam:3.10.0@c0378e53", + "@opam/dune-build-info@opam:3.10.0@457c29c8", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/chrome-trace@opam:3.10.0@62089f3e" ] }, "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882": { @@ -896,11 +897,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/menhirSdk@opam:20230608@36f21a74": { @@ -921,11 +922,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/menhirLib@opam:20230608@cf13bc0d": { @@ -946,11 +947,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/menhir@opam:20230608@c0081728": { @@ -973,12 +974,12 @@ "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20230608@36f21a74", "@opam/menhirLib@opam:20230608@cf13bc0d", - "@opam/dune@opam:3.9.1@a51b6e38", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20230608@36f21a74", "@opam/menhirLib@opam:20230608@cf13bc0d", - "@opam/dune@opam:3.9.1@a51b6e38" + "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/js_of_ocaml-compiler@opam:5.4.0@1442ca67": { @@ -1006,7 +1007,7 @@ "@opam/menhirSdk@opam:20230608@36f21a74", "@opam/menhirLib@opam:20230608@cf13bc0d", "@opam/menhir@opam:20230608@c0081728", - "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1017,7 +1018,7 @@ "@opam/menhirSdk@opam:20230608@36f21a74", "@opam/menhirLib@opam:20230608@cf13bc0d", "@opam/menhir@opam:20230608@c0081728", - "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/dune@opam:3.10.0@d5991a42", "@opam/cmdliner@opam:1.2.0@b0c6143c" ] }, @@ -1040,11 +1041,11 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.9.1@a51b6e38", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.9.1@a51b6e38" + "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/fpath@opam:0.7.3@674d8125": { @@ -1093,11 +1094,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/fiber@opam:3.7.0@d70e2471": { @@ -1118,13 +1119,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.9.1@49dddd6b", - "@opam/dyn@opam:3.9.1@92656c9f", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.10.0@7e2a8959", + "@opam/dyn@opam:3.10.0@0fc13d1c", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.9.1@49dddd6b", - "@opam/dyn@opam:3.9.1@92656c9f", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.10.0@7e2a8959", + "@opam/dyn@opam:3.10.0@0fc13d1c", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/either@opam:1.0.0@be5a1416": { @@ -1145,136 +1146,138 @@ }, "overrides": [], "dependencies": [ - "@opam/dune@opam:3.9.1@a51b6e38", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:3.9.1@a51b6e38" ] + "devDependencies": [ "@opam/dune@opam:3.10.0@d5991a42" ] }, - "@opam/dyn@opam:3.9.1@92656c9f": { - "id": "@opam/dyn@opam:3.9.1@92656c9f", + "@opam/dyn@opam:3.10.0@0fc13d1c": { + "id": "@opam/dyn@opam:3.10.0@0fc13d1c", "name": "@opam/dyn", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "dyn", - "version": "3.9.1", - "path": "esy.lock/opam/dyn.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/dyn.3.10.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ordering@opam:3.9.1@db91b281", - "@opam/dune@opam:3.9.1@a51b6e38", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.10.0@eade5884", + "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ordering@opam:3.9.1@db91b281", - "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.10.0@eade5884", + "@opam/dune@opam:3.10.0@d5991a42" ] }, - "@opam/dune-rpc@opam:3.9.1@87450a88": { - "id": "@opam/dune-rpc@opam:3.9.1@87450a88", + "@opam/dune-rpc@opam:3.10.0@c0378e53": { + "id": "@opam/dune-rpc@opam:3.10.0@c0378e53", "name": "@opam/dune-rpc", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "dune-rpc", - "version": "3.9.1", - "path": "esy.lock/opam/dune-rpc.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/dune-rpc.3.10.0" } }, "overrides": [], "dependencies": [ - "@opam/xdg@opam:3.9.1@b067fba7", "@opam/stdune@opam:3.9.1@49dddd6b", - "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.9.1@db91b281", - "@opam/dyn@opam:3.9.1@92656c9f", "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/xdg@opam:3.10.0@620c5589", + "@opam/stdune@opam:3.10.0@7e2a8959", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.10.0@eade5884", + "@opam/dyn@opam:3.10.0@0fc13d1c", "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/xdg@opam:3.9.1@b067fba7", "@opam/stdune@opam:3.9.1@49dddd6b", - "@opam/pp@opam:1.1.2@89ad03b5", "@opam/ordering@opam:3.9.1@db91b281", - "@opam/dyn@opam:3.9.1@92656c9f", "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/xdg@opam:3.10.0@620c5589", + "@opam/stdune@opam:3.10.0@7e2a8959", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.10.0@eade5884", + "@opam/dyn@opam:3.10.0@0fc13d1c", "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4" ] }, - "@opam/dune-configurator@opam:3.9.1@ba6ecdd7": { - "id": "@opam/dune-configurator@opam:3.9.1@ba6ecdd7", + "@opam/dune-configurator@opam:3.10.0@f2df97f2": { + "id": "@opam/dune-configurator@opam:3.10.0@f2df97f2", "name": "@opam/dune-configurator", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "dune-configurator", - "version": "3.9.1", - "path": "esy.lock/opam/dune-configurator.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/dune-configurator.3.10.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/dune-build-info@opam:3.9.1@b055a69c": { - "id": "@opam/dune-build-info@opam:3.9.1@b055a69c", + "@opam/dune-build-info@opam:3.10.0@457c29c8": { + "id": "@opam/dune-build-info@opam:3.10.0@457c29c8", "name": "@opam/dune-build-info", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "dune-build-info", - "version": "3.9.1", - "path": "esy.lock/opam/dune-build-info.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/dune-build-info.3.10.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, - "@opam/dune@opam:3.9.1@a51b6e38": { - "id": "@opam/dune@opam:3.9.1@a51b6e38", + "@opam/dune@opam:3.10.0@d5991a42": { + "id": "@opam/dune@opam:3.10.0@d5991a42", "name": "@opam/dune", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "dune", - "version": "3.9.1", - "path": "esy.lock/opam/dune.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/dune.3.10.0" } }, "overrides": [], @@ -1306,11 +1309,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/cppo@opam:1.6.9@db929a12": { @@ -1331,25 +1334,25 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/conf-cmake@github:grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869@d41d8cd9": { + "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9": { "id": - "@opam/conf-cmake@github:grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869@d41d8cd9", + "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9", "name": "@opam/conf-cmake", "version": - "github:grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869", + "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", "source": { "type": "install", "source": [ - "github:grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869" + "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d" ] }, "overrides": [], @@ -1378,29 +1381,29 @@ ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] }, - "@opam/chrome-trace@opam:3.9.1@6e3f04ee": { - "id": "@opam/chrome-trace@opam:3.9.1@6e3f04ee", + "@opam/chrome-trace@opam:3.10.0@62089f3e": { + "id": "@opam/chrome-trace@opam:3.10.0@62089f3e", "name": "@opam/chrome-trace", - "version": "opam:3.9.1", + "version": "opam:3.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f0/f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878", - "archive:https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz#sha256:f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" + "archive:https://opam.ocaml.org/cache/sha256/9f/9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355", + "archive:https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz#sha256:9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" ], "opam": { "name": "chrome-trace", - "version": "3.9.1", - "path": "esy.lock/opam/chrome-trace.3.9.1" + "version": "3.10.0", + "path": "esy.lock/opam/chrome-trace.3.10.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/camlp-streams@opam:5.0.1@daaa0f94": { @@ -1421,11 +1424,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.9.1@a51b6e38" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -1501,32 +1504,32 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/base@opam:v0.16.1@f532ef9b": { - "id": "@opam/base@opam:v0.16.1@f532ef9b", + "@opam/base@opam:v0.16.3@de1ba42e": { + "id": "@opam/base@opam:v0.16.3@de1ba42e", "name": "@opam/base", - "version": "opam:v0.16.1", + "version": "opam:v0.16.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/ae/ae1cc041c0f8ea3ca163bc904336e9aa#md5:ae1cc041c0f8ea3ca163bc904336e9aa", - "archive:https://github.com/janestreet/base/archive/refs/tags/v0.16.1.tar.gz#md5:ae1cc041c0f8ea3ca163bc904336e9aa" + "archive:https://opam.ocaml.org/cache/md5/04/04572fc23a4651604cfcab83f720cb4c#md5:04572fc23a4651604cfcab83f720cb4c", + "archive:https://github.com/janestreet/base/archive/refs/tags/v0.16.3.tar.gz#md5:04572fc23a4651604cfcab83f720cb4c" ], "opam": { "name": "base", - "version": "v0.16.1", - "path": "esy.lock/opam/base.v0.16.1" + "version": "v0.16.3", + "path": "esy.lock/opam/base.v0.16.3" } }, "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", - "@opam/dune-configurator@opam:3.9.1@ba6ecdd7", - "@opam/dune@opam:3.9.1@a51b6e38", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-configurator@opam:3.10.0@f2df97f2", + "@opam/dune@opam:3.10.0@d5991a42", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", - "@opam/dune-configurator@opam:3.9.1@ba6ecdd7", - "@opam/dune@opam:3.9.1@a51b6e38" + "@opam/dune-configurator@opam:3.10.0@f2df97f2", + "@opam/dune@opam:3.10.0@d5991a42" ] }, "@opam/astring@opam:0.8.5@1300cee8": { @@ -1554,22 +1557,22 @@ ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] }, - "@grain/libbinaryen@112.0.0@d41d8cd9": { - "id": "@grain/libbinaryen@112.0.0@d41d8cd9", + "@grain/libbinaryen@113.0.0@d41d8cd9": { + "id": "@grain/libbinaryen@113.0.0@d41d8cd9", "name": "@grain/libbinaryen", - "version": "112.0.0", + "version": "113.0.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-112.0.0.tgz#sha1:61093fba10c65c2dfa4c51ba4a1b4df65f226fd3" + "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-113.0.0.tgz#sha1:b39319a5f171940bf4499530ba3f0d66bc8f993e" ] }, "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.9.1@ba6ecdd7", - "@opam/dune@opam:3.9.1@a51b6e38", - "@opam/conf-cmake@github:grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869@d41d8cd9" + "@opam/dune-configurator@opam:3.10.0@f2df97f2", + "@opam/dune@opam:3.10.0@d5991a42", + "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9" ], "devDependencies": [], "installConfig": { "pnp": false } @@ -1586,9 +1589,9 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.9.1@ba6ecdd7", - "@opam/dune@opam:3.9.1@a51b6e38", - "@grain/libbinaryen@112.0.0@d41d8cd9" + "@opam/dune-configurator@opam:3.10.0@f2df97f2", + "@opam/dune@opam:3.10.0@d5991a42", + "@grain/libbinaryen@113.0.0@d41d8cd9" ], "devDependencies": [ "@opam/ocamlformat@opam:0.24.1@9aca58ad", diff --git a/esy.lock/opam/base.v0.16.1/opam b/esy.lock/opam/base.v0.16.3/opam similarity index 85% rename from esy.lock/opam/base.v0.16.1/opam rename to esy.lock/opam/base.v0.16.3/opam index d9aaa890..30f29f5f 100644 --- a/esy.lock/opam/base.v0.16.1/opam +++ b/esy.lock/opam/base.v0.16.3/opam @@ -31,9 +31,9 @@ provided by companion libraries such as stdio: https://github.com/janestreet/stdio " url { - src: "https://github.com/janestreet/base/archive/refs/tags/v0.16.1.tar.gz" + src: "https://github.com/janestreet/base/archive/refs/tags/v0.16.3.tar.gz" checksum: [ - "md5=ae1cc041c0f8ea3ca163bc904336e9aa" - "sha512=347ccc68be09ef207f0ac793f1c472688855ba53c317a35c95f7124be4105985b54f866b604a66a9d2e54bc320f7b29ffa3eb224622b1cce6ca504e1ee4888ff" + "md5=04572fc23a4651604cfcab83f720cb4c" + "sha512=69380ed392faf4495459f97f70a10a6959fce71d2e6ba093472fc272141646307fd7872407de855dfa48ef0435f6587eae5aa50f4a67eac40a9e1946d0c3c070" ] } diff --git a/esy.lock/opam/chrome-trace.3.9.1/opam b/esy.lock/opam/chrome-trace.3.10.0/opam similarity index 68% rename from esy.lock/opam/chrome-trace.3.9.1/opam rename to esy.lock/opam/chrome-trace.3.10.0/opam index a88b00bf..583f59b3 100644 --- a/esy.lock/opam/chrome-trace.3.9.1/opam +++ b/esy.lock/opam/chrome-trace.3.10.0/opam @@ -30,10 +30,11 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/esy.lock/opam/dune-build-info.3.9.1/opam b/esy.lock/opam/dune-build-info.3.10.0/opam similarity index 74% rename from esy.lock/opam/dune-build-info.3.9.1/opam rename to esy.lock/opam/dune-build-info.3.10.0/opam index 75e62738..0f7e9ed7 100644 --- a/esy.lock/opam/dune-build-info.3.9.1/opam +++ b/esy.lock/opam/dune-build-info.3.10.0/opam @@ -36,10 +36,11 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/esy.lock/opam/dune-configurator.3.9.1/opam b/esy.lock/opam/dune-configurator.3.10.0/opam similarity index 75% rename from esy.lock/opam/dune-configurator.3.9.1/opam rename to esy.lock/opam/dune-configurator.3.10.0/opam index 457e703e..5572ff66 100644 --- a/esy.lock/opam/dune-configurator.3.9.1/opam +++ b/esy.lock/opam/dune-configurator.3.10.0/opam @@ -40,10 +40,11 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/esy.lock/opam/dune-rpc.3.9.1/opam b/esy.lock/opam/dune-rpc.3.10.0/opam similarity index 69% rename from esy.lock/opam/dune-rpc.3.9.1/opam rename to esy.lock/opam/dune-rpc.3.10.0/opam index a1f8aed8..6f175c2d 100644 --- a/esy.lock/opam/dune-rpc.3.9.1/opam +++ b/esy.lock/opam/dune-rpc.3.10.0/opam @@ -34,10 +34,11 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/esy.lock/opam/dune.3.9.1/opam b/esy.lock/opam/dune.3.10.0/opam similarity index 83% rename from esy.lock/opam/dune.3.9.1/opam rename to esy.lock/opam/dune.3.10.0/opam index f8343afc..79fe0a12 100644 --- a/esy.lock/opam/dune.3.9.1/opam +++ b/esy.lock/opam/dune.3.10.0/opam @@ -47,10 +47,11 @@ depends: [ "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/esy.lock/opam/dyn.3.9.1/opam b/esy.lock/opam/dyn.3.10.0/opam similarity index 67% rename from esy.lock/opam/dyn.3.9.1/opam rename to esy.lock/opam/dyn.3.10.0/opam index 96a76796..ae6bdb0d 100644 --- a/esy.lock/opam/dyn.3.9.1/opam +++ b/esy.lock/opam/dyn.3.10.0/opam @@ -31,10 +31,11 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/esy.lock/opam/ocamlformat-rpc-lib.0.25.1/opam b/esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam similarity index 54% rename from esy.lock/opam/ocamlformat-rpc-lib.0.25.1/opam rename to esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam index e6e4ec19..e685d68a 100644 --- a/esy.lock/opam/ocamlformat-rpc-lib.0.25.1/opam +++ b/esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam @@ -2,8 +2,18 @@ opam-version: "2.0" synopsis: "Auto-formatter for OCaml code (RPC mode)" description: "OCamlFormat is a tool to automatically format OCaml code in a uniform style. This package defines a RPC interface to OCamlFormat" -maintainer: ["OCamlFormat Team "] -authors: ["Josh Berdine "] +maintainer: [ + "Guillaume Petiot " + "Jules Aguillon " + "Emile Trotignon " +] +authors: [ + "Josh Berdine " + "Hugo Heuzard " + "Etienne Millon " + "Guillaume Petiot " + "Jules Aguillon " +] license: "MIT" homepage: "https://github.com/ocaml-ppx/ocamlformat" bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" @@ -30,10 +40,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git" url { src: - "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.25.1/ocamlformat-0.25.1.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz" checksum: [ - "sha256=dc8f2a330ca3930b36cacb2623bb360ed8bdf6e4a8acd293dbd9e2241a6fd33d" - "sha512=b28f545425fb5375447c90022d065dc7fd51ed2f66d8c1f65a71a6ad2465d039a8686e8f18249e5ad3a2362fee6149c855ef30eb45fb9d06d743a53d26b3e26f" + "sha256=da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7" + "sha512=b7413f8dc47ba3a2372e89d59cae54f9a602ab81e31cd14ed986a831111080b79a5a3cc45dac04d8ffae5054c35bf29fe9559f145c76c87a30e191ed5400942a" ] } -x-commit-hash: "651f767b48e14ba6b24db9421306942d9e51adcc" +x-commit-hash: "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3" diff --git a/esy.lock/opam/ordering.3.9.1/opam b/esy.lock/opam/ordering.3.10.0/opam similarity index 66% rename from esy.lock/opam/ordering.3.9.1/opam rename to esy.lock/opam/ordering.3.10.0/opam index 799c3713..13c515fc 100644 --- a/esy.lock/opam/ordering.3.9.1/opam +++ b/esy.lock/opam/ordering.3.10.0/opam @@ -29,10 +29,11 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/esy.lock/opam/pp.1.1.2/opam b/esy.lock/opam/pp.1.2.0/opam similarity index 76% rename from esy.lock/opam/pp.1.1.2/opam rename to esy.lock/opam/pp.1.2.0/opam index e09edbfd..9f4fad20 100644 --- a/esy.lock/opam/pp.1.1.2/opam +++ b/esy.lock/opam/pp.1.2.0/opam @@ -20,7 +20,7 @@ one [2] should be applicable to Pp as well. """ maintainer: ["Jeremie Dimino "] authors: [ - "Jane Street Group, LLC" + "Jane Street Group, LLC " "Jeremie Dimino " ] license: "MIT" @@ -28,9 +28,10 @@ homepage: "https://github.com/ocaml-dune/pp" doc: "https://ocaml-dune.github.io/pp/" bug-reports: "https://github.com/ocaml-dune/pp/issues" depends: [ - "dune" {>= "2.0"} + "dune" {>= "2.8"} "ocaml" {>= "4.08.0"} "ppx_expect" {with-test} + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} @@ -47,12 +48,12 @@ build: [ ] ] dev-repo: "git+https://github.com/ocaml-dune/pp.git" -x-commit-hash: "395b95c89cfe2c6d538dad9d56721b6a7278d46c" url { src: - "https://github.com/ocaml-dune/pp/releases/download/1.1.2/pp-1.1.2.tbz" + "https://github.com/ocaml-dune/pp/releases/download/1.2.0/pp-1.2.0.tbz" checksum: [ - "sha256=e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56" - "sha512=58f78b083483006b40814be9aac33c895349eb1c6427d2762b4d760192613401262478bd5deff909763517560b06af7bf013c6a6f87d549aafa77b26345303f2" + "sha256=a5e822573c55afb42db29ec56eacd1f2acd8f65cf2df2878e291de374ce6909c" + "sha512=912164c2aa7241d73f735dadfbefe8ed0138d241579d2e885440e068fac78eb9f0b3d782c2420e757e313168c1725daff6ab91800dd315b1e05288456998b40a" ] } +x-commit-hash: "83b68c740f21acdcfe54436355ab328372871357" diff --git a/esy.lock/opam/re.1.10.4/opam b/esy.lock/opam/re.1.11.0/opam similarity index 69% rename from esy.lock/opam/re.1.10.4/opam rename to esy.lock/opam/re.1.11.0/opam index 9dad6613..303af008 100644 --- a/esy.lock/opam/re.1.10.4/opam +++ b/esy.lock/opam/re.1.11.0/opam @@ -8,7 +8,7 @@ authors: [ "Rudi Grinberg" "Gabriel Radanne" ] -license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception" +license: "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" homepage: "https://github.com/ocaml/ocaml-re" bug-reports: "https://github.com/ocaml/ocaml-re/issues" dev-repo: "git+https://github.com/ocaml/ocaml-re.git" @@ -37,10 +37,10 @@ Pure OCaml regular expressions with: """ url { src: - "https://github.com/ocaml/ocaml-re/releases/download/1.10.4/re-1.10.4.tbz" + "https://github.com/ocaml/ocaml-re/releases/download/1.11.0/re-1.11.0.tbz" checksum: [ - "sha256=83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c" - "sha512=92b05cf92c389fa8c753f2acca837b15dd05a4a2e8e2bec7a269d2e14c35b1a786d394258376648f80b4b99250ba1900cfe68230b8385aeac153149d9ce56099" + "sha256=01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f" + "sha512=3e3712cc1266ec1f27620f3508ea2ebba338f4083b07d8a69dccee1facfdc1971a6c39f9deea664d2a62fd7f2cfd2eae816ca4c274acfadaee992a3befc4b757" ] } -x-commit-hash: "e9a4cecb8294c1839db18b1d0c30e755ec85ed5e" +x-commit-hash: "2dd38515c76c40299596d39f18d9b9a20f00d788" diff --git a/esy.lock/opam/stdune.3.9.1/opam b/esy.lock/opam/stdune.3.10.0/opam similarity index 71% rename from esy.lock/opam/stdune.3.9.1/opam rename to esy.lock/opam/stdune.3.10.0/opam index 1b01f1b9..7b84cc64 100644 --- a/esy.lock/opam/stdune.3.9.1/opam +++ b/esy.lock/opam/stdune.3.10.0/opam @@ -35,10 +35,11 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/esy.lock/opam/uucp.15.0.0/opam b/esy.lock/opam/uucp.15.1.0/opam similarity index 61% rename from esy.lock/opam/uucp.15.0.0/opam rename to esy.lock/opam/uucp.15.1.0/opam index dccf7c22..f3abfcad 100644 --- a/esy.lock/opam/uucp.15.0.0/opam +++ b/esy.lock/opam/uucp.15.1.0/opam @@ -2,14 +2,13 @@ opam-version: "2.0" synopsis: "Unicode character properties for OCaml" description: """\ Uucp is an OCaml library providing efficient access to a selection of -character properties of the [Unicode character database][1]. +character properties of the [Unicode character database]. -Uucp is independent from any Unicode text data structure and has no -dependencies. It is distributed under the ISC license. +Uucp is distributed under the ISC license. It has no dependency. -[1]: http://www.unicode.org/reports/tr44/ +Home page: -Home page: http://erratique.ch/software/uucp""" +[Unicode character database]: http://www.unicode.org/reports/tr44/""" maintainer: "Daniel Bünzli " authors: "The uucp programmers" license: "ISC" @@ -18,17 +17,16 @@ homepage: "https://erratique.ch/software/uucp" doc: "https://erratique.ch/software/uucp/doc/" bug-reports: "https://github.com/dbuenzli/uucp/issues" depends: [ - "ocaml" {>= "4.03.0"} + "ocaml" {>= "4.14.0"} "ocamlfind" {build} "ocamlbuild" {build} "topkg" {build & >= "1.0.3"} - "uucd" {with-test} + "uucd" {with-test & dev & >= "15.1.0" & < "16.0.0"} "uunf" {with-test} - "uutf" {with-test} ] -depopts: ["uutf" "uunf" "cmdliner"] +depopts: ["uunf" "cmdliner"] conflicts: [ - "uutf" {< "1.0.1"} + "uunf" {< "15.1.0" | >= "16.0.0"} "cmdliner" {< "1.1.0"} ] build: [ @@ -37,8 +35,6 @@ build: [ "build" "--dev-pkg" "%{dev}%" - "--with-uutf" - "%{uutf:installed}%" "--with-uunf" "%{uunf:installed}%" "--with-cmdliner" @@ -49,7 +45,7 @@ post-messages: {failure & (arch = "ppc64" | arch = "arm64")} dev-repo: "git+https://erratique.ch/repos/uucp.git" url { - src: "https://erratique.ch/software/uucp/releases/uucp-15.0.0.tbz" + src: "https://erratique.ch/software/uucp/releases/uucp-15.1.0.tbz" checksum: - "sha512=ee4acff5666961766321e85e287fb9d5b8d50533319f22bf6f4eceb943242df2d0e0f4e775c4a140f68ca142837938eaa5926e22362215a3365ffe7f8768923b" + "sha512=998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364" } \ No newline at end of file diff --git a/esy.lock/opam/uuseg.15.0.0/opam b/esy.lock/opam/uuseg.15.1.0/opam similarity index 64% rename from esy.lock/opam/uuseg.15.0.0/opam rename to esy.lock/opam/uuseg.15.1.0/opam index 2178c044..c1a87203 100644 --- a/esy.lock/opam/uuseg.15.0.0/opam +++ b/esy.lock/opam/uuseg.15.1.0/opam @@ -3,22 +3,20 @@ synopsis: "Unicode text segmentation for OCaml" description: """\ Uuseg is an OCaml library for segmenting Unicode text. It implements the locale independent [Unicode text segmentation algorithms][1] to -detect grapheme cluster, word and sentence boundaries and the -[Unicode line breaking algorithm][2] to detect line break -opportunities. +detect grapheme cluster, word and sentence boundaries and the [Unicode +line breaking algorithm][2] to detect line break opportunities. The library is independent from any IO mechanism or Unicode text data structure and it can process text without a complete in-memory representation. -Uuseg depends on [Uucp](http://erratique.ch/software/uucp) and -optionally on [Uutf](http://erratique.ch/software/uutf) for support on -OCaml UTF-X encoded strings. It is distributed under the ISC license. +Uuseg is distributed under the ISC license. It depends on [Uucp]. [1]: http://www.unicode.org/reports/tr29/ [2]: http://www.unicode.org/reports/tr14/ +[Uucp]: http://erratique.ch/software/uucp -Homepage: http://erratique.ch/software/uuseg""" +Homepage: """ maintainer: "Daniel Bünzli " authors: "The uuseg programmers" license: "ISC" @@ -27,11 +25,11 @@ homepage: "https://erratique.ch/software/uuseg" doc: "https://erratique.ch/software/uuseg/doc/" bug-reports: "https://github.com/dbuenzli/uuseg/issues" depends: [ - "ocaml" {>= "4.03.0"} + "ocaml" {>= "4.14.0"} "ocamlfind" {build} "ocamlbuild" {build} "topkg" {build & >= "1.0.3"} - "uucp" {>= "15.0.0" & < "16.0.0"} + "uucp" {>= "15.1.0" & < "16.0.0"} ] depopts: ["uutf" "cmdliner"] conflicts: [ @@ -51,7 +49,7 @@ build: [ ] dev-repo: "git+https://erratique.ch/repos/uuseg.git" url { - src: "https://erratique.ch/software/uuseg/releases/uuseg-15.0.0.tbz" + src: "https://erratique.ch/software/uuseg/releases/uuseg-15.1.0.tbz" checksum: - "sha512=37ea83b582dd779a026cfae11f08f5d67ef79fce65a2cf03f2a9aabc7eb5de60c8e812524fa7531e4ff6e22a3b18228e3438a0143ce43be95f23237cc283576f" + "sha512=1e9460dc5a856c985d40c61fd1560bdfdb8bbaf8d7430405814589b47d4a7f7869658d1e3198c7a9132412e9b4b85402ceb4bda5040da426b69e9aef4222a23a" } \ No newline at end of file diff --git a/esy.lock/opam/xdg.3.9.1/opam b/esy.lock/opam/xdg.3.10.0/opam similarity index 68% rename from esy.lock/opam/xdg.3.9.1/opam rename to esy.lock/opam/xdg.3.10.0/opam index 50fdbefd..fa7d65c3 100644 --- a/esy.lock/opam/xdg.3.9.1/opam +++ b/esy.lock/opam/xdg.3.10.0/opam @@ -30,10 +30,11 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/3.9.1/dune-3.9.1.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.10.0/dune-3.10.0.tbz" checksum: [ - "sha256=f0c3ce49f36c733b8aee72611f107cf06de6bc423be7262aab1bb3f03c05a878" - "sha512=105ea325a3a9d0c51e64d440d7f13f2231c5d0a56ea0bc334b3a39db4644499153823456f5d7b20f8bec724b3ceaace7c1718c3b941c300135769d01bb663979" + "sha256=9ff03384a98a8df79852cc674f0b4738ba8aec17029b6e2eeb514f895e710355" + "sha512=8133cdcc5499a6bf21cd65b4fc8b12445ae39366731006773fcd3b348c553a8d89d004db161c655aa167a2a3653b7919d32b27f29217106ef762bd01b43afc76" ] } -x-commit-hash: "3276f90725e4423790a43065cc51ddbbba61eb89" +x-commit-hash: "fc382520272012638088848d7f3dd1ef6687a284" diff --git a/package.json b/package.json index 090c4405..78560bdb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "dependencies": { "ocaml": ">= 4.12.0", - "@grain/libbinaryen": ">= 112.0.0 < 113.0.0", + "@grain/libbinaryen": ">= 113.0.0 < 114.0.0", "@opam/dune": ">= 3.0.0", "@opam/dune-configurator": ">= 3.0.0" }, diff --git a/src/dune b/src/dune index 9ed4e263..a5bcd431 100644 --- a/src/dune +++ b/src/dune @@ -23,7 +23,6 @@ heap_type signature_type struct_type - type_system ocaml_helpers) (flags :standard -O2 -Wall -Wextra)) (js_of_ocaml @@ -45,5 +44,4 @@ packed_type.js heap_type.js signature_type.js - struct_type.js - type_system.js))) + struct_type.js))) diff --git a/src/expression.c b/src/expression.c index 87188657..5f6e189b 100644 --- a/src/expression.c +++ b/src/expression.c @@ -356,7 +356,7 @@ caml_binaryen_memory_init(value _module, value _segment, value _dest, value _off CAMLparam5(_module, _segment, _dest, _offset, _size); CAMLxparam1(_memoryName); BinaryenModuleRef module = BinaryenModuleRef_val(_module); - uint32_t segment = Int_val(_segment); + char* segment = Safe_String_val(_segment); BinaryenExpressionRef dest = BinaryenExpressionRef_val(_dest); BinaryenExpressionRef offset = BinaryenExpressionRef_val(_offset); BinaryenExpressionRef size = BinaryenExpressionRef_val(_size); @@ -373,7 +373,7 @@ CAMLprim value caml_binaryen_data_drop(value _module, value _segment) { CAMLparam2(_module, _segment); BinaryenModuleRef module = BinaryenModuleRef_val(_module); - uint32_t segment = Int_val(_segment); + char* segment = Safe_String_val(_segment); BinaryenExpressionRef exp = BinaryenDataDrop(module, segment); CAMLreturn(alloc_BinaryenExpressionRef(exp)); } @@ -1596,14 +1596,14 @@ CAMLprim value caml_binaryen_memory_init_get_segment(value _exp) { CAMLparam1(_exp); BinaryenExpressionRef exp = BinaryenExpressionRef_val(_exp); - CAMLreturn(Val_int(BinaryenMemoryInitGetSegment(exp))); + CAMLreturn(caml_copy_string(BinaryenMemoryInitGetSegment(exp))); } CAMLprim value caml_binaryen_memory_init_set_segment(value _exp, value _value) { CAMLparam2(_exp, _value); BinaryenExpressionRef exp = BinaryenExpressionRef_val(_exp); - uint32_t val = Int_val(_value); + char* val = Safe_String_val(_value); BinaryenMemoryInitSetSegment(exp, val); CAMLreturn(Val_unit); } @@ -1648,27 +1648,27 @@ caml_binaryen_memory_init_get_size(value _exp) { } CAMLprim value -caml_binaryen_memory_init_set_size(value _exp, value _value) { - CAMLparam2(_exp, _value); - BinaryenExpressionRef exp = BinaryenExpressionRef_val(_exp); - BinaryenExpressionRef val = BinaryenExpressionRef_val(_value); - BinaryenMemoryInitSetSize(exp, val); +caml_binaryen_memory_init_set_size(value _expr, value _segment) { + CAMLparam2(_expr, _segment); + BinaryenExpressionRef expr = BinaryenExpressionRef_val(_expr); + BinaryenExpressionRef segment = BinaryenExpressionRef_val(_segment); + BinaryenMemoryInitSetSize(expr, segment); CAMLreturn(Val_unit); } CAMLprim value -caml_binaryen_data_drop_get_segment(value _exp) { - CAMLparam1(_exp); - BinaryenExpressionRef exp = BinaryenExpressionRef_val(_exp); - CAMLreturn(Val_int(BinaryenDataDropGetSegment(exp))); +caml_binaryen_data_drop_get_segment(value _expr) { + CAMLparam1(_expr); + BinaryenExpressionRef expr = BinaryenExpressionRef_val(_expr); + CAMLreturn(caml_copy_string(BinaryenDataDropGetSegment(expr))); } CAMLprim value -caml_binaryen_data_drop_set_segment(value _exp, value _value) { - CAMLparam2(_exp, _value); - BinaryenExpressionRef exp = BinaryenExpressionRef_val(_exp); - uint32_t val = Int_val(_value); - BinaryenDataDropSetSegment(exp, val); +caml_binaryen_data_drop_set_segment(value _expr, value _segment) { + CAMLparam2(_expr, _segment); + BinaryenExpressionRef expr = BinaryenExpressionRef_val(_expr); + char* segment = Safe_String_val(_segment); + BinaryenDataDropSetSegment(expr, segment); CAMLreturn(Val_unit); } diff --git a/src/expression.js b/src/expression.js index 87a16332..b19c5ed3 100644 --- a/src/expression.js +++ b/src/expression.js @@ -457,7 +457,7 @@ function caml_binaryen_memory_init( memoryName ) { return wasm_mod.memory.init( - segment, + caml_jsstring_of_string(segment), dest, offset, size, @@ -478,8 +478,9 @@ function caml_binaryen_memory_init__bytecode() { } //Provides: caml_binaryen_data_drop +//Requires: caml_jsstring_of_string function caml_binaryen_data_drop(wasm_mod, segment) { - return wasm_mod.data.drop(segment); + return wasm_mod.data.drop(caml_jsstring_of_string(segment)); } //Provides: caml_binaryen_memory_copy @@ -1493,14 +1494,16 @@ function caml_binaryen_return_set_value(exp, value) { //Provides: caml_binaryen_memory_init_get_segment //Requires: Binaryen -function caml_binaryen_memory_init_get_segment(exp) { - return Binaryen.MemoryInit.getSegment(exp); +//Requires: caml_string_of_jsstring +function caml_binaryen_memory_init_get_segment(expr) { + return caml_string_of_jsstring(Binaryen.MemoryInit.getSegment(expr)); } //Provides: caml_binaryen_memory_init_set_segment //Requires: Binaryen -function caml_binaryen_memory_init_set_segment(exp, value) { - return Binaryen.MemoryInit.setSegment(exp, value); +//Requires: caml_jsstring_of_string +function caml_binaryen_memory_init_set_segment(expr, segment) { + return Binaryen.MemoryInit.setSegment(expr, caml_jsstring_of_string(segment)); } //Provides: caml_binaryen_memory_init_get_dest @@ -1541,14 +1544,16 @@ function caml_binaryen_memory_init_set_size(exp, value) { //Provides: caml_binaryen_data_drop_get_segment //Requires: Binaryen -function caml_binaryen_data_drop_get_segment(exp) { - return Binaryen.DataDrop.getSegment(exp); +//Requires: caml_string_of_jsstring +function caml_binaryen_data_drop_get_segment(expr) { + return caml_string_of_jsstring(Binaryen.DataDrop.getSegment(expr)); } //Provides: caml_binaryen_data_drop_set_segment //Requires: Binaryen -function caml_binaryen_data_drop_set_segment(exp, value) { - return Binaryen.DataDrop.setSegment(exp, value); +//Requires: caml_jsstring_of_string +function caml_binaryen_data_drop_set_segment(expr, segment) { + return Binaryen.DataDrop.setSegment(expr, caml_jsstring_of_string(segment)); } //Provides: caml_binaryen_memory_copy_get_dest diff --git a/src/expression.ml b/src/expression.ml index ac9d6d67..b0fceeec 100644 --- a/src/expression.ml +++ b/src/expression.ml @@ -703,15 +703,25 @@ module Memory_grow = struct end module Memory_init = struct - external make : Module.t -> int -> t -> t -> t -> string -> t + external make : Module.t -> string -> t -> t -> t -> string -> t = "caml_binaryen_memory_init__bytecode" "caml_binaryen_memory_init" (** Module, segment, destination, offset, size, memory_name *) - external get_segment : t -> int = "caml_binaryen_memory_init_get_segment" + (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *) + let make wasm_mod segment dest offset size memory_name = + make wasm_mod (string_of_int segment) dest offset size memory_name - external set_segment : t -> int -> unit + external get_segment : t -> string = "caml_binaryen_memory_init_get_segment" + + (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *) + let get_segment expr = int_of_string (get_segment expr) + + external set_segment : t -> string -> unit = "caml_binaryen_memory_init_set_segment" + (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *) + let set_segment expr segment = set_segment expr (string_of_int segment) + external get_dest : t -> t = "caml_binaryen_memory_init_get_dest" external set_dest : t -> t -> unit = "caml_binaryen_memory_init_set_dest" external get_offset : t -> t = "caml_binaryen_memory_init_get_offset" @@ -721,13 +731,22 @@ module Memory_init = struct end module Data_drop = struct - external make : Module.t -> int -> t = "caml_binaryen_data_drop" + external make : Module.t -> string -> t = "caml_binaryen_data_drop" (** Module, segment. *) - external get_segment : t -> int = "caml_binaryen_data_drop_get_segment" + (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *) + let make wasm_mod segment = make wasm_mod (string_of_int segment) - external set_segment : t -> int -> unit + external get_segment : t -> string = "caml_binaryen_data_drop_get_segment" + + (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *) + let get_segment expr = int_of_string (get_segment expr) + + external set_segment : t -> string -> unit = "caml_binaryen_data_drop_set_segment" + + (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *) + let set_segment expr segment = set_segment expr (string_of_int segment) end module Memory_copy = struct diff --git a/src/op.c b/src/op.c index cc63cec9..1b22510f 100644 --- a/src/op.c +++ b/src/op.c @@ -2303,9 +2303,9 @@ caml_binaryen_string_new_wtf8(value unit) { } CAMLprim value -caml_binaryen_string_new_replace(value unit) { +caml_binaryen_string_new_lossy_utf8(value unit) { CAMLparam1(unit); - BinaryenOp op = BinaryenStringNewReplace(); + BinaryenOp op = BinaryenStringNewLossyUTF8(); CAMLreturn(alloc_BinaryenOp(op)); } @@ -2331,9 +2331,9 @@ caml_binaryen_string_new_wtf8_array(value unit) { } CAMLprim value -caml_binaryen_string_new_replace_array(value unit) { +caml_binaryen_string_new_lossy_utf8_array(value unit) { CAMLparam1(unit); - BinaryenOp op = BinaryenStringNewReplaceArray(); + BinaryenOp op = BinaryenStringNewLossyUTF8Array(); CAMLreturn(alloc_BinaryenOp(op)); } @@ -2393,6 +2393,13 @@ caml_binaryen_string_encode_utf8(value unit) { CAMLreturn(alloc_BinaryenOp(op)); } +CAMLprim value +caml_binaryen_string_encode_lossy_utf8(value unit) { + CAMLparam1(unit); + BinaryenOp op = BinaryenStringEncodeLossyUTF8(); + CAMLreturn(alloc_BinaryenOp(op)); +} + CAMLprim value caml_binaryen_string_encode_wtf8(value unit) { CAMLparam1(unit); @@ -2414,6 +2421,13 @@ caml_binaryen_string_encode_utf8_array(value unit) { CAMLreturn(alloc_BinaryenOp(op)); } +CAMLprim value +caml_binaryen_string_encode_lossy_utf8_array(value unit) { + CAMLparam1(unit); + BinaryenOp op = BinaryenStringEncodeLossyUTF8Array(); + CAMLreturn(alloc_BinaryenOp(op)); +} + CAMLprim value caml_binaryen_string_encode_wtf8_array(value unit) { CAMLparam1(unit); diff --git a/src/op.js b/src/op.js index e52150d8..1a0f0dce 100644 --- a/src/op.js +++ b/src/op.js @@ -1966,10 +1966,10 @@ function caml_binaryen_string_new_wtf8() { return Binaryen.Operations.StringNewWTF8; } -//Provides: caml_binaryen_string_new_replace +//Provides: caml_binaryen_string_new_lossy_utf8 //Requires: Binaryen -function caml_binaryen_string_new_replace() { - return Binaryen.Operations.StringNewReplace; +function caml_binaryen_string_new_lossy_utf8() { + return Binaryen.Operations.StringNewLossyUTF8; } //Provides: caml_binaryen_string_new_wtf16 @@ -1990,10 +1990,10 @@ function caml_binaryen_string_new_wtf8_array() { return Binaryen.Operations.StringNewWTF8Array; } -//Provides: caml_binaryen_string_new_replace_array +//Provides: caml_binaryen_string_new_lossy_utf8_array //Requires: Binaryen -function caml_binaryen_string_new_replace_array() { - return Binaryen.Operations.StringNewReplaceArray; +function caml_binaryen_string_new_lossy_utf8_array() { + return Binaryen.Operations.StringNewLossyUTF8Array; } //Provides: caml_binaryen_string_new_wtf16_array @@ -2044,6 +2044,12 @@ function caml_binaryen_string_encode_utf8() { return Binaryen.Operations.StringEncodeUTF8; } +//Provides: caml_binaryen_string_encode_lossy_utf8 +//Requires: Binaryen +function caml_binaryen_string_encode_lossy_utf8() { + return Binaryen.Operations.StringEncodeLossyUTF8; +} + //Provides: caml_binaryen_string_encode_wtf8 //Requires: Binaryen function caml_binaryen_string_encode_wtf8() { @@ -2062,6 +2068,12 @@ function caml_binaryen_string_encode_utf8_array() { return Binaryen.Operations.StringEncodeUTF8Array; } +//Provides: caml_binaryen_string_encode_lossy_utf8_array +//Requires: Binaryen +function caml_binaryen_string_encode_lossy_utf8_array() { + return Binaryen.Operations.StringEncodeLossyUTF8Array; +} + //Provides: caml_binaryen_string_encode_wtf8_array //Requires: Binaryen function caml_binaryen_string_encode_wtf8_array() { diff --git a/src/op.ml b/src/op.ml index 8be9357f..b181265a 100644 --- a/src/op.ml +++ b/src/op.ml @@ -1366,9 +1366,10 @@ external string_new_wtf8 : unit -> t = "caml_binaryen_string_new_wtf8" let string_new_wtf8 = string_new_wtf8 () -external string_new_replace : unit -> t = "caml_binaryen_string_new_replace" +external string_new_lossy_utf8 : unit -> t + = "caml_binaryen_string_new_lossy_utf8" -let string_new_replace = string_new_replace () +let string_new_lossy_utf8 = string_new_lossy_utf8 () external string_new_wtf16 : unit -> t = "caml_binaryen_string_new_wtf16" @@ -1384,10 +1385,10 @@ external string_new_wtf8_array : unit -> t let string_new_wtf8_array = string_new_wtf8_array () -external string_new_replace_array : unit -> t - = "caml_binaryen_string_new_replace_array" +external string_new_lossy_utf8_array : unit -> t + = "caml_binaryen_string_new_lossy_utf8_array" -let string_new_replace_array = string_new_replace_array () +let string_new_lossy_utf8_array = string_new_lossy_utf8_array () external string_new_wtf16_array : unit -> t = "caml_binaryen_string_new_wtf16_array" @@ -1425,6 +1426,11 @@ external string_encode_utf8 : unit -> t = "caml_binaryen_string_encode_utf8" let string_encode_utf8 = string_encode_utf8 () +external string_encode_lossy_utf8 : unit -> t + = "caml_binaryen_string_encode_lossy_utf8" + +let string_encode_lossy_utf8 = string_encode_lossy_utf8 () + external string_encode_wtf8 : unit -> t = "caml_binaryen_string_encode_wtf8" let string_encode_wtf8 = string_encode_wtf8 () @@ -1438,6 +1444,11 @@ external string_encode_utf8_array : unit -> t let string_encode_utf8_array = string_encode_utf8_array () +external string_encode_lossy_utf8_array : unit -> t + = "caml_binaryen_string_encode_lossy_utf8_array" + +let string_encode_lossy_utf8_array = string_encode_lossy_utf8_array () + external string_encode_wtf8_array : unit -> t = "caml_binaryen_string_encode_wtf8_array" diff --git a/src/op.mli b/src/op.mli index e15809d1..18eea0e9 100644 --- a/src/op.mli +++ b/src/op.mli @@ -328,22 +328,24 @@ val br_on_cast : t val br_on_cast_fail : t val string_new_utf8 : t val string_new_wtf8 : t -val string_new_replace : t +val string_new_lossy_utf8 : t val string_new_wtf16 : t val string_new_utf8_array : t val string_new_wtf8_array : t -val string_new_replace_array : t val string_new_wtf16_array : t val string_new_from_code_point : t val string_measure_utf8 : t val string_measure_wtf8 : t +val string_new_lossy_utf8_array : t val string_measure_wtf16 : t val string_measure_is_usv : t val string_measure_wtf16_view : t val string_encode_utf8 : t +val string_encode_lossy_utf8 : t val string_encode_wtf8 : t val string_encode_wtf16 : t val string_encode_utf8_array : t +val string_encode_lossy_utf8_array : t val string_encode_wtf8_array : t val string_encode_wtf16_array : t val string_as_wtf8 : t diff --git a/src/passes.ml b/src/passes.ml index 4d2cd93b..92f1aa3f 100644 --- a/src/passes.ml +++ b/src/passes.ml @@ -330,7 +330,7 @@ let signature_pruning = "signature-pruning" (** apply more specific subtypes to signature types where possible *) let signature_refining = "signature-refining" -(** lower sign-ext operations to wasm mvp *) +(** lower sign-ext operations to wasm mvp and disable the sign extension feature *) let signext_lowering = "signext-lowering" (** miscellaneous globals-related optimizations *) diff --git a/src/type_system.c b/src/type_system.c deleted file mode 100644 index 0bb7ae05..00000000 --- a/src/type_system.c +++ /dev/null @@ -1,34 +0,0 @@ -#define CAML_NAME_SPACE -#include -#include -#include - -#include "binaryen-c.h" -#include "ocaml_helpers.h" - - -CAMLprim value -caml_binaryen_type_system_nominal(value unit) { - CAMLparam1(unit); - CAMLreturn(Val_int(BinaryenTypeSystemNominal())); -} - -CAMLprim value -caml_binaryen_type_system_isorecursive(value unit) { - CAMLparam1(unit); - CAMLreturn(Val_int(BinaryenTypeSystemIsorecursive())); -} - -CAMLprim value -caml_binaryen_get_type_system(value unit) { - CAMLparam1(unit); - CAMLreturn(Val_int(BinaryenGetTypeSystem())); -} - -CAMLprim value -caml_binaryen_set_type_system(value _typeSystem) { - CAMLparam1(_typeSystem); - BinaryenTypeSystem typeSystem = Int_val(_typeSystem); - BinaryenSetTypeSystem(typeSystem); - CAMLreturn(Val_unit); -} diff --git a/src/type_system.js b/src/type_system.js deleted file mode 100644 index 928a21da..00000000 --- a/src/type_system.js +++ /dev/null @@ -1,23 +0,0 @@ -//Provides: caml_binaryen_type_system_nominal -//Requires: Binaryen -function caml_binaryen_type_system_nominal() { - return Binaryen._BinaryenTypeSystemNominal(); -} - -//Provides: caml_binaryen_type_system_isorecursive -//Requires: Binaryen -function caml_binaryen_type_system_isorecursive() { - return Binaryen._BinaryenTypeSystemIsorecursive(); -} - -//Provides: caml_binaryen_get_type_system -//Requires: Binaryen -function caml_binaryen_get_type_system() { - return Binaryen._BinaryenGetTypeSystem(); -} - -//Provides: caml_binaryen_set_type_system -//Requires: Binaryen -function caml_binaryen_set_type_system(typeSystem) { - Binaryen._BinaryenSetTypeSystem(typeSystem); -} diff --git a/src/type_system.ml b/src/type_system.ml deleted file mode 100644 index d44e6b04..00000000 --- a/src/type_system.ml +++ /dev/null @@ -1,6 +0,0 @@ -type t = int - -external nominal : unit -> t = "caml_binaryen_type_system_nominal" -external isorecursive : unit -> t = "caml_binaryen_type_system_isorecursive" -external get_type_system : unit -> t = "caml_binaryen_get_type_system" -external set_type_system : t -> unit = "caml_binaryen_set_type_system" diff --git a/src/type_system.mli b/src/type_system.mli deleted file mode 100644 index 490817ad..00000000 --- a/src/type_system.mli +++ /dev/null @@ -1,6 +0,0 @@ -type t - -val nominal : unit -> t -val isorecursive : unit -> t -val get_type_system : unit -> t -val set_type_system : t -> unit diff --git a/test/test.expected b/test/test.expected index 0a5aaf5c..d65130c2 100644 --- a/test/test.expected +++ b/test/test.expected @@ -16,8 +16,8 @@ (global $max_int64_mut (mut i64) (i64.const 9223372036854775807)) (global $test_float64_bits f64 (f64.const 1.23)) (memory $0 1) - (data (i32.const 0) "hello") - (data "world") + (data $0 (i32.const 0) "hello") + (data $1 "world") (table $table 1 1 funcref) (elem $elem (i32.const 0) $adder) (export "adder" (func $adder)) @@ -44,7 +44,7 @@ ) (func $start (type $none_=>_none) (block $start - (memory.init 1 + (memory.init $1 (i32.const 2048) (i32.const 0) (i32.const 5) @@ -73,8 +73,8 @@ (type $anyref_=>_i32 (func (param anyref) (result i32))) (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32))) (memory $0 1) - (data (i32.const 0) "hello") - (data "world") + (data $0 (i32.const 0) "hello") + (data $1 "world") (table $table 1 1 funcref) (elem $elem (i32.const 0) $adder) (export "adder" (func $adder)) @@ -94,7 +94,7 @@ ) ) (func $start (type $none_=>_none) (; has Stack IR ;) - (memory.init 1 + (memory.init $1 (i32.const 2048) (i32.const 0) (i32.const 5) @@ -121,10 +121,10 @@ (type $type$3 (func (param anyref) (result i32))) (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32))) (memory $0 1) - (data (i32.const 0) "hello") - (data "world") + (data $0 (i32.const 0) "hello") + (data $1 "world") (table $0 1 1 funcref) - (elem (i32.const 0) $0) + (elem $0 (i32.const 0) $0) (export "adder" (func $0)) (export "memory" (memory $0)) (export "hello" (func $2)) @@ -142,7 +142,7 @@ ) ) (func $1 (type $type$2) - (memory.init 1 + (memory.init $1 (i32.const 2048) (i32.const 0) (i32.const 5) @@ -169,10 +169,10 @@ (type $type$3 (func (param anyref) (result i32))) (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32))) (memory $0 1) - (data (i32.const 0) "hello") - (data "world") + (data $0 (i32.const 0) "hello") + (data $1 "world") (table $0 1 1 funcref) - (elem (i32.const 0) $0) + (elem $0 (i32.const 0) $0) (export "adder" (func $0)) (export "memory" (memory $0)) (export "hello" (func $2)) @@ -190,7 +190,7 @@ i32.const 2048 i32.const 0 i32.const 5 - memory.init $0 1 + memory.init $0 $1 i32.const 3 i32.const 5 call $0