diff --git a/.github/workflows/esy.yml b/.github/workflows/esy.yml index c7bb3ea7..49605229 100644 --- a/.github/workflows/esy.yml +++ b/.github/workflows/esy.yml @@ -16,7 +16,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + # Using macos-14 because of clang 17 issues with macos-15 + os: [ubuntu-latest, macos-14, windows-latest] steps: - name: Setup node.js diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 2132cb71..d6b5dbf5 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -16,7 +16,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + # Using macos-14 because of clang 17 issues with macos-15 + os: [ubuntu-latest, macos-14, windows-latest] ocaml-compiler: [4.13.1, 4.14.1, 5.3.0] steps: diff --git a/binaryen.opam b/binaryen.opam index 25033cba..15af8e19 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" {>= "6.0.0" < "7.0.0"} - "libbinaryen" {>= "116.0.0" < "117.0.0"} + "libbinaryen" {>= "117.0.0" < "118.0.0"} ] diff --git a/dune b/dune index f8bf205e..f9475a6e 100644 --- a/dune +++ b/dune @@ -1 +1,3 @@ (dirs :standard) + +(data_only_dirs node_modules) \ No newline at end of file diff --git a/esy.lock/index.json b/esy.lock/index.json index a98378b1..89826574 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,15 +1,15 @@ { - "checksum": "027362814c85d00422b9f9ff4957739b", + "checksum": "f150996d99d7bdf0a7cacece63729c01", "root": "@grain/binaryen.ml@link-dev:./package.json", "node": { - "ocaml@4.14.1000@d41d8cd9": { - "id": "ocaml@4.14.1000@d41d8cd9", + "ocaml@5.3.0@d41d8cd9": { + "id": "ocaml@5.3.0@d41d8cd9", "name": "ocaml", - "version": "4.14.1000", + "version": "5.3.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.14.1000.tgz#sha1:e38fabe6bcf42774bd2340e67a8803ee7cebdb9f" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-5.3.0.tgz#sha1:3b0a65035064f52cbd5b522920cf2dcac165d081" ] }, "overrides": [], @@ -34,38 +34,38 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.18.2@22ffdaaa", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/xdg@opam:3.18.2@9ea0452b": { - "id": "@opam/xdg@opam:3.18.2@9ea0452b", + "@opam/xdg@opam:3.20.1@f7610fee": { + "id": "@opam/xdg@opam:3.20.1@f7610fee", "name": "@opam/xdg", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "xdg", - "version": "3.18.2", - "path": "esy.lock/opam/xdg.3.18.2" + "version": "3.20.1", + "path": "esy.lock/opam/xdg.3.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, @@ -87,13 +87,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.8@eb5a05af", + "ocaml@5.3.0@d41d8cd9", "@opam/topkg@opam:1.1.0@fa72996d", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@opam/cmdliner@opam:1.3.0@8e6dd99f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], "available": "true" }, "@opam/uuseg@opam:16.0.0@bd0df457": { @@ -114,15 +114,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", - "@opam/uucp@opam:16.0.0@ded5dcba", "@opam/topkg@opam:1.0.8@eb5a05af", + "ocaml@5.3.0@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", + "@opam/uucp@opam:16.0.0@ded5dcba", "@opam/topkg@opam:1.1.0@fa72996d", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@opam/cmdliner@opam:1.3.0@8e6dd99f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uucp@opam:16.0.0@ded5dcba" + "ocaml@5.3.0@d41d8cd9", "@opam/uucp@opam:16.0.0@ded5dcba" ], "available": "true" }, @@ -144,71 +144,71 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.8@eb5a05af", + "ocaml@5.3.0@d41d8cd9", "@opam/topkg@opam:1.1.0@fa72996d", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@opam/cmdliner@opam:1.3.0@8e6dd99f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], "available": "true" }, - "@opam/topkg@opam:1.0.8@eb5a05af": { - "id": "@opam/topkg@opam:1.0.8@eb5a05af", + "@opam/topkg@opam:1.1.0@fa72996d": { + "id": "@opam/topkg@opam:1.1.0@fa72996d", "name": "@opam/topkg", - "version": "opam:1.0.8", + "version": "opam:1.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/4b/4b632b60137852bb72ff9c8cdc2e16ac5ece6473569e50963fef9c1e800a0933a516bea1107b04011645afa4a1e78893c82dbce0aa8de2970d4d6c6d0dd2fe02#sha512:4b632b60137852bb72ff9c8cdc2e16ac5ece6473569e50963fef9c1e800a0933a516bea1107b04011645afa4a1e78893c82dbce0aa8de2970d4d6c6d0dd2fe02", - "archive:https://erratique.ch/software/topkg/releases/topkg-1.0.8.tbz#sha512:4b632b60137852bb72ff9c8cdc2e16ac5ece6473569e50963fef9c1e800a0933a516bea1107b04011645afa4a1e78893c82dbce0aa8de2970d4d6c6d0dd2fe02" + "archive:https://opam.ocaml.org/cache/sha512/34/34d22ae5b6bd166dd4a601a7d12d89c336684b3c56d7c7f481b40837eab263616cc3a6e6f63602f3d4a7d53c911967bf261de6c1ac205341b98a9838e5ea7aeb#sha512:34d22ae5b6bd166dd4a601a7d12d89c336684b3c56d7c7f481b40837eab263616cc3a6e6f63602f3d4a7d53c911967bf261de6c1ac205341b98a9838e5ea7aeb", + "archive:https://erratique.ch/software/topkg/releases/topkg-1.1.0.tbz#sha512:34d22ae5b6bd166dd4a601a7d12d89c336684b3c56d7c7f481b40837eab263616cc3a6e6f63602f3d4a7d53c911967bf261de6c1ac205341b98a9838e5ea7aeb" ], "opam": { "name": "topkg", - "version": "1.0.8", - "path": "esy.lock/opam/topkg.1.0.8" + "version": "1.1.0", + "path": "esy.lock/opam/topkg.1.1.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", + "ocaml@5.3.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.16.1@b3fc8209" + "ocaml@5.3.0@d41d8cd9", "@opam/ocamlbuild@opam:0.16.1@b3fc8209" ], "available": "true" }, - "@opam/stdune@opam:3.18.2@6ef2b9da": { - "id": "@opam/stdune@opam:3.18.2@6ef2b9da", + "@opam/stdune@opam:3.20.1@59b52636": { + "id": "@opam/stdune@opam:3.20.1@59b52636", "name": "@opam/stdune", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "stdune", - "version": "3.18.2", - "path": "esy.lock/opam/stdune.3.18.2" + "version": "3.20.1", + "path": "esy.lock/opam/stdune.3.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", - "@opam/ordering@opam:3.18.2@cc34282d", - "@opam/dyn@opam:3.18.2@64502832", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.20.1@ca3410cd", + "@opam/dyn@opam:3.20.1@ff1448f6", "@opam/dune@opam:3.20.1@93cb995a", "@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:2.0.0@2177bbde", - "@opam/ordering@opam:3.18.2@cc34282d", - "@opam/dyn@opam:3.18.2@64502832", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.20.1@ca3410cd", + "@opam/dyn@opam:3.20.1@ff1448f6", "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ], @@ -232,41 +232,41 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/stdio@opam:v0.16.0@a75c1ca1": { - "id": "@opam/stdio@opam:v0.16.0@a75c1ca1", + "@opam/stdio@opam:v0.17.0@def6a62f": { + "id": "@opam/stdio@opam:v0.17.0@def6a62f", "name": "@opam/stdio", - "version": "opam:v0.16.0", + "version": "opam:v0.17.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/61/61f0b75950614ac5378c6ec0d822cce6463402d919d5810b736fc46522b3a73e#sha256:61f0b75950614ac5378c6ec0d822cce6463402d919d5810b736fc46522b3a73e", - "archive:https://ocaml.janestreet.com/ocaml-core/v0.16/files/stdio-v0.16.0.tar.gz#sha256:61f0b75950614ac5378c6ec0d822cce6463402d919d5810b736fc46522b3a73e" + "archive:https://opam.ocaml.org/cache/sha256/e7/e7cb473d4bffcf419f307c658cf2599fab03a2b4fe655bfd0be699f8f7af176e#sha256:e7cb473d4bffcf419f307c658cf2599fab03a2b4fe655bfd0be699f8f7af176e", + "archive:https://github.com/janestreet/stdio/archive/refs/tags/v0.17.0.tar.gz#sha256:e7cb473d4bffcf419f307c658cf2599fab03a2b4fe655bfd0be699f8f7af176e" ], "opam": { "name": "stdio", - "version": "v0.16.0", - "path": "esy.lock/opam/stdio.v0.16.0" + "version": "v0.17.0", + "path": "esy.lock/opam/stdio.v0.17.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", - "@opam/base@opam:v0.16.4@3136f8f0", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", + "@opam/base@opam:v0.17.3@78923773", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", - "@opam/base@opam:v0.16.4@3136f8f0" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", + "@opam/base@opam:v0.17.3@78923773" ], - "available": "true" + "available": "arch != \"x86_32\"" }, "@opam/spawn@opam:v0.17.0@d0f69739": { "id": "@opam/spawn@opam:v0.17.0@d0f69739", @@ -286,39 +286,39 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "os != \"freebsd\"" }, - "@opam/sexplib0@opam:v0.16.0@c0ffad0c": { - "id": "@opam/sexplib0@opam:v0.16.0@c0ffad0c", + "@opam/sexplib0@opam:v0.17.0@75dcb697": { + "id": "@opam/sexplib0@opam:v0.17.0@75dcb697", "name": "@opam/sexplib0", - "version": "opam:v0.16.0", + "version": "opam:v0.17.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d#sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d", - "archive:https://ocaml.janestreet.com/ocaml-core/v0.16/files/sexplib0-v0.16.0.tar.gz#sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d" + "archive:https://opam.ocaml.org/cache/md5/ab/abafe8fd1d6302e55a315f4d78960d2a#md5:abafe8fd1d6302e55a315f4d78960d2a", + "archive:https://github.com/janestreet/sexplib0/archive/refs/tags/v0.17.0.tar.gz#md5:abafe8fd1d6302e55a315f4d78960d2a" ], "opam": { "name": "sexplib0", - "version": "v0.16.0", - "path": "esy.lock/opam/sexplib0.v0.16.0" + "version": "v0.17.0", + "path": "esy.lock/opam/sexplib0.v0.17.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], - "available": "true" + "available": "arch != \"x86_32\"" }, "@opam/seq@opam:base@5ed5af70": { "id": "@opam/seq@opam:base@5ed5af70", @@ -335,9 +335,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], "extraSources": [ { "checksum": "sha256:e95062b4d0519ef8335c02f7d0f1952d11b814c7ab7e6d566a206116162fa2be", @@ -352,146 +352,122 @@ ], "available": "true" }, - "@opam/sedlex@opam:3.4@e7b319cd": { - "id": "@opam/sedlex@opam:3.4@e7b319cd", + "@opam/sedlex@opam:3.6@2bdd809f": { + "id": "@opam/sedlex@opam:3.6@2bdd809f", "name": "@opam/sedlex", - "version": "opam:3.4", + "version": "opam:3.6", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/5c/5c655398261226dd99b1231df3f729e1#md5:5c655398261226dd99b1231df3f729e1", - "archive:https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.4.tar.gz#md5:5c655398261226dd99b1231df3f729e1" + "archive:https://opam.ocaml.org/cache/md5/ad/ad2d0ec91d20171d3a7161a0cc0c2e6a#md5:ad2d0ec91d20171d3a7161a0cc0c2e6a", + "archive:https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.6.tar.gz#md5:ad2d0ec91d20171d3a7161a0cc0c2e6a" ], "opam": { "name": "sedlex", - "version": "3.4", - "path": "esy.lock/opam/sedlex.3.4" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.18.2@22ffdaaa", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.18.2@22ffdaaa" - ], - "available": "true" - }, - "@opam/result@opam:1.5@5a755845": { - "id": "@opam/result@opam:1.5@5a755845", - "name": "@opam/result", - "version": "opam:1.5", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/7c/7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32#sha256:7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32", - "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#sha256:7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32" - ], - "opam": { - "name": "result", - "version": "1.5", - "path": "esy.lock/opam/result.1.5" + "version": "3.6", + "path": "esy.lock/opam/sedlex.3.6" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", + "@opam/ppxlib@opam:0.37.0~5.4preview@c06b32d1", + "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", + "@opam/ppxlib@opam:0.37.0~5.4preview@c06b32d1", + "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/re@opam:1.12.0@42f7a5b9": { - "id": "@opam/re@opam:1.12.0@42f7a5b9", + "@opam/re@opam:1.13.2@97f82df6": { + "id": "@opam/re@opam:1.13.2@97f82df6", "name": "@opam/re", - "version": "opam:1.12.0", + "version": "opam:1.13.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/a0/a01f2bf22f72c2f4ababd8d3e7635e35c1bf6bc5a41ad6d5a007454ddabad1d4#sha256:a01f2bf22f72c2f4ababd8d3e7635e35c1bf6bc5a41ad6d5a007454ddabad1d4", - "archive:https://github.com/ocaml/ocaml-re/releases/download/1.12.0/re-1.12.0.tbz#sha256:a01f2bf22f72c2f4ababd8d3e7635e35c1bf6bc5a41ad6d5a007454ddabad1d4" + "archive:https://opam.ocaml.org/cache/md5/df/df37d9787450525a2182ce4364048d11#md5:df37d9787450525a2182ce4364048d11", + "archive:https://github.com/ocaml/ocaml-re/archive/refs/tags/1.13.2.tar.gz#md5:df37d9787450525a2182ce4364048d11" ], "opam": { "name": "re", - "version": "1.12.0", - "path": "esy.lock/opam/re.1.12.0" + "version": "1.13.2", + "path": "esy.lock/opam/re.1.13.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.18.2@22ffdaaa", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/ppxlib@opam:0.35.0@8cd01f8f": { - "id": "@opam/ppxlib@opam:0.35.0@8cd01f8f", + "@opam/ppxlib@opam:0.37.0~5.4preview@c06b32d1": { + "id": "@opam/ppxlib@opam:0.37.0~5.4preview@c06b32d1", "name": "@opam/ppxlib", - "version": "opam:0.35.0", + "version": "opam:0.37.0~5.4preview", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d9/d9d959fc9f84260487e45684dc741898a92fc5506b61a7f5cac65d21832db925#sha256:d9d959fc9f84260487e45684dc741898a92fc5506b61a7f5cac65d21832db925", - "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.35.0/ppxlib-0.35.0.tbz#sha256:d9d959fc9f84260487e45684dc741898a92fc5506b61a7f5cac65d21832db925" + "archive:https://opam.ocaml.org/cache/sha256/89/89a98c95ddd0bfbac17b5a936f6811af7097be3258c482d5859b73e9de9b4552#sha256:89a98c95ddd0bfbac17b5a936f6811af7097be3258c482d5859b73e9de9b4552", + "archive:https://github.com/ocaml-ppx/ppxlib/archive/757f6c284b1fe748d5027eef3bbef924b6bbd7ce.tar.gz#sha256:89a98c95ddd0bfbac17b5a936f6811af7097be3258c482d5859b73e9de9b4552" ], "opam": { "name": "ppxlib", - "version": "0.35.0", - "path": "esy.lock/opam/ppxlib.0.35.0" + "version": "0.37.0~5.4preview", + "path": "esy.lock/opam/ppxlib.0.37.0~5.4preview" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/sexplib0@opam:v0.16.0@c0ffad0c", + "ocaml@5.3.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/sexplib0@opam:v0.17.0@75dcb697", "@opam/ppx_derivers@opam:1.2.1@d78727cd", - "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", - "@opam/dune@opam:3.18.2@22ffdaaa", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", + "@opam/dune@opam:3.20.1@93cb995a", "@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", + "ocaml@5.3.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/sexplib0@opam:v0.17.0@75dcb697", "@opam/ppx_derivers@opam:1.2.1@d78727cd", - "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", - "@opam/dune@opam:3.18.2@22ffdaaa" + "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", + "@opam/dune@opam:3.20.1@93cb995a" ], - "available": "true" + "available": "opam-version >= \"2.1.0\"" }, - "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c": { - "id": "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e": { + "id": "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", "name": "@opam/ppx_yojson_conv_lib", - "version": "opam:v0.16.0", + "version": "opam:v0.17.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/55/557c43c88d365b4cbb514d809f1eecc54d7b9976b0669bc55b02169e6c86ec7d#sha256:557c43c88d365b4cbb514d809f1eecc54d7b9976b0669bc55b02169e6c86ec7d", - "archive:https://ocaml.janestreet.com/ocaml-core/v0.16/files/ppx_yojson_conv_lib-v0.16.0.tar.gz#sha256:557c43c88d365b4cbb514d809f1eecc54d7b9976b0669bc55b02169e6c86ec7d" + "archive:https://opam.ocaml.org/cache/sha256/f6/f6e6ee92408c53c5ecd8bb5ae93811aa4cf71f8dc144d5943be8fc2c7697b199#sha256:f6e6ee92408c53c5ecd8bb5ae93811aa4cf71f8dc144d5943be8fc2c7697b199", + "archive:https://github.com/janestreet/ppx_yojson_conv_lib/archive/refs/tags/v0.17.0.tar.gz#sha256:f6e6ee92408c53c5ecd8bb5ae93811aa4cf71f8dc144d5943be8fc2c7697b199" ], "opam": { "name": "ppx_yojson_conv_lib", - "version": "v0.16.0", - "path": "esy.lock/opam/ppx_yojson_conv_lib.v0.16.0" + "version": "v0.17.0", + "path": "esy.lock/opam/ppx_yojson_conv_lib.v0.17.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/dune@opam:3.18.2@22ffdaaa", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/dune@opam:3.20.1@93cb995a" ], - "available": "true" + "available": "arch != \"arm32\" & arch != \"x86_32\"" }, "@opam/ppx_derivers@opam:1.2.1@d78727cd": { "id": "@opam/ppx_derivers@opam:1.2.1@d78727cd", @@ -511,11 +487,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, @@ -537,125 +513,37 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/ordering@opam:3.18.2@cc34282d": { - "id": "@opam/ordering@opam:3.18.2@cc34282d", + "@opam/ordering@opam:3.20.1@ca3410cd": { + "id": "@opam/ordering@opam:3.20.1@ca3410cd", "name": "@opam/ordering", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "ordering", - "version": "3.18.2", - "path": "esy.lock/opam/ordering.3.18.2" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" - ], - "available": "true" - }, - "@opam/omd@opam:1.3.2@f6edb8b8": { - "id": "@opam/omd@opam:1.3.2@f6edb8b8", - "name": "@opam/omd", - "version": "opam:1.3.2", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/60/6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb#sha256:6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb", - "archive:https://github.com/ocaml/opam-source-archives/raw/main/omd-1.3.2.tbz#sha256:6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb" - ], - "opam": { - "name": "omd", - "version": "1.3.2", - "path": "esy.lock/opam/omd.1.3.2" + "version": "3.20.1", + "path": "esy.lock/opam/ordering.3.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", - "@opam/base-bytes@opam:base@785dbd33", - "@opam/base-bigarray@opam:base@b03491b0", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", - "@opam/base-bytes@opam:base@785dbd33", - "@opam/base-bigarray@opam:base@b03491b0" - ], - "available": "true" - }, - "@opam/odoc-parser@opam:2.0.0@a08011a0": { - "id": "@opam/odoc-parser@opam:2.0.0@a08011a0", - "name": "@opam/odoc-parser", - "version": "opam:2.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/40/407919fbb0eb95761d6fc6ec6777628d94aa1907343bdca678b1880bafb33922#sha256:407919fbb0eb95761d6fc6ec6777628d94aa1907343bdca678b1880bafb33922", - "archive:https://github.com/ocaml-doc/odoc-parser/releases/download/2.0.0/odoc-parser-2.0.0.tbz#sha256:407919fbb0eb95761d6fc6ec6777628d94aa1907343bdca678b1880bafb33922" - ], - "opam": { - "name": "odoc-parser", - "version": "2.0.0", - "path": "esy.lock/opam/odoc-parser.2.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", - "@opam/dune@opam:3.18.2@22ffdaaa", - "@opam/camlp-streams@opam:5.0.1@8e96208c", - "@opam/astring@opam:0.8.5@9975798d", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", - "@opam/dune@opam:3.18.2@22ffdaaa", - "@opam/camlp-streams@opam:5.0.1@8e96208c", - "@opam/astring@opam:0.8.5@9975798d" - ], - "available": "true" - }, - "@opam/octavius@opam:1.2.2@558886f0": { - "id": "@opam/octavius@opam:1.2.2@558886f0", - "name": "@opam/octavius", - "version": "opam:1.2.2", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/ea/eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad#sha256:eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad", - "archive:https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz#sha256:eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad" - ], - "opam": { - "name": "octavius", - "version": "1.2.2", - "path": "esy.lock/opam/octavius.1.2.2" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, @@ -677,15 +565,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", - "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/cmdliner@opam:1.3.0@8e6dd99f", "@opam/base-bytes@opam:base@785dbd33", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", - "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/cmdliner@opam:1.3.0@8e6dd99f", "@opam/base-bytes@opam:base@785dbd33" ], @@ -709,68 +597,102 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4" ], "available": "true" }, - "@opam/ocamlformat@opam:0.24.1@01d7df0f": { - "id": "@opam/ocamlformat@opam:0.24.1@01d7df0f", - "name": "@opam/ocamlformat", - "version": "opam:0.24.1", + "@opam/ocamlformat-lib@opam:0.27.0@09e368b0": { + "id": "@opam/ocamlformat-lib@opam:0.27.0@09e368b0", + "name": "@opam/ocamlformat-lib", + "version": "opam:0.27.0", "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/dd/ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15#sha256:ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz#sha256:ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15" ], "opam": { - "name": "ocamlformat", - "version": "0.24.1", - "path": "esy.lock/opam/ocamlformat.0.24.1" + "name": "ocamlformat-lib", + "version": "0.27.0", + "path": "esy.lock/opam/ocamlformat-lib.0.27.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", + "ocaml@5.3.0@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", "@opam/uuseg@opam:16.0.0@bd0df457", - "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.12.0@42f7a5b9", - "@opam/odoc-parser@opam:2.0.0@a08011a0", + "@opam/stdio@opam:v0.17.0@def6a62f", "@opam/ocp-indent@opam:1.7.0@3e255333", - "@opam/ocaml-version@opam:3.5.0@6bef55f5", - "@opam/menhirSdk@opam:20240715@9d924351", - "@opam/menhirLib@opam:20240715@3e1794bd", - "@opam/menhir@opam:20240715@454ed5d1", + "@opam/ocaml-version@opam:4.0.1@84d2095c", + "@opam/menhirSdk@opam:20250903@d7606d7f", + "@opam/menhirLib@opam:20250903@c570fdd9", + "@opam/menhir@opam:20250903@67d43732", "@opam/fpath@opam:0.7.3@d817a3b5", "@opam/fix@opam:20250428@7c1e7279", "@opam/either@opam:1.0.0@378fa7c4", - "@opam/dune-build-info@opam:3.18.2@f9322e25", - "@opam/dune@opam:3.18.2@22ffdaaa", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/dune-build-info@opam:3.20.1@7f0bb260", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/cmdliner@opam:1.3.0@8e6dd99f", - "@opam/base@opam:v0.16.4@3136f8f0", + "@opam/camlp-streams@opam:5.0.1@8e96208c", + "@opam/base@opam:v0.17.3@78923773", + "@opam/astring@opam:0.8.5@9975798d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", + "ocaml@5.3.0@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", "@opam/uuseg@opam:16.0.0@bd0df457", - "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.12.0@42f7a5b9", - "@opam/odoc-parser@opam:2.0.0@a08011a0", + "@opam/stdio@opam:v0.17.0@def6a62f", "@opam/ocp-indent@opam:1.7.0@3e255333", - "@opam/ocaml-version@opam:3.5.0@6bef55f5", - "@opam/menhirSdk@opam:20240715@9d924351", - "@opam/menhirLib@opam:20240715@3e1794bd", - "@opam/menhir@opam:20240715@454ed5d1", + "@opam/ocaml-version@opam:4.0.1@84d2095c", + "@opam/menhirSdk@opam:20250903@d7606d7f", + "@opam/menhirLib@opam:20250903@c570fdd9", + "@opam/menhir@opam:20250903@67d43732", "@opam/fpath@opam:0.7.3@d817a3b5", "@opam/fix@opam:20250428@7c1e7279", "@opam/either@opam:1.0.0@378fa7c4", - "@opam/dune-build-info@opam:3.18.2@f9322e25", - "@opam/dune@opam:3.18.2@22ffdaaa", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/dune-build-info@opam:3.20.1@7f0bb260", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/cmdliner@opam:1.3.0@8e6dd99f", + "@opam/camlp-streams@opam:5.0.1@8e96208c", + "@opam/base@opam:v0.17.3@78923773", + "@opam/astring@opam:0.8.5@9975798d" + ], + "available": "true" + }, + "@opam/ocamlformat@opam:0.27.0@c40d4612": { + "id": "@opam/ocamlformat@opam:0.27.0@c40d4612", + "name": "@opam/ocamlformat", + "version": "opam:0.27.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/dd/ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15#sha256:ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz#sha256:ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15" + ], + "opam": { + "name": "ocamlformat", + "version": "0.27.0", + "path": "esy.lock/opam/ocamlformat.0.27.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/re@opam:1.13.2@97f82df6", + "@opam/ocamlformat-lib@opam:0.27.0@09e368b0", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/cmdliner@opam:1.3.0@8e6dd99f", - "@opam/base@opam:v0.16.4@3136f8f0" + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/re@opam:1.13.2@97f82df6", + "@opam/ocamlformat-lib@opam:0.27.0@09e368b0", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/cmdliner@opam:1.3.0@8e6dd99f" ], "available": "true" }, @@ -796,9 +718,36 @@ } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], + "available": "true" + }, + "@opam/ocamlc-loc@opam:3.20.1@c2b17e45": { + "id": "@opam/ocamlc-loc@opam:3.20.1@c2b17e45", + "name": "@opam/ocamlc-loc", + "version": "opam:3.20.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + ], + "opam": { + "name": "ocamlc-loc", + "version": "3.20.1", + "path": "esy.lock/opam/ocamlc-loc.3.20.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/dyn@opam:3.20.1@ff1448f6", + "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/dyn@opam:3.20.1@ff1448f6", + "@opam/dune@opam:3.20.1@93cb995a" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], "available": "true" }, "@opam/ocamlbuild@opam:0.16.1@b3fc8209": { @@ -819,263 +768,385 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], "available": "true" }, - "@opam/ocaml-version@opam:3.5.0@6bef55f5": { - "id": "@opam/ocaml-version@opam:3.5.0@6bef55f5", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73": { + "id": "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73", + "name": "@opam/ocaml_intrinsics_kernel", + "version": "opam:v0.17.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/56/56ed7d0b0331e5bcfa4e016515c0267d#md5:56ed7d0b0331e5bcfa4e016515c0267d", + "archive:https://github.com/janestreet/ocaml_intrinsics_kernel/archive/refs/tags/v0.17.1.tar.gz#md5:56ed7d0b0331e5bcfa4e016515c0267d" + ], + "opam": { + "name": "ocaml_intrinsics_kernel", + "version": "v0.17.1", + "path": "esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" + ], + "available": "arch != \"x86_32\"" + }, + "@opam/ocaml-version@opam:4.0.1@84d2095c": { + "id": "@opam/ocaml-version@opam:4.0.1@84d2095c", "name": "@opam/ocaml-version", - "version": "opam:3.5.0", + "version": "opam:4.0.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d6/d63ca1c3970d6b14057f7176bfdae623e6c0176287c6a6e8b78cf50e2f7f635b#sha256:d63ca1c3970d6b14057f7176bfdae623e6c0176287c6a6e8b78cf50e2f7f635b", - "archive:https://github.com/ocurrent/ocaml-version/releases/download/v3.5.0/ocaml-version-3.5.0.tbz#sha256:d63ca1c3970d6b14057f7176bfdae623e6c0176287c6a6e8b78cf50e2f7f635b" + "archive:https://opam.ocaml.org/cache/md5/7a/7ac431b54bf48cc4340885acb37143fa#md5:7ac431b54bf48cc4340885acb37143fa", + "archive:https://github.com/ocurrent/ocaml-version/releases/download/v4.0.1/ocaml-version-4.0.1.tbz#md5:7ac431b54bf48cc4340885acb37143fa" ], "opam": { "name": "ocaml-version", - "version": "3.5.0", - "path": "esy.lock/opam/ocaml-version.3.5.0" + "version": "4.0.1", + "path": "esy.lock/opam/ocaml-version.4.0.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770": { - "id": "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", + "@opam/ocaml-lsp-server@opam:1.23.0@98a3c46c": { + "id": "@opam/ocaml-lsp-server@opam:1.23.0@98a3c46c", "name": "@opam/ocaml-lsp-server", - "version": "opam:1.12.4", + "version": "opam:1.23.0", "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/7f/7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d#sha256:7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz#sha256:7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d" ], "opam": { "name": "ocaml-lsp-server", - "version": "1.12.4", - "path": "esy.lock/opam/ocaml-lsp-server.1.12.4" + "version": "1.23.0", + "path": "esy.lock/opam/ocaml-lsp-server.1.23.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/xdg@opam:3.18.2@9ea0452b", "@opam/uutf@opam:1.0.4@ba7fbef7", - "@opam/stdune@opam:3.18.2@6ef2b9da", - "@opam/spawn@opam:v0.17.0@d0f69739", "@opam/re@opam:1.12.0@42f7a5b9", - "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", + "ocaml@5.3.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/xdg@opam:3.20.1@f7610fee", + "@opam/stdune@opam:3.20.1@59b52636", + "@opam/spawn@opam:v0.17.0@d0f69739", "@opam/re@opam:1.13.2@97f82df6", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", "@opam/pp@opam:2.0.0@2177bbde", - "@opam/ordering@opam:3.18.2@cc34282d", - "@opam/omd@opam:1.3.2@f6edb8b8", - "@opam/octavius@opam:1.2.2@558886f0", + "@opam/ordering@opam:3.20.1@ca3410cd", "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", - "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.18.2@64502832", - "@opam/dune-rpc@opam:3.18.2@909599fa", - "@opam/dune-build-info@opam:3.18.2@f9322e25", - "@opam/dune@opam:3.18.2@22ffdaaa", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.18.2@7a8c460b", + "@opam/ocamlc-loc@opam:3.20.1@c2b17e45", + "@opam/merlin-lib@opam:5.5-503@dae82f4f", + "@opam/lsp@opam:1.23.0@357ceff8", + "@opam/jsonrpc@opam:1.23.0@5a7f1eb5", + "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.20.1@ff1448f6", + "@opam/dune-rpc@opam:3.20.1@82e49d41", + "@opam/dune-build-info@opam:3.20.1@7f0bb260", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/chrome-trace@opam:3.20.1@0375ded6", + "@opam/camlp-streams@opam:5.0.1@8e96208c", + "@opam/base@opam:v0.17.3@78923773", + "@opam/astring@opam:0.8.5@9975798d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/xdg@opam:3.18.2@9ea0452b", "@opam/uutf@opam:1.0.4@ba7fbef7", - "@opam/stdune@opam:3.18.2@6ef2b9da", - "@opam/spawn@opam:v0.17.0@d0f69739", "@opam/re@opam:1.12.0@42f7a5b9", - "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", + "ocaml@5.3.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/xdg@opam:3.20.1@f7610fee", + "@opam/stdune@opam:3.20.1@59b52636", + "@opam/spawn@opam:v0.17.0@d0f69739", "@opam/re@opam:1.13.2@97f82df6", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", "@opam/pp@opam:2.0.0@2177bbde", - "@opam/ordering@opam:3.18.2@cc34282d", - "@opam/omd@opam:1.3.2@f6edb8b8", - "@opam/octavius@opam:1.2.2@558886f0", + "@opam/ordering@opam:3.20.1@ca3410cd", "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", - "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.18.2@64502832", - "@opam/dune-rpc@opam:3.18.2@909599fa", - "@opam/dune-build-info@opam:3.18.2@f9322e25", - "@opam/dune@opam:3.18.2@22ffdaaa", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.18.2@7a8c460b" + "@opam/ocamlc-loc@opam:3.20.1@c2b17e45", + "@opam/merlin-lib@opam:5.5-503@dae82f4f", + "@opam/lsp@opam:1.23.0@357ceff8", + "@opam/jsonrpc@opam:1.23.0@5a7f1eb5", + "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.20.1@ff1448f6", + "@opam/dune-rpc@opam:3.20.1@82e49d41", + "@opam/dune-build-info@opam:3.20.1@7f0bb260", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/chrome-trace@opam:3.20.1@0375ded6", + "@opam/camlp-streams@opam:5.0.1@8e96208c", + "@opam/base@opam:v0.17.3@78923773", + "@opam/astring@opam:0.8.5@9975798d" ], "available": "true" }, - "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1": { - "id": "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede": { + "id": "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", "name": "@opam/ocaml-compiler-libs", - "version": "opam:v0.12.4", + "version": "opam:v0.17.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4e/4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760#sha256:4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760", - "archive:https://github.com/janestreet/ocaml-compiler-libs/releases/download/v0.12.4/ocaml-compiler-libs-v0.12.4.tbz#sha256:4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760" + "archive:https://opam.ocaml.org/cache/md5/aa/aaf66efea8752475c25a942443579b41#md5:aaf66efea8752475c25a942443579b41", + "archive:https://github.com/janestreet/ocaml-compiler-libs/archive/refs/tags/v0.17.0.tar.gz#md5:aaf66efea8752475c25a942443579b41" ], "opam": { "name": "ocaml-compiler-libs", - "version": "v0.12.4", - "path": "esy.lock/opam/ocaml-compiler-libs.v0.12.4" + "version": "v0.17.0", + "path": "esy.lock/opam/ocaml-compiler-libs.v0.17.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/menhirSdk@opam:20240715@9d924351": { - "id": "@opam/menhirSdk@opam:20240715@9d924351", + "@opam/merlin-lib@opam:5.5-503@dae82f4f": { + "id": "@opam/merlin-lib@opam:5.5-503@dae82f4f", + "name": "@opam/merlin-lib", + "version": "opam:5.5-503", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/67/67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1#sha256:67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1", + "archive:https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz#sha256:67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1" + ], + "opam": { + "name": "merlin-lib", + "version": "5.5-503", + "path": "esy.lock/opam/merlin-lib.5.5-503" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", + "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", + "@opam/csexp@opam:1.5.2@46614bf4" + ], + "available": "true" + }, + "@opam/menhirSdk@opam:20250903@d7606d7f": { + "id": "@opam/menhirSdk@opam:20250903@d7606d7f", "name": "@opam/menhirSdk", - "version": "opam:20240715", + "version": "opam:20250903", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/d3/d39a8943fe1be28199e5ec1f4133504c#md5:d39a8943fe1be28199e5ec1f4133504c", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz#md5:d39a8943fe1be28199e5ec1f4133504c" + "archive:https://opam.ocaml.org/cache/md5/5e/5ecb7f71cf374147d3d3137c6e2fe382#md5:5ecb7f71cf374147d3d3137c6e2fe382", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20250903/archive.tar.gz#md5:5ecb7f71cf374147d3d3137c6e2fe382" ], "opam": { "name": "menhirSdk", - "version": "20240715", - "path": "esy.lock/opam/menhirSdk.20240715" + "version": "20250903", + "path": "esy.lock/opam/menhirSdk.20250903" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/menhirLib@opam:20240715@3e1794bd": { - "id": "@opam/menhirLib@opam:20240715@3e1794bd", + "@opam/menhirLib@opam:20250903@c570fdd9": { + "id": "@opam/menhirLib@opam:20250903@c570fdd9", "name": "@opam/menhirLib", - "version": "opam:20240715", + "version": "opam:20250903", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/d3/d39a8943fe1be28199e5ec1f4133504c#md5:d39a8943fe1be28199e5ec1f4133504c", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz#md5:d39a8943fe1be28199e5ec1f4133504c" + "archive:https://opam.ocaml.org/cache/md5/5e/5ecb7f71cf374147d3d3137c6e2fe382#md5:5ecb7f71cf374147d3d3137c6e2fe382", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20250903/archive.tar.gz#md5:5ecb7f71cf374147d3d3137c6e2fe382" ], "opam": { "name": "menhirLib", - "version": "20240715", - "path": "esy.lock/opam/menhirLib.20240715" + "version": "20250903", + "path": "esy.lock/opam/menhirLib.20250903" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/menhirCST@opam:20240715@b768dcc7": { - "id": "@opam/menhirCST@opam:20240715@b768dcc7", + "@opam/menhirCST@opam:20250903@9102b9a9": { + "id": "@opam/menhirCST@opam:20250903@9102b9a9", "name": "@opam/menhirCST", - "version": "opam:20240715", + "version": "opam:20250903", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/d3/d39a8943fe1be28199e5ec1f4133504c#md5:d39a8943fe1be28199e5ec1f4133504c", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz#md5:d39a8943fe1be28199e5ec1f4133504c" + "archive:https://opam.ocaml.org/cache/md5/5e/5ecb7f71cf374147d3d3137c6e2fe382#md5:5ecb7f71cf374147d3d3137c6e2fe382", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20250903/archive.tar.gz#md5:5ecb7f71cf374147d3d3137c6e2fe382" ], "opam": { "name": "menhirCST", - "version": "20240715", - "path": "esy.lock/opam/menhirCST.20240715" + "version": "20250903", + "path": "esy.lock/opam/menhirCST.20250903" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/menhir@opam:20240715@454ed5d1": { - "id": "@opam/menhir@opam:20240715@454ed5d1", + "@opam/menhir@opam:20250903@67d43732": { + "id": "@opam/menhir@opam:20250903@67d43732", "name": "@opam/menhir", - "version": "opam:20240715", + "version": "opam:20250903", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/d3/d39a8943fe1be28199e5ec1f4133504c#md5:d39a8943fe1be28199e5ec1f4133504c", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz#md5:d39a8943fe1be28199e5ec1f4133504c" + "archive:https://opam.ocaml.org/cache/md5/5e/5ecb7f71cf374147d3d3137c6e2fe382#md5:5ecb7f71cf374147d3d3137c6e2fe382", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20250903/archive.tar.gz#md5:5ecb7f71cf374147d3d3137c6e2fe382" ], "opam": { "name": "menhir", - "version": "20240715", - "path": "esy.lock/opam/menhir.20240715" + "version": "20250903", + "path": "esy.lock/opam/menhir.20250903" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/menhirSdk@opam:20250903@d7606d7f", + "@opam/menhirLib@opam:20250903@c570fdd9", + "@opam/menhirCST@opam:20250903@9102b9a9", + "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/menhirSdk@opam:20250903@d7606d7f", + "@opam/menhirLib@opam:20250903@c570fdd9", + "@opam/menhirCST@opam:20250903@9102b9a9", + "@opam/dune@opam:3.20.1@93cb995a" + ], + "available": "true" + }, + "@opam/lsp@opam:1.23.0@357ceff8": { + "id": "@opam/lsp@opam:1.23.0@357ceff8", + "name": "@opam/lsp", + "version": "opam:1.23.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/7f/7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d#sha256:7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz#sha256:7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d" + ], + "opam": { + "name": "lsp", + "version": "1.23.0", + "path": "esy.lock/opam/lsp.1.23.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20240715@9d924351", - "@opam/menhirLib@opam:20240715@3e1794bd", - "@opam/menhirCST@opam:20240715@b768dcc7", - "@opam/dune@opam:3.18.2@22ffdaaa", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/uutf@opam:1.0.4@ba7fbef7", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", + "@opam/jsonrpc@opam:1.23.0@5a7f1eb5", + "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20240715@9d924351", - "@opam/menhirLib@opam:20240715@3e1794bd", - "@opam/menhirCST@opam:20240715@b768dcc7", - "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/uutf@opam:1.0.4@ba7fbef7", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", + "@opam/jsonrpc@opam:1.23.0@5a7f1eb5", + "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8": { - "id": "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8", + "@opam/jsonrpc@opam:1.23.0@5a7f1eb5": { + "id": "@opam/jsonrpc@opam:1.23.0@5a7f1eb5", + "name": "@opam/jsonrpc", + "version": "opam:1.23.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/7f/7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d#sha256:7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz#sha256:7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d" + ], + "opam": { + "name": "jsonrpc", + "version": "1.23.0", + "path": "esy.lock/opam/jsonrpc.1.23.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" + ], + "available": "true" + }, + "@opam/js_of_ocaml-compiler@opam:6.2.0@45dd83ba": { + "id": "@opam/js_of_ocaml-compiler@opam:6.2.0@45dd83ba", "name": "@opam/js_of_ocaml-compiler", - "version": "opam:6.0.1", + "version": "opam:6.2.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/81/813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614#sha256:813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614", - "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/6.0.1/js_of_ocaml-6.0.1.tbz#sha256:813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614" + "archive:https://opam.ocaml.org/cache/sha256/7c/7cc641778d1b172a352a88333ee0e8c621365a0acfcd9b87e38bfddb8dd2a5da#sha256:7cc641778d1b172a352a88333ee0e8c621365a0acfcd9b87e38bfddb8dd2a5da", + "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/6.2.0/js_of_ocaml-6.2.0.tbz#sha256:7cc641778d1b172a352a88333ee0e8c621365a0acfcd9b87e38bfddb8dd2a5da" ], "opam": { "name": "js_of_ocaml-compiler", - "version": "6.0.1", - "path": "esy.lock/opam/js_of_ocaml-compiler.6.0.1" + "version": "6.2.0", + "path": "esy.lock/opam/js_of_ocaml-compiler.6.2.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/sedlex@opam:3.4@e7b319cd", - "@opam/ppxlib@opam:0.35.0@8cd01f8f", + "ocaml@5.3.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/sedlex@opam:3.6@2bdd809f", + "@opam/ppxlib@opam:0.37.0~5.4preview@c06b32d1", "@opam/ocamlfind@opam:1.9.8@ee910ff5", - "@opam/menhirSdk@opam:20240715@9d924351", - "@opam/menhirLib@opam:20240715@3e1794bd", - "@opam/menhir@opam:20240715@454ed5d1", - "@opam/dune@opam:3.18.2@22ffdaaa", + "@opam/menhirSdk@opam:20250903@d7606d7f", + "@opam/menhirLib@opam:20250903@c570fdd9", + "@opam/menhir@opam:20250903@67d43732", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/cmdliner@opam:1.3.0@8e6dd99f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/sedlex@opam:3.4@e7b319cd", - "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/menhirSdk@opam:20240715@9d924351", - "@opam/menhirLib@opam:20240715@3e1794bd", - "@opam/menhir@opam:20240715@454ed5d1", - "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/sedlex@opam:3.6@2bdd809f", + "@opam/ppxlib@opam:0.37.0~5.4preview@c06b32d1", + "@opam/menhirSdk@opam:20250903@d7606d7f", + "@opam/menhirLib@opam:20250903@c570fdd9", + "@opam/menhir@opam:20250903@67d43732", + "@opam/dune@opam:3.20.1@93cb995a", "@opam/cmdliner@opam:1.3.0@8e6dd99f" ], "available": "true" @@ -1098,12 +1169,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.18.2@22ffdaaa", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, @@ -1125,14 +1196,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.8@eb5a05af", + "ocaml@5.3.0@d41d8cd9", "@opam/topkg@opam:1.1.0@fa72996d", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@opam/astring@opam:0.8.5@9975798d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/astring@opam:0.8.5@9975798d" + "ocaml@5.3.0@d41d8cd9", "@opam/astring@opam:0.8.5@9975798d" ], "available": "true" }, @@ -1154,11 +1225,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, @@ -1180,13 +1251,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.18.2@6ef2b9da", - "@opam/dyn@opam:3.18.2@64502832", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/stdune@opam:3.20.1@59b52636", + "@opam/dyn@opam:3.20.1@ff1448f6", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.18.2@6ef2b9da", - "@opam/dyn@opam:3.18.2@64502832", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/stdune@opam:3.20.1@59b52636", + "@opam/dyn@opam:3.20.1@ff1448f6", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, @@ -1208,156 +1279,158 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/dyn@opam:3.18.2@64502832": { - "id": "@opam/dyn@opam:3.18.2@64502832", + "@opam/dyn@opam:3.20.1@ff1448f6": { + "id": "@opam/dyn@opam:3.20.1@ff1448f6", "name": "@opam/dyn", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "dyn", - "version": "3.18.2", - "path": "esy.lock/opam/dyn.3.18.2" + "version": "3.20.1", + "path": "esy.lock/opam/dyn.3.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", - "@opam/ordering@opam:3.18.2@cc34282d", - "@opam/dune@opam:3.18.2@22ffdaaa", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.20.1@ca3410cd", + "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", - "@opam/ordering@opam:3.18.2@cc34282d", - "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.20.1@ca3410cd", + "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/dune-rpc@opam:3.18.2@909599fa": { - "id": "@opam/dune-rpc@opam:3.18.2@909599fa", + "@opam/dune-rpc@opam:3.20.1@82e49d41": { + "id": "@opam/dune-rpc@opam:3.20.1@82e49d41", "name": "@opam/dune-rpc", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "dune-rpc", - "version": "3.18.2", - "path": "esy.lock/opam/dune-rpc.3.18.2" + "version": "3.20.1", + "path": "esy.lock/opam/dune-rpc.3.20.1" } }, "overrides": [], "dependencies": [ - "@opam/xdg@opam:3.18.2@9ea0452b", - "@opam/stdune@opam:3.18.2@6ef2b9da", "@opam/pp@opam:2.0.0@2177bbde", - "@opam/ordering@opam:3.18.2@cc34282d", - "@opam/dyn@opam:3.18.2@64502832", "@opam/dune@opam:3.18.2@22ffdaaa", + "@opam/xdg@opam:3.20.1@f7610fee", + "@opam/stdune@opam:3.20.1@59b52636", "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.20.1@ca3410cd", + "@opam/ocamlc-loc@opam:3.20.1@c2b17e45", + "@opam/dyn@opam:3.20.1@ff1448f6", "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/xdg@opam:3.18.2@9ea0452b", - "@opam/stdune@opam:3.18.2@6ef2b9da", "@opam/pp@opam:2.0.0@2177bbde", - "@opam/ordering@opam:3.18.2@cc34282d", - "@opam/dyn@opam:3.18.2@64502832", "@opam/dune@opam:3.18.2@22ffdaaa", + "@opam/xdg@opam:3.20.1@f7610fee", + "@opam/stdune@opam:3.20.1@59b52636", "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.20.1@ca3410cd", + "@opam/ocamlc-loc@opam:3.20.1@c2b17e45", + "@opam/dyn@opam:3.20.1@ff1448f6", "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4" ], "available": "true" }, - "@opam/dune-configurator@opam:3.18.2@ea6c19df": { - "id": "@opam/dune-configurator@opam:3.18.2@ea6c19df", + "@opam/dune-configurator@opam:3.20.1@173e43ec": { + "id": "@opam/dune-configurator@opam:3.20.1@173e43ec", "name": "@opam/dune-configurator", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "dune-configurator", - "version": "3.18.2", - "path": "esy.lock/opam/dune-configurator.3.18.2" + "version": "3.20.1", + "path": "esy.lock/opam/dune-configurator.3.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@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.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ], "available": "true" }, - "@opam/dune-build-info@opam:3.18.2@f9322e25": { - "id": "@opam/dune-build-info@opam:3.18.2@f9322e25", + "@opam/dune-build-info@opam:3.20.1@7f0bb260": { + "id": "@opam/dune-build-info@opam:3.20.1@7f0bb260", "name": "@opam/dune-build-info", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "dune-build-info", - "version": "3.18.2", - "path": "esy.lock/opam/dune-build-info.3.18.2" + "version": "3.20.1", + "path": "esy.lock/opam/dune-build-info.3.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/dune@opam:3.18.2@22ffdaaa": { - "id": "@opam/dune@opam:3.18.2@22ffdaaa", + "@opam/dune@opam:3.20.1@93cb995a": { + "id": "@opam/dune@opam:3.20.1@93cb995a", "name": "@opam/dune", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "dune", - "version": "3.18.2", - "path": "esy.lock/opam/dune.3.18.2" + "version": "3.20.1", + "path": "esy.lock/opam/dune.3.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@5.3.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@5.3.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ], "available": "true" @@ -1380,22 +1453,22 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, - "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9": { - "id": "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9", + "@opam/conf-cmake@github:grain-lang/cmake:esy.json#dbb594e3fd388ac94262c133a35f280d7630d806@d41d8cd9": { + "id": "@opam/conf-cmake@github:grain-lang/cmake:esy.json#dbb594e3fd388ac94262c133a35f280d7630d806@d41d8cd9", "name": "@opam/conf-cmake", - "version": "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", + "version": "github:grain-lang/cmake:esy.json#dbb594e3fd388ac94262c133a35f280d7630d806", "source": { "type": "install", "source": [ - "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d" + "github:grain-lang/cmake:esy.json#dbb594e3fd388ac94262c133a35f280d7630d806" ] }, "overrides": [], @@ -1420,34 +1493,34 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], "available": "true" }, - "@opam/chrome-trace@opam:3.18.2@7a8c460b": { - "id": "@opam/chrome-trace@opam:3.18.2@7a8c460b", + "@opam/chrome-trace@opam:3.20.1@0375ded6": { + "id": "@opam/chrome-trace@opam:3.20.1@0375ded6", "name": "@opam/chrome-trace", - "version": "opam:3.18.2", + "version": "opam:3.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/56/56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af", - "archive:https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz#sha256:56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" + "archive:https://opam.ocaml.org/cache/sha256/f0/f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a", + "archive:https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz#sha256:f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" ], "opam": { "name": "chrome-trace", - "version": "3.18.2", - "path": "esy.lock/opam/chrome-trace.3.18.2" + "version": "3.20.1", + "path": "esy.lock/opam/chrome-trace.3.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, @@ -1469,11 +1542,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa", + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/dune@opam:3.20.1@93cb995a" ], "available": "true" }, @@ -1528,60 +1601,44 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", + "ocaml@5.3.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5" + "ocaml@5.3.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5" ], "available": "true" }, - "@opam/base-bigarray@opam:base@b03491b0": { - "id": "@opam/base-bigarray@opam:base@b03491b0", - "name": "@opam/base-bigarray", - "version": "opam:base", - "source": { - "type": "install", - "source": [ "no-source:" ], - "opam": { - "name": "base-bigarray", - "version": "base", - "path": "esy.lock/opam/base-bigarray.base" - } - }, - "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [], - "available": "true" - }, - "@opam/base@opam:v0.16.4@3136f8f0": { - "id": "@opam/base@opam:v0.16.4@3136f8f0", + "@opam/base@opam:v0.17.3@78923773": { + "id": "@opam/base@opam:v0.17.3@78923773", "name": "@opam/base", - "version": "opam:v0.16.4", + "version": "opam:v0.17.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/17/1716b735b93c9d068dd9790bb40d6562#md5:1716b735b93c9d068dd9790bb40d6562", - "archive:https://github.com/janestreet/base/archive/refs/tags/v0.16.4.tar.gz#md5:1716b735b93c9d068dd9790bb40d6562" + "archive:https://opam.ocaml.org/cache/md5/21/2100b0ed13fecf43be86ed45c5b2cc4d#md5:2100b0ed13fecf43be86ed45c5b2cc4d", + "archive:https://github.com/janestreet/base/archive/refs/tags/v0.17.3.tar.gz#md5:2100b0ed13fecf43be86ed45c5b2cc4d" ], "opam": { "name": "base", - "version": "v0.16.4", - "path": "esy.lock/opam/base.v0.16.4" + "version": "v0.17.3", + "path": "esy.lock/opam/base.v0.17.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", - "@opam/dune-configurator@opam:3.18.2@ea6c19df", - "@opam/dune@opam:3.18.2@22ffdaaa", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73", + "@opam/dune-configurator@opam:3.20.1@173e43ec", + "@opam/dune@opam:3.20.1@93cb995a", "@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.18.2@ea6c19df", - "@opam/dune@opam:3.18.2@22ffdaaa" + "ocaml@5.3.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73", + "@opam/dune-configurator@opam:3.20.1@173e43ec", + "@opam/dune@opam:3.20.1@93cb995a" ], - "available": "true" + "available": "arch != \"arm32\" & arch != \"x86_32\"" }, "@opam/astring@opam:0.8.5@9975798d": { "id": "@opam/astring@opam:0.8.5@9975798d", @@ -1601,33 +1658,32 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.8@eb5a05af", + "ocaml@5.3.0@d41d8cd9", "@opam/topkg@opam:1.1.0@fa72996d", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], "available": "true" }, - "@grain/libbinaryen@116.0.0@d41d8cd9": { - "id": "@grain/libbinaryen@116.0.0@d41d8cd9", + "@grain/libbinaryen@github:spotandjake/libbinaryen:package.json#59bc7b8fb9d2ef4795b0f8805cacedd90e9f3937@d41d8cd9": { + "id": "@grain/libbinaryen@github:spotandjake/libbinaryen:package.json#59bc7b8fb9d2ef4795b0f8805cacedd90e9f3937@d41d8cd9", "name": "@grain/libbinaryen", - "version": "116.0.0", + "version": "github:spotandjake/libbinaryen:package.json#59bc7b8fb9d2ef4795b0f8805cacedd90e9f3937", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-116.0.0.tgz#sha1:32d4124accc5936dbf9706a0f2aac0df9eefaae5" + "github:spotandjake/libbinaryen:package.json#59bc7b8fb9d2ef4795b0f8805cacedd90e9f3937" ] }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.18.2@ea6c19df", - "@opam/dune@opam:3.18.2@22ffdaaa", - "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", + "@opam/dune-configurator@opam:3.20.1@173e43ec", + "@opam/dune@opam:3.20.1@93cb995a", + "@opam/conf-cmake@github:grain-lang/cmake:esy.json#dbb594e3fd388ac94262c133a35f280d7630d806@d41d8cd9" ], - "devDependencies": [], - "installConfig": { "pnp": false } + "devDependencies": [] }, "@grain/binaryen.ml@link-dev:./package.json": { "id": "@grain/binaryen.ml@link-dev:./package.json", @@ -1640,15 +1696,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.18.2@ea6c19df", - "@opam/dune@opam:3.18.2@22ffdaaa", - "@grain/libbinaryen@116.0.0@d41d8cd9" + "ocaml@5.3.0@d41d8cd9", + "@opam/dune-configurator@opam:3.20.1@173e43ec", + "@opam/dune@opam:3.20.1@93cb995a", + "@grain/libbinaryen@github:spotandjake/libbinaryen:package.json#59bc7b8fb9d2ef4795b0f8805cacedd90e9f3937@d41d8cd9" ], "devDependencies": [ - "@opam/ocamlformat@opam:0.24.1@01d7df0f", - "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", - "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8" + "@opam/ocamlformat@opam:0.27.0@c40d4612", + "@opam/ocaml-lsp-server@opam:1.23.0@98a3c46c", + "@opam/js_of_ocaml-compiler@opam:6.2.0@45dd83ba" ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { diff --git a/esy.lock/opam/base-bigarray.base/opam b/esy.lock/opam/base-bigarray.base/opam deleted file mode 100644 index 39e9af21..00000000 --- a/esy.lock/opam/base-bigarray.base/opam +++ /dev/null @@ -1,6 +0,0 @@ -opam-version: "2.0" -maintainer: "https://github.com/ocaml/opam-repository/issues" -description: """ -Bigarray library distributed with the OCaml compiler -""" - diff --git a/esy.lock/opam/base.v0.16.4/opam b/esy.lock/opam/base.v0.17.3/opam similarity index 70% rename from esy.lock/opam/base.v0.16.4/opam rename to esy.lock/opam/base.v0.17.3/opam index ee271f4d..76d5609f 100644 --- a/esy.lock/opam/base.v0.16.4/opam +++ b/esy.lock/opam/base.v0.17.3/opam @@ -10,11 +10,13 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.14.0"} - "sexplib0" {>= "v0.16" & < "v0.17"} - "dune" {>= "2.0.0"} + "ocaml" {>= "5.1.0"} + "ocaml_intrinsics_kernel" {>= "v0.17.0" & < "v0.18.0"} + "sexplib0" {>= "v0.17.0" & < "v0.18.0"} + "dune" {>= "3.11.0"} "dune-configurator" ] +available: arch != "arm32" & arch != "x86_32" synopsis: "Full standard library replacement for OCaml" description: " Full standard library replacement for OCaml @@ -31,9 +33,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.4.tar.gz" + src: "https://github.com/janestreet/base/archive/refs/tags/v0.17.3.tar.gz" checksum: [ - "md5=1716b735b93c9d068dd9790bb40d6562" - "sha512=ab1bf389889dda97235a76782858521256ab65290831c1234781bc4b3ec8186680616f64b922b0c9dfd11b2ed46e0be9e9b8778904a97ef5f849132b925fd210" + "md5=2100b0ed13fecf43be86ed45c5b2cc4d" + "sha512=628610caff7e124631870fa1e29661caac28bdfdb18750ee43b868037da3d65d6dd9023b4be7c4c52405679efb5e865a6632d95606a22b28a36636a6bf706ef3" ] } diff --git a/esy.lock/opam/chrome-trace.3.18.2/opam b/esy.lock/opam/chrome-trace.3.20.1/opam similarity index 68% rename from esy.lock/opam/chrome-trace.3.18.2/opam rename to esy.lock/opam/chrome-trace.3.20.1/opam index 1630d99a..d1831fa8 100644 --- a/esy.lock/opam/chrome-trace.3.18.2/opam +++ b/esy.lock/opam/chrome-trace.3.20.1/opam @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.12"} + "dune" {>= "3.20"} "ocaml" {>= "4.08.0"} "odoc" {with-doc} ] @@ -32,10 +32,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/dune-build-info.3.18.2/opam b/esy.lock/opam/dune-build-info.3.20.1/opam similarity index 74% rename from esy.lock/opam/dune-build-info.3.18.2/opam rename to esy.lock/opam/dune-build-info.3.20.1/opam index befb77d5..dc3daf8e 100644 --- a/esy.lock/opam/dune-build-info.3.18.2/opam +++ b/esy.lock/opam/dune-build-info.3.20.1/opam @@ -15,7 +15,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.12"} + "dune" {>= "3.20"} "ocaml" {>= "4.08"} "odoc" {with-doc} ] @@ -38,10 +38,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/dune-configurator.3.18.2/opam b/esy.lock/opam/dune-configurator.3.20.1/opam similarity index 74% rename from esy.lock/opam/dune-configurator.3.18.2/opam rename to esy.lock/opam/dune-configurator.3.20.1/opam index d2acc91b..6bd70caf 100644 --- a/esy.lock/opam/dune-configurator.3.18.2/opam +++ b/esy.lock/opam/dune-configurator.3.20.1/opam @@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.12"} + "dune" {>= "3.20"} "ocaml" {>= "4.08.0"} "base-unix" "csexp" {>= "1.5.0"} @@ -42,10 +42,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/dune-rpc.3.18.2/opam b/esy.lock/opam/dune-rpc.3.20.1/opam similarity index 68% rename from esy.lock/opam/dune-rpc.3.18.2/opam rename to esy.lock/opam/dune-rpc.3.20.1/opam index 33bbceb8..c634d6f4 100644 --- a/esy.lock/opam/dune-rpc.3.18.2/opam +++ b/esy.lock/opam/dune-rpc.3.20.1/opam @@ -8,7 +8,8 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.12"} + "dune" {>= "3.20"} + "ocamlc-loc" "csexp" "ordering" "dyn" @@ -36,10 +37,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/dune.3.18.2/opam b/esy.lock/opam/dune.3.20.1/opam similarity index 82% rename from esy.lock/opam/dune.3.18.2/opam rename to esy.lock/opam/dune.3.20.1/opam index 2de8defc..fc34bda6 100644 --- a/esy.lock/opam/dune.3.18.2/opam +++ b/esy.lock/opam/dune.3.20.1/opam @@ -30,7 +30,7 @@ conflicts: [ "ocaml-lsp-server" {< "1.3.0"} "dune-configurator" {< "2.3.0"} "odoc" {< "2.0.1"} - "dune-release" {< "1.3.0"} + "dune-release" {< "2.0.0"} "js_of_ocaml-compiler" {< "3.6.0"} "jbuilder" {= "transition"} ] @@ -49,13 +49,14 @@ depends: [ "lwt" { with-dev-setup & os != "win32" } "cinaps" { with-dev-setup } "csexp" { with-dev-setup & >= "1.3.0" } - "js_of_ocaml" { with-dev-setup & >= "6.0.1" & os != "win32" } - "js_of_ocaml-compiler" { with-dev-setup & >= "6.0.1" & os != "win32" } + "js_of_ocaml" { with-dev-setup & >= "6.1.0" & os != "win32" } + "js_of_ocaml-compiler" { with-dev-setup & >= "6.1.0" & os != "win32" } "mdx" { with-dev-setup & >= "2.3.0" & os != "win32" } "menhir" { with-dev-setup & os != "win32" } "ocamlfind" { with-dev-setup & os != "win32" } "odoc" { with-dev-setup & >= "2.4.0" & os != "win32" } "ppx_expect" { with-dev-setup & >= "v0.17" & os != "win32" } + "spawn" { with-dev-setup } "ppx_inline_test" { with-dev-setup & os != "win32" } "ppxlib" { with-dev-setup & >= "0.35.0" & os != "win32" } "ctypes" { with-dev-setup & os != "win32" } @@ -64,10 +65,10 @@ depends: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/dyn.3.18.2/opam b/esy.lock/opam/dyn.3.20.1/opam similarity index 64% rename from esy.lock/opam/dyn.3.18.2/opam rename to esy.lock/opam/dyn.3.20.1/opam index 89707a1d..88188e74 100644 --- a/esy.lock/opam/dyn.3.18.2/opam +++ b/esy.lock/opam/dyn.3.20.1/opam @@ -8,14 +8,14 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.12"} + "dune" {>= "3.20"} "ocaml" {>= "4.08.0"} "ordering" {= version} "pp" {>= "1.1.0"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" -x-maintenance-intent: ["(none)"] +x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -33,10 +33,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam b/esy.lock/opam/js_of_ocaml-compiler.6.2.0/opam similarity index 74% rename from esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam rename to esy.lock/opam/js_of_ocaml-compiler.6.2.0/opam index ed835fe8..0900f225 100644 --- a/esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam +++ b/esy.lock/opam/js_of_ocaml-compiler.6.2.0/opam @@ -11,11 +11,11 @@ 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.17"} - "ocaml" {>= "4.08" & < "5.4"} + "dune" {>= "3.19"} + "ocaml" {>= "4.13" & < "5.5"} "num" {with-test} "ppx_expect" {>= "v0.16.1" & with-test} - "ppxlib" {>= "0.15.0" & < "0.36.0"} + "ppxlib" {>= "0.35"} "re" {with-test} "cmdliner" {>= "1.1.0"} "sedlex" {>= "3.3"} @@ -32,8 +32,8 @@ conflicts: [ "js_of_ocaml" {< "3.0"} ] dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" +x-maintenance-intent: ["(latest)"] build: [ - ["dune" "subst"] {dev} [ "dune" "build" @@ -47,10 +47,10 @@ build: [ ] url { src: - "https://github.com/ocsigen/js_of_ocaml/releases/download/6.0.1/js_of_ocaml-6.0.1.tbz" + "https://github.com/ocsigen/js_of_ocaml/releases/download/6.2.0/js_of_ocaml-6.2.0.tbz" checksum: [ - "sha256=813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614" - "sha512=194ae5d1122171fa8253b6a41438a2fc330caf4ab6dd008fcce1253fd51fbe4b1149813da6075c5deb52ea136143def57c83c3f4e32421803d7699648fdc563b" + "sha256=7cc641778d1b172a352a88333ee0e8c621365a0acfcd9b87e38bfddb8dd2a5da" + "sha512=da50c79e1ad667df22abe03d0928ee135729c90cf09279e3c4854aec66557e8600890ca58f550529de1b1a44698720890b97528df167fd9e10cce24c71e763e6" ] } -x-commit-hash: "b6d60e4f8ff35e7c7b3bb52b97ffedc3eb8e3d08" +x-commit-hash: "938c18c46b78836119483d9cc9ce25ffdc44b718" diff --git a/esy.lock/opam/jsonrpc.1.23.0/opam b/esy.lock/opam/jsonrpc.1.23.0/opam new file mode 100644 index 00000000..d4327d2d --- /dev/null +++ b/esy.lock/opam/jsonrpc.1.23.0/opam @@ -0,0 +1,50 @@ +opam-version: "2.0" +synopsis: "Jsonrpc protocol implemenation" +description: "See https://www.jsonrpc.org/specification" +maintainer: ["Rudi Grinberg "] +authors: [ + "Andrey Popp <8mayday@gmail.com>" + "Rusty Key " + "Louis Roché " + "Oleksiy Golovko " + "Rudi Grinberg " + "Sacha Ayoun " + "cannorin " + "Ulugbek Abdullaev " + "Thibaut Mattio " + "Max Lantas " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "3.0"} + "ocaml" {>= "4.08"} + "odoc" {with-doc} +] +conflicts: [ "yojson" {>= "3.0.0"} ] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] + +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz" + checksum: [ + "sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d" + "sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e" + ] +} +x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50" diff --git a/esy.lock/opam/lsp.1.23.0/opam b/esy.lock/opam/lsp.1.23.0/opam new file mode 100644 index 00000000..6ab8c05b --- /dev/null +++ b/esy.lock/opam/lsp.1.23.0/opam @@ -0,0 +1,60 @@ +opam-version: "2.0" +synopsis: "LSP protocol implementation in OCaml" +description: """ + +Implementation of the LSP protocol in OCaml. It is designed to be as portable as +possible and does not make any assumptions about IO. +""" +maintainer: ["Rudi Grinberg "] +authors: [ + "Andrey Popp <8mayday@gmail.com>" + "Rusty Key " + "Louis Roché " + "Oleksiy Golovko " + "Rudi Grinberg " + "Sacha Ayoun " + "cannorin " + "Ulugbek Abdullaev " + "Thibaut Mattio " + "Max Lantas " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "3.0"} + "jsonrpc" {= version} + "yojson" {< "3.0.0"} + "ppx_yojson_conv_lib" {>= "v0.14"} + "cinaps" {with-test} + "ppx_expect" {>= "v0.17.0" & with-test} + "uutf" {>= "1.0.2"} + "odoc" {with-doc} + "ocaml" {>= "4.14"} + "ppx_yojson_conv" {with-dev-setup} +] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] + +x-maintenance-intent: [ "(latest)" ] +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.23.0/lsp-1.23.0.tbz" + checksum: [ + "sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d" + "sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e" + ] +} +x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50" diff --git a/esy.lock/opam/menhir.20240715/opam b/esy.lock/opam/menhir.20250903/opam similarity index 72% rename from esy.lock/opam/menhir.20240715/opam rename to esy.lock/opam/menhir.20250903/opam index b27bf538..db168c2d 100644 --- a/esy.lock/opam/menhir.20240715/opam +++ b/esy.lock/opam/menhir.20250903/opam @@ -22,9 +22,9 @@ depends: [ synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20250903/archive.tar.gz" checksum: [ - "md5=d39a8943fe1be28199e5ec1f4133504c" - "sha512=4f933cfc9026f5f2ffda9b0e626862560a233c35ecf097d179edd926d9009bdf46b6611294aea02b63c34427348568f37376a033fbe8cf98a7746fa6f1354dbd" + "md5=5ecb7f71cf374147d3d3137c6e2fe382" + "sha512=66393a5b9ba49baf65cac10ec85b0da16dfcf8e7cf55ffeb847b9339f310dfe65e2b3e2b33e215de7b074466adc7f0c43234f476f6fd31cab9fb75f71bd8b2ac" ] } diff --git a/esy.lock/opam/menhirCST.20240715/opam b/esy.lock/opam/menhirCST.20250903/opam similarity index 71% rename from esy.lock/opam/menhirCST.20240715/opam rename to esy.lock/opam/menhirCST.20250903/opam index 381585e9..49176177 100644 --- a/esy.lock/opam/menhirCST.20240715/opam +++ b/esy.lock/opam/menhirCST.20250903/opam @@ -21,9 +21,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20250903/archive.tar.gz" checksum: [ - "md5=d39a8943fe1be28199e5ec1f4133504c" - "sha512=4f933cfc9026f5f2ffda9b0e626862560a233c35ecf097d179edd926d9009bdf46b6611294aea02b63c34427348568f37376a033fbe8cf98a7746fa6f1354dbd" + "md5=5ecb7f71cf374147d3d3137c6e2fe382" + "sha512=66393a5b9ba49baf65cac10ec85b0da16dfcf8e7cf55ffeb847b9339f310dfe65e2b3e2b33e215de7b074466adc7f0c43234f476f6fd31cab9fb75f71bd8b2ac" ] } diff --git a/esy.lock/opam/menhirLib.20240715/opam b/esy.lock/opam/menhirLib.20250903/opam similarity index 73% rename from esy.lock/opam/menhirLib.20240715/opam rename to esy.lock/opam/menhirLib.20250903/opam index 14b68d29..3e1494f3 100644 --- a/esy.lock/opam/menhirLib.20240715/opam +++ b/esy.lock/opam/menhirLib.20250903/opam @@ -22,9 +22,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20250903/archive.tar.gz" checksum: [ - "md5=d39a8943fe1be28199e5ec1f4133504c" - "sha512=4f933cfc9026f5f2ffda9b0e626862560a233c35ecf097d179edd926d9009bdf46b6611294aea02b63c34427348568f37376a033fbe8cf98a7746fa6f1354dbd" + "md5=5ecb7f71cf374147d3d3137c6e2fe382" + "sha512=66393a5b9ba49baf65cac10ec85b0da16dfcf8e7cf55ffeb847b9339f310dfe65e2b3e2b33e215de7b074466adc7f0c43234f476f6fd31cab9fb75f71bd8b2ac" ] } diff --git a/esy.lock/opam/menhirSdk.20240715/opam b/esy.lock/opam/menhirSdk.20250903/opam similarity index 73% rename from esy.lock/opam/menhirSdk.20240715/opam rename to esy.lock/opam/menhirSdk.20250903/opam index d99be8a3..a524b7c9 100644 --- a/esy.lock/opam/menhirSdk.20240715/opam +++ b/esy.lock/opam/menhirSdk.20250903/opam @@ -22,9 +22,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20250903/archive.tar.gz" checksum: [ - "md5=d39a8943fe1be28199e5ec1f4133504c" - "sha512=4f933cfc9026f5f2ffda9b0e626862560a233c35ecf097d179edd926d9009bdf46b6611294aea02b63c34427348568f37376a033fbe8cf98a7746fa6f1354dbd" + "md5=5ecb7f71cf374147d3d3137c6e2fe382" + "sha512=66393a5b9ba49baf65cac10ec85b0da16dfcf8e7cf55ffeb847b9339f310dfe65e2b3e2b33e215de7b074466adc7f0c43234f476f6fd31cab9fb75f71bd8b2ac" ] } diff --git a/esy.lock/opam/merlin-lib.5.5-503/opam b/esy.lock/opam/merlin-lib.5.5-503/opam new file mode 100644 index 00000000..cd3043d0 --- /dev/null +++ b/esy.lock/opam/merlin-lib.5.5-503/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +license: "MIT" +x-maintenance-intent: ["(latest)"] +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>="5.3" & <"5.4"} + "dune" {>= "3.0.0"} + "csexp" {>= "1.5.1"} + "alcotest" {with-test & >= "1.3.0" } + "menhir" {dev & >= "20201216"} + "menhirLib" {dev & >= "20201216"} + "menhirSdk" {dev & >= "20201216"} +] +synopsis: + "Merlin's libraries" +description: + "These libraries provides access to low-level compiler interfaces and the + standard higher-level merlin protocol. The library is provided as-is, is not + thoroughly documented, and its public API might break with any new release." +url { + src: + "https://github.com/ocaml/merlin/releases/download/v5.5-503/merlin-5.5-503.tbz" + checksum: [ + "sha256=67da3b34f2fea07678267309f61da4a2c6f08298de0dc59655b8d30fd8269af1" + "sha512=1fb3b5180d36aa82b82a319e15b743b802b6888f0dc67645baafdb4e18dfc23a7b90064ec9bc42f7424061cf8cde7f8839178d8a8537bf4596759f3ff4891873" + ] +} +x-commit-hash: "8b88b89ee7431a23eaf95e4e02e45dc65595aa74" diff --git a/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam b/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam deleted file mode 100644 index a2df8c61..00000000 --- a/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml compiler libraries repackaged" -description: """ -This packages exposes the OCaml compiler libraries repackages under -the toplevel names Ocaml_common, Ocaml_bytecomp, Ocaml_optcomp, ...""" -maintainer: ["Jane Street developers"] -authors: ["Jane Street Group, LLC"] -license: "MIT" -homepage: "https://github.com/janestreet/ocaml-compiler-libs" -bug-reports: "https://github.com/janestreet/ocaml-compiler-libs/issues" -depends: [ - "dune" {>= "2.8"} - "ocaml" {>= "4.04.1" & < "5.2.0"} - "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/janestreet/ocaml-compiler-libs.git" -url { - src: - "https://github.com/janestreet/ocaml-compiler-libs/releases/download/v0.12.4/ocaml-compiler-libs-v0.12.4.tbz" - checksum: [ - "sha256=4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760" - "sha512=978dba8dfa61f98fa24fda7a9c26c2e837081f37d1685fe636dc19cfc3278a940cf01a10293504b185c406706bc1008bc54313d50f023bcdea6d5ac6c0788b35" - ] -} -x-commit-hash: "8cd12f18bb7171c2b67d661868c4271fae528d93" diff --git a/esy.lock/opam/ocaml-compiler-libs.v0.17.0/opam b/esy.lock/opam/ocaml-compiler-libs.v0.17.0/opam new file mode 100644 index 00000000..ec1b9b62 --- /dev/null +++ b/esy.lock/opam/ocaml-compiler-libs.v0.17.0/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "opensource@janestreet.com" +authors: ["Jane Street Group, LLC "] +homepage: "https://github.com/janestreet/ocaml-compiler-libs" +bug-reports: "https://github.com/janestreet/ocaml-compiler-libs/issues" +dev-repo: "git+https://github.com/janestreet/ocaml-compiler-libs.git" +license: "MIT" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "5.2.0"} + "dune" {>= "1.5.1"} +] +synopsis: """OCaml compiler libraries repackaged""" +description: """ + +This packages exposes the OCaml compiler libraries repackages under +the toplevel names Ocaml_common, Ocaml_bytecomp, Ocaml_optcomp, ... +""" +url { + src: + "https://github.com/janestreet/ocaml-compiler-libs/archive/refs/tags/v0.17.0.tar.gz" + checksum: [ + "md5=aaf66efea8752475c25a942443579b41" + "sha512=c5cd418b0eb74e00c3f63235754bbdb3a3328ac743d6ae885424d8c50b4edaa7068572e689cb3456d222793283927f2984a1ff840b1bc3817f810b5314faf897" + ] +} diff --git a/esy.lock/opam/ocaml-lsp-server.1.12.4/opam b/esy.lock/opam/ocaml-lsp-server.1.23.0/opam similarity index 56% rename from esy.lock/opam/ocaml-lsp-server.1.12.4/opam rename to esy.lock/opam/ocaml-lsp-server.1.23.0/opam index 44bd9a0d..bef096f0 100644 --- a/esy.lock/opam/ocaml-lsp-server.1.12.4/opam +++ b/esy.lock/opam/ocaml-lsp-server.1.23.0/opam @@ -19,26 +19,33 @@ homepage: "https://github.com/ocaml/ocaml-lsp" bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" depends: [ "dune" {>= "3.0"} - "yojson" + "yojson" {< "3.0.0"} + "base" {>= "v0.16.0"} + "lsp" {= version} + "jsonrpc" {= version} "re" {>= "1.5.0"} "ppx_yojson_conv_lib" {>= "v0.14"} - "dune-rpc" + "dune-rpc" {>= "3.4.0"} "chrome-trace" {>= "3.3.0"} "dyn" "stdune" - "fiber" {>= "3.1.1"} + "fiber" {>= "3.1.1" & < "4.0.0"} + "ocaml" {>= "5.3" & < "5.4"} "xdg" "ordering" "dune-build-info" "spawn" - "omd" {>= "1.3.2" & < "2.0.0~alpha1"} - "octavius" {>= "1.2.2"} - "uutf" {>= "1.0.2"} + "astring" + "camlp-streams" + "ppx_expect" {>= "v0.17.0" & with-test} + "ocamlformat" {with-test & = "0.27.0"} + "ocamlc-loc" {>= "3.7.0"} "pp" {>= "1.1.2"} "csexp" {>= "1.5"} "ocamlformat-rpc-lib" {>= "0.21.0"} "odoc" {with-doc} - "ocaml" {>= "4.14" & < "4.15"} + "merlin-lib" {>= "5.5" & < "6.0"} + "ppx_yojson_conv" {with-dev-setup} ] dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" build: [ @@ -46,18 +53,22 @@ build: [ [ "dune" "build" + "-p" + name "-j" jobs - "ocaml-lsp-server.install" - "--release" + "@install" + "@doc" {with-doc} ] ] + +x-maintenance-intent: [ "(latest)" ] 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.23.0/lsp-1.23.0.tbz" checksum: [ - "sha256=919b98027cbc56359dabe8a911d3d24d1706cea8cd04e8173a2d1d3b06f9d846" - "sha512=68898112f13b7ee13040933ed95597e59f83e42ac9d6ead375baa2d1248b1614b5b80ae5e0d839f7f5a8372fd1f47e6bf308d331ca1df90cb4b9927825f89635" + "sha256=7f2bd023b54a80eace16286d28891c1360768946052c939918a8a9cd95340e7d" + "sha512=f5d62f19646923b0e54a23516539b949dd434178b98cf3a6f1fdaf6bba3c277aa4b93c57a2d8f9a6d9d75d7c514b4a2616a8593e01cd17331986d4e3392ef96e" ] } -x-commit-hash: "f53ad362aa2c47216dd96d32b22bb95ee3e774e4" +x-commit-hash: "4483b5b9cb3c58d09cfd113394f3ced8fea11f50" diff --git a/esy.lock/opam/ocaml-version.3.5.0/opam b/esy.lock/opam/ocaml-version.4.0.1/opam similarity index 62% rename from esy.lock/opam/ocaml-version.3.5.0/opam rename to esy.lock/opam/ocaml-version.4.0.1/opam index 52f452de..8f24bc8f 100644 --- a/esy.lock/opam/ocaml-version.3.5.0/opam +++ b/esy.lock/opam/ocaml-version.4.0.1/opam @@ -1,4 +1,20 @@ opam-version: "2.0" +synopsis: "Manipulate, parse and generate OCaml compiler version strings" +description: """\ +This library provides facilities to parse version numbers of the OCaml compiler, and enumerates the various official OCaml releases and configuration variants. + +OCaml version numbers are of the form `major.minor.patch+extra`, where the `patch` and `extra` fields are optional. This library offers the following functionality: + +- Functions to parse and serialise OCaml compiler version numbers. +- Enumeration of official OCaml compiler version releases. +- Test compiler versions for a particular feature (e.g. the `bytes` type) +- [opam](https://opam.ocaml.org) compiler switch enumeration. + +### Further information + +- **Discussion:** Post on with the `ocaml` tag under the Ecosystem category. +- **Bugs:** +- **Docs:** """ maintainer: "Anil Madhavapeddy " authors: "Anil Madhavapeddy " license: "ISC" @@ -7,43 +23,32 @@ homepage: "https://github.com/ocurrent/ocaml-version" doc: "https://ocurrent.github.io/ocaml-version/doc" bug-reports: "https://github.com/ocurrent/ocaml-version/issues" depends: [ + "dune" {>= "3.6"} "ocaml" {>= "4.07.0"} - "dune" {>= "1.0"} "alcotest" {with-test} + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] ] dev-repo: "git+https://github.com/ocurrent/ocaml-version.git" -synopsis: "Manipulate, parse and generate OCaml compiler version strings" -description: """ -This library provides facilities to parse version numbers of the OCaml -compiler, and enumerates the various official OCaml releases and configuration -variants. - -OCaml version numbers are of the form `major.minor.patch+extra`, where the -`patch` and `extra` fields are optional. This library offers the following -functionality: - -- Functions to parse and serialise OCaml compiler version numbers. -- Enumeration of official OCaml compiler version releases. -- Test compiler versions for a particular feature (e.g. the `bytes` type) -- [opam](https://opam.ocaml.org) compiler switch enumeration. - -### Further information - -- **Discussion:** Post on with the `ocaml` tag under - the Ecosystem category. -- **Bugs:** -- **Docs:** -""" url { src: - "https://github.com/ocurrent/ocaml-version/releases/download/v3.5.0/ocaml-version-3.5.0.tbz" + "https://github.com/ocurrent/ocaml-version/releases/download/v4.0.1/ocaml-version-4.0.1.tbz" checksum: [ - "sha256=d63ca1c3970d6b14057f7176bfdae623e6c0176287c6a6e8b78cf50e2f7f635b" - "sha512=7b5f475897b1c560c81d322ca77b80099025102ec4163b410518e32dce0d6decf7c2ef671f795932bc173741b20bb442e07b182583423d2c990c632c921be5df" + "md5=7ac431b54bf48cc4340885acb37143fa" + "sha512=e2faa6f55cfeb305d4cdeb8b9f0ee87098c69f835b42dcebf4dfa1f865ce1e213fbd4e5de7bb4d4efaf9339fd0965380b1f7ea9a1e98131caed3ffaadf873b96" ] } -x-commit-hash: "ee6c14c52e1995d69a134b23df2c1c721ea7a994" +x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam b/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam new file mode 100644 index 00000000..44be9138 --- /dev/null +++ b/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam @@ -0,0 +1,30 @@ +opam-version: "2.0" +maintainer: "Jane Street developers" +authors: ["Jane Street Group, LLC"] +homepage: "https://github.com/janestreet/ocaml_intrinsics_kernel" +bug-reports: "https://github.com/janestreet/ocaml_intrinsics_kernel/issues" +dev-repo: "git+https://github.com/janestreet/ocaml_intrinsics_kernel.git" +doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/ocaml_intrinsics_kernel/index.html" +license: "MIT" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "5.1.0"} + "dune" {>= "3.11.0"} +] +available: arch != "x86_32" +synopsis: "Intrinsics" +description: " +Provides functions to invoke amd64 instructions (such as cmov, min/maxsd, popcnt) + when available, or compatible software implementation on other targets. + See also ocaml_intrinsics library. +" +url { + src: + "https://github.com/janestreet/ocaml_intrinsics_kernel/archive/refs/tags/v0.17.1.tar.gz" + checksum: [ + "md5=56ed7d0b0331e5bcfa4e016515c0267d" + "sha512=21e596d6407a620866cee7cab47ef1a9446d6a733b4994e809ea5566d5fa956682a5c6a6190ffb0ed48458abd658301944ed10c4389d91ecb8df677a5f87f2ab" + ] +} diff --git a/esy.lock/opam/ocamlc-loc.3.20.1/opam b/esy.lock/opam/ocamlc-loc.3.20.1/opam new file mode 100644 index 00000000..82a27c9b --- /dev/null +++ b/esy.lock/opam/ocamlc-loc.3.20.1/opam @@ -0,0 +1,45 @@ +opam-version: "2.0" +synopsis: "Parse ocaml compiler output into structured form" +description: + "This library offers no backwards compatibility guarantees. Use at your own risk." +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +depends: [ + "dune" {>= "3.20"} + "ocaml" {>= "4.08.0"} + "dyn" {= version} + "odoc" {with-doc} +] +conflicts: [ + "ocaml-lsp-server" {< "1.15.0"} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(latest)"] +build: [ + ["dune" "subst"] {dev} + ["rm" "-rf" "vendor/csexp"] + ["rm" "-rf" "vendor/pp"] + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" + checksum: [ + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" + ] +} +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/ocamlformat-lib.0.27.0/opam b/esy.lock/opam/ocamlformat-lib.0.27.0/opam new file mode 100644 index 00000000..1843cd16 --- /dev/null +++ b/esy.lock/opam/ocamlformat-lib.0.27.0/opam @@ -0,0 +1,68 @@ +opam-version: "2.0" +synopsis: "OCaml Code Formatter" +description: + "OCamlFormat is a tool to automatically format OCaml code in a uniform style." +maintainer: [ + "Guillaume Petiot " + "Jules Aguillon " + "Emile Trotignon " +] +authors: [ + "Josh Berdine " + "Hugo Heuzard " + "Etienne Millon " + "Guillaume Petiot " + "Jules Aguillon " +] +homepage: "https://github.com/ocaml-ppx/ocamlformat" +bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" +depends: [ + "ocaml" {>= "4.08"} + "alcotest" {with-test & >= "1.3.0"} + "base" {>= "v0.12.0"} + "cmdliner" {>= "1.1.0" & < "2.0.0"} + "dune" {>= "2.8"} + "dune-build-info" + "either" + "fix" + "fpath" {>= "0.7.3"} + "menhir" {>= "20201216"} + "menhirLib" {>= "20201216"} + "menhirSdk" {>= "20201216"} + "ocaml-version" {>= "3.5.0"} + "ocamlformat-rpc-lib" {with-test & = version} + "ocp-indent" {with-test = "false" & >= "1.8.0" | with-test & >= "1.8.1"} + "stdio" + "uuseg" {>= "10.0.0"} + "uutf" {>= "1.0.1"} + "csexp" {>= "1.4.0"} + "astring" + "camlp-streams" + "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-ppx/ocamlformat.git" +# OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license +license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] +url { + src: + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz" + checksum: [ + "sha256=ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15" + "sha512=4d2a8965a7b7ad45f8f4e76c01cf38bfa68462b07dfa7bdb2db23bd3e3017b214e6780f036679fa8595dde4167a01d957e3af8837274320449014e306773f917" + ] +} +x-commit-hash: "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1" diff --git a/esy.lock/opam/ocamlformat.0.24.1/opam b/esy.lock/opam/ocamlformat.0.24.1/opam deleted file mode 100644 index 6648f324..00000000 --- a/esy.lock/opam/ocamlformat.0.24.1/opam +++ /dev/null @@ -1,57 +0,0 @@ -opam-version: "2.0" -synopsis: "Auto-formatter for OCaml code" -description: - "OCamlFormat is a tool to automatically format OCaml code in a uniform style." -maintainer: ["OCamlFormat Team "] -authors: ["Josh Berdine "] -homepage: "https://github.com/ocaml-ppx/ocamlformat" -bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" -depends: [ - "ocaml" {>= "4.08" & < "5.2"} - "alcotest" {with-test} - "base" {>= "v0.12.0" & < "v0.17.0"} - "cmdliner" {>= "1.1.0"} - "dune" {>= "2.8"} - "dune-build-info" - "either" - "fix" - "fpath" - "menhir" {>= "20201216"} - "menhirLib" {>= "20201216"} - "menhirSdk" {>= "20201216"} - "ocaml-version" {>= "3.3.0" & < "3.6.0"} - "ocamlformat-rpc-lib" {with-test & = version} - "ocp-indent" - "odoc-parser" {>= "2.0.0" & < "2.3.0"} - "re" {>= "1.7.2"} - "stdio" - "uuseg" {>= "10.0.0"} - "uutf" {>= "1.0.1"} - "csexp" {>= "1.4.0"} - "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-ppx/ocamlformat.git" -license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] -url { - src: - "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.24.1/ocamlformat-0.24.1.tbz" - checksum: [ - "sha256=023425e9818f80ea50537b2371a4a766c149a9957d05807e88a004d2d5f441ce" - "sha512=753b6128be68042895202f99959b360ce954db6f82b19b83b4bb346761a8e9cfdfc2b4b25e2070e60601b555562e78f9ebb02760ff127464e0b66cedbddca304" - ] -} -x-commit-hash: "86938aa4435b251af1a3b081f7fbed90f982cf62" # OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license diff --git a/esy.lock/opam/ocamlformat.0.27.0/opam b/esy.lock/opam/ocamlformat.0.27.0/opam new file mode 100644 index 00000000..e434c70a --- /dev/null +++ b/esy.lock/opam/ocamlformat.0.27.0/opam @@ -0,0 +1,59 @@ +opam-version: "2.0" +synopsis: "Auto-formatter for OCaml code" +description: """ +**ocamlformat** is a code formatter for OCaml. It comes with opinionated default settings but is also fully customizable to suit your coding style. + +- **Profiles:** ocamlformat offers profiles we predefined formatting configurations. Profiles include `default`, `ocamlformat`, `janestreet`. +- **Configurable:** Users can change the formatting profile and configure every option in their `.ocamlformat` configuration file. +- **Format Comments:** ocamlformat can format comments, docstrings, and even code blocks in your comments. +- **RPC:** ocamlformat provides an RPC server that can be used by other tools to easily format OCaml Code.""" +maintainer: [ + "Guillaume Petiot " + "Jules Aguillon " + "Emile Trotignon " +] +authors: [ + "Josh Berdine " + "Hugo Heuzard " + "Etienne Millon " + "Guillaume Petiot " + "Jules Aguillon " +] +homepage: "https://github.com/ocaml-ppx/ocamlformat" +bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" +depends: [ + "ocaml" {>= "4.08" & < "5.4"} + "cmdliner" {with-test = "false" & >= "1.1.0" | with-test & >= "1.2.0"} + "csexp" {>= "1.4.0"} + "dune" {>= "2.8"} + "ocamlformat-lib" {= version} + "ocamlformat-rpc-lib" {with-test & = version} + "re" {>= "1.10.3"} + "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-ppx/ocamlformat.git" +# OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license +license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] +url { + src: + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz" + checksum: [ + "sha256=ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15" + "sha512=4d2a8965a7b7ad45f8f4e76c01cf38bfa68462b07dfa7bdb2db23bd3e3017b214e6780f036679fa8595dde4167a01d957e3af8837274320449014e306773f917" + ] +} +x-commit-hash: "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1" diff --git a/esy.lock/opam/octavius.1.2.2/opam b/esy.lock/opam/octavius.1.2.2/opam deleted file mode 100644 index e67874dc..00000000 --- a/esy.lock/opam/octavius.1.2.2/opam +++ /dev/null @@ -1,36 +0,0 @@ -opam-version: "2.0" -maintainer: ["leo@lpw25.net"] -authors: ["Leo White "] -license: "ISC" -homepage: "https://github.com/ocaml-doc/octavius" -doc: "http://ocaml-doc.github.io/octavius/" -bug-reports: "https://github.com/ocaml-doc/octavius/issues" -depends: [ - "dune" {>= "1.11"} - "ocaml" {>= "4.03.0"} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocaml-doc/octavius.git" - -synopsis: "Ocamldoc comment syntax parser" -description: "Octavius is a library to parse the `ocamldoc` comment syntax." -url { - src: "https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz" - checksum: [ - "sha256=eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad" - "md5=72f9e1d996e6c5089fc513cc9218607b" - ] -} diff --git a/esy.lock/opam/odoc-parser.2.0.0/opam b/esy.lock/opam/odoc-parser.2.0.0/opam deleted file mode 100644 index 602b2bdf..00000000 --- a/esy.lock/opam/odoc-parser.2.0.0/opam +++ /dev/null @@ -1,47 +0,0 @@ -opam-version: "2.0" -synopsis: "Parser for ocaml documentation comments" -description: """ -Odoc_parser is a library for parsing the contents of OCaml documentation -comments, formatted using 'odoc' syntax, an extension of the language -understood by ocamldoc.""" -maintainer: ["Jon Ludlam "] -authors: ["Anton Bachin "] -license: "ISC" -homepage: "https://github.com/ocaml-doc/odoc-parser" -bug-reports: "https://github.com/ocaml-doc/odoc-parser/issues" -dev-repo: "git+https://github.com/ocaml-doc/odoc-parser.git" -# This template exists because without it dune pop is dependencies and build rules -# involving odoc. Since odoc depends on this package, this doesn't work. -doc: "https://ocaml-doc.github.io/odoc-parser/" -depends: [ - "dune" {>= "2.8"} - "ocaml" {>= "4.02.0"} - "astring" - "result" - "camlp-streams" - "ppx_expect" {with-test} - ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test}) -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - ] -] -url { - src: - "https://github.com/ocaml-doc/odoc-parser/releases/download/2.0.0/odoc-parser-2.0.0.tbz" - checksum: [ - "sha256=407919fbb0eb95761d6fc6ec6777628d94aa1907343bdca678b1880bafb33922" - "sha512=d2bffa3e9f30471045682e390dcee7a2c1caf3831bca4bd57c16939e782c2e23434e6f1c9887580a1804800b3629ef4c4311a9d418fca5a939f324650d54006e" - ] -} -x-commit-hash: "ebfd3b9489e44187da2c67d79a32b6fc1e92bda4" - diff --git a/esy.lock/opam/omd.1.3.2/opam b/esy.lock/opam/omd.1.3.2/opam deleted file mode 100644 index 3a805c06..00000000 --- a/esy.lock/opam/omd.1.3.2/opam +++ /dev/null @@ -1,50 +0,0 @@ -opam-version: "2.0" -synopsis: "A Markdown frontend in pure OCaml" -description: """ -This Markdown library is implemented using only pure OCaml (including -I/O operations provided by the standard OCaml compiler distribution). -OMD is meant to be as faithful as possible to the original Markdown. -Additionally, OMD implements a few Github markdown features, an -extension mechanism, and some other features. Note that the opam -package installs both the OMD library and the command line tool `omd`.""" -maintainer: [ - "Shon Feder " "Raphael Sousa Santos <@sonologico>" -] -authors: [ - "Philippe Wang " - "Nicolás Ojeda Bär " -] -license: "ISC" -tags: ["org:ocamllabs" "org:mirage"] -homepage: "https://github.com/ocaml/omd" -bug-reports: "https://github.com/ocaml/omd/issues" -depends: [ - "dune" {>= "2.7"} - "ocaml" {>= "4.04"} - "base-bigarray" - "base-bytes" - "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/omd.git" -url { - src: "https://github.com/ocaml/opam-source-archives/raw/main/omd-1.3.2.tbz" - checksum: [ - "sha256=6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb" - "sha512=fa2070a5f5d30b2cc422937ac4158bb087134a69d47fa15df403afb1c0c60a73dd436c949faa8d44e0b65bdee039779d86191b55085b717253f91ef20a69ef98" - ] -} -x-commit-hash: "bc6c0d568b90b61143e9863cb6ef7b3989b3313a" diff --git a/esy.lock/opam/ordering.3.18.2/opam b/esy.lock/opam/ordering.3.20.1/opam similarity index 62% rename from esy.lock/opam/ordering.3.18.2/opam rename to esy.lock/opam/ordering.3.20.1/opam index 7941bb90..cf268d85 100644 --- a/esy.lock/opam/ordering.3.18.2/opam +++ b/esy.lock/opam/ordering.3.20.1/opam @@ -8,12 +8,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.12"} + "dune" {>= "3.20"} "ocaml" {>= "4.08.0"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" -x-maintenance-intent: ["(none)"] +x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -31,10 +31,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/ppx_yojson_conv_lib.v0.16.0/opam b/esy.lock/opam/ppx_yojson_conv_lib.v0.17.0/opam similarity index 69% rename from esy.lock/opam/ppx_yojson_conv_lib.v0.16.0/opam rename to esy.lock/opam/ppx_yojson_conv_lib.v0.17.0/opam index c3e72b43..d58fda4f 100644 --- a/esy.lock/opam/ppx_yojson_conv_lib.v0.16.0/opam +++ b/esy.lock/opam/ppx_yojson_conv_lib.v0.17.0/opam @@ -10,15 +10,16 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.14.0"} - "dune" {>= "2.0.0"} + "ocaml" {>= "5.1.0"} + "dune" {>= "3.11.0"} "yojson" {>= "1.7.0"} ] +available: arch != "arm32" & arch != "x86_32" synopsis: "Runtime lib for ppx_yojson_conv" description: " Part of the Jane Street's PPX rewriters collection. " url { -src: "https://ocaml.janestreet.com/ocaml-core/v0.16/files/ppx_yojson_conv_lib-v0.16.0.tar.gz" -checksum: "sha256=557c43c88d365b4cbb514d809f1eecc54d7b9976b0669bc55b02169e6c86ec7d" +src: "https://github.com/janestreet/ppx_yojson_conv_lib/archive/refs/tags/v0.17.0.tar.gz" +checksum: "sha256=f6e6ee92408c53c5ecd8bb5ae93811aa4cf71f8dc144d5943be8fc2c7697b199" } diff --git a/esy.lock/opam/ppxlib.0.35.0/opam b/esy.lock/opam/ppxlib.0.37.0~5.4preview/opam similarity index 80% rename from esy.lock/opam/ppxlib.0.35.0/opam rename to esy.lock/opam/ppxlib.0.37.0~5.4preview/opam index b31b3583..b899461c 100644 --- a/esy.lock/opam/ppxlib.0.35.0/opam +++ b/esy.lock/opam/ppxlib.0.37.0~5.4preview/opam @@ -20,7 +20,7 @@ doc: "https://ocaml-ppx.github.io/ppxlib/" bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues" depends: [ "dune" {>= "3.8"} - "ocaml" {>= "4.08.0" & < "5.4.0"} + "ocaml" {>= "4.08.0" & < "5.5.0"} "ocaml-compiler-libs" {>= "v0.11.0"} "ppx_derivers" {>= "1.0"} "sexplib0" {>= "v0.12"} @@ -53,12 +53,12 @@ build: [ ] dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git" x-maintenance-intent: ["(latest)"] +flags: avoid-version +available: opam-version >= "2.1.0" url { - src: - "https://github.com/ocaml-ppx/ppxlib/releases/download/0.35.0/ppxlib-0.35.0.tbz" + src: "https://github.com/ocaml-ppx/ppxlib/archive/757f6c284b1fe748d5027eef3bbef924b6bbd7ce.tar.gz" checksum: [ - "sha256=d9d959fc9f84260487e45684dc741898a92fc5506b61a7f5cac65d21832db925" - "sha512=e428b1e3b89261c7efdaa18016264d1afbf067cb9b0d41124b04796c2487ac7ca8ee9a24a60d56f20d1774cb44aaa9ecf1512f17455812ba8d62d4ef93616ee7" + "sha256=89a98c95ddd0bfbac17b5a936f6811af7097be3258c482d5859b73e9de9b4552" + "sha512=b19306473d867252d382e58e9b697531c5edccdc9283b5eaf72f524803c2fca2a58a5e8f25bee198b00de82cf8ef805b43f7488791c3ac5beb0ffba938ded826" ] } -x-commit-hash: "3a791083c612e91fa4e6a9660ef69776ea750324" diff --git a/esy.lock/opam/re.1.12.0/opam b/esy.lock/opam/re.1.13.2/opam similarity index 56% rename from esy.lock/opam/re.1.12.0/opam rename to esy.lock/opam/re.1.13.2/opam index 48eca0af..bedb0c1d 100644 --- a/esy.lock/opam/re.1.12.0/opam +++ b/esy.lock/opam/re.1.13.2/opam @@ -1,6 +1,13 @@ opam-version: "2.0" - -maintainer: "rudi.grinberg@gmail.com" +synopsis: "RE is a regular expression library for OCaml" +description: """\ +Pure OCaml regular expressions with: +* Perl-style regular expressions (module Re.Perl) +* Posix extended regular expressions (module Re.Posix) +* Emacs-style regular expressions (module Re.Emacs) +* Shell-style file globbing (module Re.Glob) +* Compatibility layer for OCaml's built-in Str module (module Re.Str)""" +maintainer: "Rudi Grinberg " authors: [ "Jerome Vouillon" "Thomas Gazagnaire" @@ -11,36 +18,35 @@ authors: [ 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" - -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] - depends: [ - "ocaml" {>= "4.12"} - "dune" {>= "2.0"} - "ounit2" {with-test} + "dune" {>= "3.12"} + "ocaml" {>= "4.13.0"} "seq" + "conf-npm" {with-test} + "ppx_expect" {with-test} + "js_of_ocaml" {post & with-test} + "ounit2" {with-test} + "odoc" {with-doc} ] - -synopsis: "RE is a regular expression library for OCaml" -description: """ -Pure OCaml regular expressions with: -* Perl-style regular expressions (module Re.Perl) -* Posix extended regular expressions (module Re.Posix) -* Emacs-style regular expressions (module Re.Emacs) -* Shell-style file globbing (module Re.Glob) -* Compatibility layer for OCaml's built-in Str module (module Re.Str) -""" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/ocaml/ocaml-re.git" url { - src: - "https://github.com/ocaml/ocaml-re/releases/download/1.12.0/re-1.12.0.tbz" + src: "https://github.com/ocaml/ocaml-re/archive/refs/tags/1.13.2.tar.gz" checksum: [ - "sha256=a01f2bf22f72c2f4ababd8d3e7635e35c1bf6bc5a41ad6d5a007454ddabad1d4" - "sha512=f0726826e1e677f7ecdf447d46d814a11d3844ec6e5c0527be8c73c7afdb08aacfca47ea764eda325bcd7064aff07c1d3441c935ee5a0fc99ede8707f81a451d" + "md5=df37d9787450525a2182ce4364048d11" + "sha512=376b3ba1e351317a34b4c9a331fdc9ca5ae7c6a90eb2eb3393403a33b9f35ece63af7444a7c0c71ef29d512aa7fe56f7e485a118946e35d90039ddfd9127c020" ] -} -x-commit-hash: "f09672608781dc05172ad980a6e9a483c3b9d534" +} \ No newline at end of file diff --git a/esy.lock/opam/result.1.5/opam b/esy.lock/opam/result.1.5/opam deleted file mode 100644 index da55ed46..00000000 --- a/esy.lock/opam/result.1.5/opam +++ /dev/null @@ -1,25 +0,0 @@ -opam-version: "2.0" -maintainer: "Jane Street developers" -authors: ["Jane Street Group, LLC"] -homepage: "https://github.com/janestreet/result" -dev-repo: "git+https://github.com/janestreet/result.git" -bug-reports: "https://github.com/janestreet/result/issues" -license: "BSD-3-Clause" -build: [["dune" "build" "-p" name "-j" jobs]] -depends: [ - "ocaml" - "dune" {>= "1.0"} -] -synopsis: "Compatibility Result module" -description: """ -Projects that want to use the new result type defined in OCaml >= 4.03 -while staying compatible with older version of OCaml should use the -Result module defined in this library.""" -url { - src: - "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz" - checksum: [ - "sha256=7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32" - "md5=1b82dec78849680b49ae9a8a365b831b" - ] -} diff --git a/esy.lock/opam/sedlex.3.4/opam b/esy.lock/opam/sedlex.3.6/opam similarity index 85% rename from esy.lock/opam/sedlex.3.4/opam rename to esy.lock/opam/sedlex.3.6/opam index d4dc5922..b33ff0db 100644 --- a/esy.lock/opam/sedlex.3.4/opam +++ b/esy.lock/opam/sedlex.3.6/opam @@ -40,9 +40,9 @@ 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.4.tar.gz" + "https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.6.tar.gz" checksum: [ - "md5=5c655398261226dd99b1231df3f729e1" - "sha512=7e5f6e93e7791058b54bcd66f0e28f8ff72e6ea759a172cf6d8d7055d352d3a4e5c23f15278e254870a0ff1caed8948e77c6fde997c2b8bd81d3484198ddd484" + "md5=ad2d0ec91d20171d3a7161a0cc0c2e6a" + "sha512=f3062175e9914b692426ddad215efe2d8f3d269a648f1faf86771d56452d8dbd7edb040409773a19e77bd21e4143281dff94a6800ddb7d5fb50170ab5616c63b" ] } diff --git a/esy.lock/opam/sexplib0.v0.16.0/opam b/esy.lock/opam/sexplib0.v0.17.0/opam similarity index 66% rename from esy.lock/opam/sexplib0.v0.16.0/opam rename to esy.lock/opam/sexplib0.v0.17.0/opam index d9c5f049..7cd4cf8f 100644 --- a/esy.lock/opam/sexplib0.v0.16.0/opam +++ b/esy.lock/opam/sexplib0.v0.17.0/opam @@ -10,9 +10,10 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.08.0"} - "dune" {>= "2.0.0"} + "ocaml" {>= "4.14.0"} + "dune" {>= "3.11.0"} ] +available: arch != "x86_32" synopsis: "Library containing the definition of S-expressions and some base converters" description: " Part of Jane Street's Core library @@ -21,6 +22,10 @@ OCaml's standard library that was developed by Jane Street, the largest industrial user of OCaml. " url { -src: "https://ocaml.janestreet.com/ocaml-core/v0.16/files/sexplib0-v0.16.0.tar.gz" -checksum: "sha256=86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d" + src: + "https://github.com/janestreet/sexplib0/archive/refs/tags/v0.17.0.tar.gz" + checksum: [ + "md5=abafe8fd1d6302e55a315f4d78960d2a" + "sha512=ad387e40789fe70a11473db7e85fe017b801592624414e9030730b2e92ea08f98095fb6e9236430f33c801605ebee0a2a6284e0f618a26a7da4599d4fd9d395d" + ] } diff --git a/esy.lock/opam/stdio.v0.16.0/opam b/esy.lock/opam/stdio.v0.17.0/opam similarity index 70% rename from esy.lock/opam/stdio.v0.16.0/opam rename to esy.lock/opam/stdio.v0.17.0/opam index bd23d607..6939fc7d 100644 --- a/esy.lock/opam/stdio.v0.16.0/opam +++ b/esy.lock/opam/stdio.v0.17.0/opam @@ -10,10 +10,11 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.14.0"} - "base" {>= "v0.16" & < "v0.17"} - "dune" {>= "2.0.0"} + "ocaml" {>= "5.1.0"} + "base" {>= "v0.17" & < "v0.18"} + "dune" {>= "3.11.0"} ] +available: arch != "x86_32" synopsis: "Standard IO library for OCaml" description: " Stdio implements simple input/output functionalities for OCaml. @@ -22,6 +23,6 @@ It re-exports the input/output functions of the OCaml standard libraries using a more consistent API. " url { -src: "https://ocaml.janestreet.com/ocaml-core/v0.16/files/stdio-v0.16.0.tar.gz" -checksum: "sha256=61f0b75950614ac5378c6ec0d822cce6463402d919d5810b736fc46522b3a73e" +src: "https://github.com/janestreet/stdio/archive/refs/tags/v0.17.0.tar.gz" +checksum: "sha256=e7cb473d4bffcf419f307c658cf2599fab03a2b4fe655bfd0be699f8f7af176e" } diff --git a/esy.lock/opam/stdune.3.18.2/opam b/esy.lock/opam/stdune.3.20.1/opam similarity index 68% rename from esy.lock/opam/stdune.3.18.2/opam rename to esy.lock/opam/stdune.3.20.1/opam index 04c9b1e1..e47c06ee 100644 --- a/esy.lock/opam/stdune.3.18.2/opam +++ b/esy.lock/opam/stdune.3.20.1/opam @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.12"} + "dune" {>= "3.20"} "ocaml" {>= "4.08.0"} "base-unix" "dyn" {= version} @@ -19,7 +19,7 @@ depends: [ "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" -x-maintenance-intent: ["(none)"] +x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -37,10 +37,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/esy.lock/opam/topkg.1.0.8/opam b/esy.lock/opam/topkg.1.1.0/opam similarity index 89% rename from esy.lock/opam/topkg.1.0.8/opam rename to esy.lock/opam/topkg.1.1.0/opam index 304ccb97..42c16f6c 100644 --- a/esy.lock/opam/topkg.1.0.8/opam +++ b/esy.lock/opam/topkg.1.1.0/opam @@ -43,8 +43,8 @@ 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.8.tbz" + src: "https://erratique.ch/software/topkg/releases/topkg-1.1.0.tbz" checksum: - "sha512=4b632b60137852bb72ff9c8cdc2e16ac5ece6473569e50963fef9c1e800a0933a516bea1107b04011645afa4a1e78893c82dbce0aa8de2970d4d6c6d0dd2fe02" + "sha512=34d22ae5b6bd166dd4a601a7d12d89c336684b3c56d7c7f481b40837eab263616cc3a6e6f63602f3d4a7d53c911967bf261de6c1ac205341b98a9838e5ea7aeb" } x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/xdg.3.18.2/opam b/esy.lock/opam/xdg.3.20.1/opam similarity index 65% rename from esy.lock/opam/xdg.3.18.2/opam rename to esy.lock/opam/xdg.3.20.1/opam index e8ff9881..f9819a73 100644 --- a/esy.lock/opam/xdg.3.18.2/opam +++ b/esy.lock/opam/xdg.3.20.1/opam @@ -9,11 +9,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.12"} + "dune" {>= "3.20"} "ocaml" {>= "4.08"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -31,10 +32,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.18.2/dune-3.18.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.20.1/dune-3.20.1.tbz" checksum: [ - "sha256=56be509ffc3c5ba652113d9e6b43edb04a691f1e1f6cbba17b9d243b1239a7af" - "sha512=ee04a0c4ab946817018c78cd9b19c8d3082ee3b1cef78c699fff4ea37fd79543823a9751d0b945d2fd1783396ceded045cbec986a85f7a8f7bac93e04650fff3" + "sha256=f08e95de2828e891d68906e4430b5117032285207b5bc684fc5d45652eb30e0a" + "sha512=a45eb69c773396285f3785a1c2edb4644e376c02053ff23cbc39dd2244c9e99527bdaed34b10ad8a0f50a143ce22777a76a0cd19f3a2d313cea9560986fa6bb9" ] } -x-commit-hash: "7b971c877d1403da3d536cc180cdd384c7b26341" +x-commit-hash: "84b524ad0b337a95e44a7c307b1c237d20075272" diff --git a/package.json b/package.json index a042d0e8..dbae31e5 100644 --- a/package.json +++ b/package.json @@ -5,18 +5,19 @@ "author": "Oscar Spencer ", "license": "Apache-2.0", "dependencies": { - "ocaml": ">= 4.13.0 < 5.0.0", - "@grain/libbinaryen": ">= 116.0.0 < 117.0.0", + "ocaml": ">= 4.13.0 < 5.4.0", + "@grain/libbinaryen": ">= 117.1.0 < 118.0.0", "@opam/dune": ">= 3.0.0", "@opam/dune-configurator": ">= 3.0.0" }, "devDependencies": { "@opam/js_of_ocaml-compiler": ">= 6.0.0 < 7.0.0", - "@opam/ocamlformat": "0.24.1", - "@opam/ocaml-lsp-server": ">= 1.9.1 < 1.13.0" + "@opam/ocamlformat": "0.27.0", + "@opam/ocaml-lsp-server": ">= 1.9.1 < 2.0.0" }, "resolutions": { - "@opam/ocp-indent": "1.7.0" + "@opam/ocp-indent": "1.7.0", + "@grain/libbinaryen": "spotandjake/libbinaryen:package.json#59bc7b8fb9d2ef4795b0f8805cacedd90e9f3937" }, "esy": { "build": "dune build -p binaryen" diff --git a/src/expression.ml b/src/expression.ml index d8bcb3a6..57388303 100644 --- a/src/expression.ml +++ b/src/expression.ml @@ -706,22 +706,9 @@ module Memory_init = struct 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 *) - - (* 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 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" @@ -733,20 +720,9 @@ end module Data_drop = struct external make : Module.t -> string -> t = "caml_binaryen_data_drop" (** Module, 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 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/expression.mli b/src/expression.mli index c22e1810..b53655f9 100644 --- a/src/expression.mli +++ b/src/expression.mli @@ -256,9 +256,9 @@ module Memory_grow : sig end module Memory_init : sig - val make : Module.t -> int -> t -> t -> t -> string -> t - val get_segment : t -> int - val set_segment : t -> int -> unit + val make : Module.t -> string -> t -> t -> t -> string -> t + val get_segment : t -> string + val set_segment : t -> string -> unit val get_dest : t -> t val set_dest : t -> t -> unit val get_offset : t -> t @@ -268,9 +268,9 @@ module Memory_init : sig end module Data_drop : sig - val make : Module.t -> int -> t - val get_segment : t -> int - val set_segment : t -> int -> unit + val make : Module.t -> string -> t + val get_segment : t -> string + val set_segment : t -> string -> unit end module Memory_copy : sig diff --git a/src/memory.c b/src/memory.c index 89ab274a..6e8f8990 100644 --- a/src/memory.c +++ b/src/memory.c @@ -8,19 +8,25 @@ CAMLprim value -caml_binaryen_set_memory(value _module, value _initial, value _maximum, value _exportName, value _segments, value _segmentPassive, value _segmentOffsets, value _segmentSizes, value _shared, value _memory64, value _memoryName) { - CAMLparam5(_module, _initial, _maximum, _exportName, _segments); - CAMLxparam5(_segmentPassive, _segmentOffsets, _segmentSizes, _shared, _memory64); - CAMLxparam1(_memoryName); +caml_binaryen_set_memory(value _module, value _initial, value _maximum, value _exportName, value _segment_names, value _segment_data, value _segmentPassive, value _segmentOffsets, value _segmentSizes, value _shared, value _memory64, value _memoryName) { + CAMLparam5(_module, _initial, _maximum, _exportName, _segment_names); + CAMLxparam5(_segment_data, _segmentPassive, _segmentOffsets, _segmentSizes, _shared); + CAMLxparam2(_memory64, _memoryName); BinaryenModuleRef module = BinaryenModuleRef_val(_module); BinaryenIndex initial = Int_val(_initial); BinaryenIndex maximum = Int_val(_maximum); char* exportName = Safe_String_val(_exportName); - _segments = array_of_list(_segments); - int segmentsLen = array_length(_segments); - const char* segments[segmentsLen]; - for (int i = 0; i < segmentsLen; i++) { - segments[i] = Safe_String_val(Field(_segments, i)); + _segment_names = array_of_list(_segment_names); + int segmentNamesLen = array_length(_segment_names); + const char* segment_names[segmentNamesLen]; + for (int i = 0; i < segmentNamesLen; i++) { + segment_names[i] = Safe_String_val(Field(_segment_names, i)); + } + _segment_data = array_of_list(_segment_data); + int segmentDataLen = array_length(_segment_data); + const char* segment_data[segmentDataLen]; + for (int i = 0; i < segmentDataLen; i++) { + segment_data[i] = Safe_String_val(Field(_segment_data, i)); } _segmentPassive = array_of_list(_segmentPassive); int segmentPassiveLen = array_length(_segmentPassive); @@ -43,12 +49,12 @@ caml_binaryen_set_memory(value _module, value _initial, value _maximum, value _e bool shared = Bool_val(_shared); bool memory64 = Bool_val(_memory64); char* memoryName = Safe_String_val(_memoryName); - BinaryenSetMemory(module, initial, maximum, exportName, segments, segmentPassive, segmentOffsets, segmentSizes, segmentsLen, shared, memory64, memoryName); + BinaryenSetMemory(module, initial, maximum, exportName, segment_names, segment_data, segmentPassive, segmentOffsets, segmentSizes, segmentNamesLen, shared, memory64, memoryName); CAMLreturn(Val_unit); } CAMLprim value caml_binaryen_set_memory__bytecode(value * argv) { - return caml_binaryen_set_memory(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]); + return caml_binaryen_set_memory(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]); } CAMLprim value @@ -111,28 +117,28 @@ caml_binaryen_get_num_memory_segments(value _module) { } CAMLprim value -caml_binaryen_get_memory_segment_byte_offset(value _module, value _id) { - CAMLparam2(_module, _id); +caml_binaryen_get_memory_segment_byte_offset(value _module, value _name) { + CAMLparam2(_module, _name); BinaryenModuleRef module = BinaryenModuleRef_val(_module); - BinaryenIndex id = Int_val(_id); - CAMLreturn(Val_int(BinaryenGetMemorySegmentByteOffset(module, id))); + char* name = Safe_String_val(_name); + CAMLreturn(Val_int(BinaryenGetMemorySegmentByteOffset(module, name))); } CAMLprim value -caml_binaryen_get_memory_segment_passive(value _module, value _id) { - CAMLparam2(_module, _id); +caml_binaryen_get_memory_segment_passive(value _module, value _name) { + CAMLparam2(_module, _name); BinaryenModuleRef module = BinaryenModuleRef_val(_module); - BinaryenIndex id = Int_val(_id); - CAMLreturn(Val_bool(BinaryenGetMemorySegmentPassive(module, id))); + char* name = Safe_String_val(_name); + CAMLreturn(Val_bool(BinaryenGetMemorySegmentPassive(module, name))); } CAMLprim value -caml_binaryen_get_memory_segment_data(value _module, value _id) { - CAMLparam2(_module, _id); +caml_binaryen_get_memory_segment_data(value _module, value _name) { + CAMLparam2(_module, _name); BinaryenModuleRef module = BinaryenModuleRef_val(_module); - BinaryenIndex id = Int_val(_id); - size_t size = BinaryenGetMemorySegmentByteLength(module, id); + char* name = Safe_String_val(_name); + size_t size = BinaryenGetMemorySegmentByteLength(module, name); CAMLprim value bytes = caml_alloc_string(size); - BinaryenCopyMemorySegmentData(module, id, (char*)Bytes_val(bytes)); + BinaryenCopyMemorySegmentData(module, name, (char*)Bytes_val(bytes)); CAMLreturn(bytes); } diff --git a/src/memory.js b/src/memory.js index 5aeb845f..43a12b77 100644 --- a/src/memory.js +++ b/src/memory.js @@ -6,7 +6,8 @@ function caml_binaryen_set_memory( initial, maximum, exportName, - segments, + segmentNames, + segmentData, segmentPassives, segmentOffsets, segmentSizes, @@ -14,11 +15,13 @@ function caml_binaryen_set_memory( memory64, memoryName ) { + var datas = caml_list_to_js_array(segmentData); var passives = caml_list_to_js_array(segmentPassives); var offsets = caml_list_to_js_array(segmentOffsets); - var segs = caml_list_to_js_array(segments).map(function (segment, idx) { + var segs = caml_list_to_js_array(segmentNames).map(function (name, idx) { return { - data: caml_convert_bytes_to_array(segment), + name: caml_jsstring_of_string(name), + data: caml_convert_bytes_to_array(datas[idx]), passive: caml_js_from_bool(passives[idx]), offset: offsets[idx], }; @@ -48,7 +51,8 @@ function caml_binaryen_set_memory__bytecode() { arguments[7], arguments[8], arguments[9], - arguments[10] + arguments[10], + arguments[11] ); } @@ -108,20 +112,22 @@ function caml_binaryen_get_num_memory_segments(wasm_mod) { } //Provides: caml_binaryen_get_memory_segment_byte_offset -function caml_binaryen_get_memory_segment_byte_offset(wasm_mod, idx) { - var info = wasm_mod.getMemorySegmentInfoByIndex(idx); +//Requires: caml_jsstring_of_string +function caml_binaryen_get_memory_segment_byte_offset(wasm_mod, name) { + var info = wasm_mod.getMemorySegmentInfo(caml_jsstring_of_string(name)); return info.offset; } //Provides: caml_binaryen_get_memory_segment_passive -function caml_binaryen_get_memory_segment_passive(wasm_mod, idx) { - var info = wasm_mod.getMemorySegmentInfoByIndex(idx); +//Requires: caml_jsstring_of_string +function caml_binaryen_get_memory_segment_passive(wasm_mod, name) { + var info = wasm_mod.getMemorySegmentInfo(caml_jsstring_of_string(name)); return info.passive; } //Provides: caml_binaryen_get_memory_segment_data -//Requires: caml_bytes_of_array -function caml_binaryen_get_memory_segment_data(wasm_mod, idx) { - var info = wasm_mod.getMemorySegmentInfoByIndex(idx); +//Requires: caml_bytes_of_array, caml_jsstring_of_string +function caml_binaryen_get_memory_segment_data(wasm_mod, name) { + var info = wasm_mod.getMemorySegmentInfo(caml_jsstring_of_string(name)); return caml_bytes_of_array(info.data); } diff --git a/src/memory.ml b/src/memory.ml index 4c96791a..4319c285 100644 --- a/src/memory.ml +++ b/src/memory.ml @@ -3,6 +3,7 @@ external set_memory : int -> int -> string -> + string list -> bytes list -> bool list -> Expression.t list -> @@ -12,7 +13,7 @@ external set_memory : string -> unit = "caml_binaryen_set_memory__bytecode" "caml_binaryen_set_memory" -type segment = { data : bytes; kind : segment_kind; size : int } +type segment = { name : string; data : bytes; kind : segment_kind; size : int } and segment_kind = Passive | Active of { offset : Expression.t } (** Module, initial size, maximum size, export name, segments, shared, memory64, moduleName . *) @@ -20,26 +21,36 @@ let set_memory wasm_mod initial maximum export_name (segments : segment list) shared memory64 moduleName = let split_segments segments = List.fold_right - (fun { data; kind; size } - (segment_data, segment_passive, segment_offsets, segment_sizes) -> + (fun { name; data; kind; size } + ( segment_name, + segment_data, + segment_passive, + segment_offsets, + segment_sizes ) -> match kind with | Active { offset } -> - ( data :: segment_data, + ( name :: segment_name, + data :: segment_data, false :: segment_passive, offset :: segment_offsets, size :: segment_sizes ) | Passive -> - ( data :: segment_data, + ( name :: segment_name, + data :: segment_data, true :: segment_passive, Expression.Null.make () :: segment_offsets, size :: segment_sizes )) - segments ([], [], [], []) + segments ([], [], [], [], []) in - let segment_data, segment_passive, segment_offsets, segment_sizes = + let ( segment_name, + segment_data, + segment_passive, + segment_offsets, + segment_sizes ) = split_segments segments in - set_memory wasm_mod initial maximum export_name segment_data segment_passive - segment_offsets segment_sizes shared memory64 moduleName + set_memory wasm_mod initial maximum export_name segment_name segment_data + segment_passive segment_offsets segment_sizes shared memory64 moduleName external has_memory : Module.t -> bool = "caml_binaryen_has_memory" @@ -59,11 +70,11 @@ let unlimited = -1 external get_num_segments : Module.t -> int = "caml_binaryen_get_num_memory_segments" -external get_segment_byte_offset : Module.t -> int -> int +external get_segment_byte_offset : Module.t -> string -> int = "caml_binaryen_get_memory_segment_byte_offset" -external get_segment_passive : Module.t -> int -> bool +external get_segment_passive : Module.t -> string -> bool = "caml_binaryen_get_memory_segment_passive" -external get_segment_data : Module.t -> int -> bytes +external get_segment_data : Module.t -> string -> bytes = "caml_binaryen_get_memory_segment_data" diff --git a/src/memory.mli b/src/memory.mli index 06f6cfb4..6ecf64d8 100644 --- a/src/memory.mli +++ b/src/memory.mli @@ -1,4 +1,4 @@ -type segment = { data : bytes; kind : segment_kind; size : int } +type segment = { name : string; data : bytes; kind : segment_kind; size : int } and segment_kind = Passive | Active of { offset : Expression.t } val set_memory : @@ -20,6 +20,6 @@ val is_shared : Module.t -> string -> bool val is_64 : Module.t -> string -> bool val unlimited : int val get_num_segments : Module.t -> int -val get_segment_byte_offset : Module.t -> int -> int -val get_segment_passive : Module.t -> int -> bool -val get_segment_data : Module.t -> int -> bytes +val get_segment_byte_offset : Module.t -> string -> int +val get_segment_passive : Module.t -> string -> bool +val get_segment_data : Module.t -> string -> bytes diff --git a/test/test.expected b/test/test.expected index 65253319..d08e43d2 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 $0 (i32.const 0) "hello") - (data $1 "world") + (data $hello (i32.const 0) "hello") + (data $world "world") (table $table 1 1 funcref) (elem $elem (i32.const 0) $adder) (export "adder" (func $adder)) @@ -28,7 +28,9 @@ (block $add (result i32) (if (i32.const 0) - (unreachable) + (then + (unreachable) + ) ) (i32.add (select @@ -44,7 +46,7 @@ ) (func $start (type $1) (block $start - (memory.init $1 + (memory.init $world (i32.const 2048) (i32.const 0) (i32.const 5) @@ -73,8 +75,8 @@ (type $3 (func (param anyref) (result i32))) (import "future-wasi" "write" (func $write (type $2) (param anyref i32 i32) (result i32))) (memory $0 1) - (data $0 (i32.const 0) "hello") - (data $1 "world") + (data $hello (i32.const 0) "hello") + (data $world "world") (table $table 1 1 funcref) (elem $elem (i32.const 0) $adder) (export "adder" (func $adder)) @@ -94,7 +96,7 @@ ) ) (func $start (type $1) (; has Stack IR ;) - (memory.init $1 + (memory.init $world (i32.const 2048) (i32.const 0) (i32.const 5) @@ -115,11 +117,11 @@ ) ) (module - (type $type$0 (func (param anyref i32 i32) (result i32))) - (type $type$1 (func (param i32 i32) (result i32))) - (type $type$2 (func)) - (type $type$3 (func (param anyref) (result i32))) - (import "future-wasi" "write" (func $fimport$0 (type $type$0) (param anyref i32 i32) (result i32))) + (type $type (func (param anyref i32 i32) (result i32))) + (type $type_1 (func (param i32 i32) (result i32))) + (type $type_2 (func)) + (type $type_3 (func (param anyref) (result i32))) + (import "future-wasi" "write" (func $fimport$0 (type $type) (param anyref i32 i32) (result i32))) (memory $0 1) (data $0 (i32.const 0) "hello") (data $1 "world") @@ -129,7 +131,7 @@ (export "memory" (memory $0)) (export "hello" (func $2)) (start $1) - (func $0 (type $type$1) (param $0 i32) (param $1 i32) (result i32) + (func $0 (type $type_1) (param $0 i32) (param $1 i32) (result i32) (i32.add (select (local.get $0) @@ -141,7 +143,7 @@ (local.get $1) ) ) - (func $1 (type $type$2) + (func $1 (type $type_2) (memory.init $1 (i32.const 2048) (i32.const 0) @@ -154,7 +156,7 @@ ) ) ) - (func $2 (type $type$3) (param $0 anyref) (result i32) + (func $2 (type $type_3) (param $0 anyref) (result i32) (call $fimport$0 (local.get $0) (i32.const 0) @@ -163,11 +165,11 @@ ) ) (module - (type $type$0 (func (param anyref i32 i32) (result i32))) - (type $type$1 (func (param i32 i32) (result i32))) - (type $type$2 (func)) - (type $type$3 (func (param anyref) (result i32))) - (import "future-wasi" "write" (func $fimport$0 (type $type$0) (param anyref i32 i32) (result i32))) + (type $type (func (param anyref i32 i32) (result i32))) + (type $type_1 (func (param i32 i32) (result i32))) + (type $type_2 (func)) + (type $type_3 (func (param anyref) (result i32))) + (import "future-wasi" "write" (func $fimport$0 (type $type) (param anyref i32 i32) (result i32))) (memory $0 1) (data $0 (i32.const 0) "hello") (data $1 "world") @@ -177,7 +179,7 @@ (export "memory" (memory $0)) (export "hello" (func $2)) (start $1) - (func $0 (type $type$1) (param $0 i32) (param $1 i32) (result i32) + (func $0 (type $type_1) (param $0 i32) (param $1 i32) (result i32) local.get $0 local.get $1 i32.load @@ -186,7 +188,7 @@ local.get $1 i32.add ) - (func $1 (type $type$2) + (func $1 (type $type_2) i32.const 2048 i32.const 0 i32.const 5 @@ -196,7 +198,7 @@ call $0 drop ) - (func $2 (type $type$3) (param $0 anyref) (result i32) + (func $2 (type $type_3) (param $0 anyref) (result i32) local.get $0 i32.const 0 i32.const 1 diff --git a/test/test.ml b/test/test.ml index e0339e08..b1b6a7bf 100644 --- a/test/test.ml +++ b/test/test.ml @@ -97,7 +97,7 @@ let start = Function.add_function wasm_mod "start" Type.none Type.none [||] (Expression.Block.make wasm_mod ~return_type:Type.none "start" [ - Expression.Memory_init.make wasm_mod 1 + Expression.Memory_init.make wasm_mod "world" (Expression.Const.make wasm_mod (Literal.int32 2048l)) (Expression.Const.make wasm_mod (Literal.int32 0l)) (Expression.Const.make wasm_mod (Literal.int32 5l)) @@ -157,13 +157,13 @@ let segment : Binaryen.Memory.segment = { offset = Expression.Const.make wasm_mod (Literal.int32 0l) } in let size = Bytes.length data in - { data; kind; size } + { name = "hello"; data; kind; size } let passive_segment : Binaryen.Memory.segment = let data = Bytes.of_string "world" in let kind = Binaryen.Memory.Passive in let size = Bytes.length data in - { data; kind; size } + { name = "world"; data; kind; size } let _ = assert (Memory.has_memory wasm_mod = false) @@ -183,7 +183,9 @@ let _ = assert (Memory.get_max max_memory_wasm_mod "0" = 2) let _ = assert ( - Bytes.equal (Memory.get_segment_data wasm_mod 1) (Bytes.of_string "world")) + Bytes.equal + (Memory.get_segment_data wasm_mod "world") + (Bytes.of_string "world")) (* Create an imported "write" function i32 (externref, i32, i32) *) (* Similar to the example here: https://bytecodealliance.org/articles/reference-types-in-wasmtime *)