From bbd8fe7f1c1e4db33d27a9bfef0583d2f7b85ac3 Mon Sep 17 00:00:00 2001 From: Spotandjake Date: Sun, 23 Mar 2025 18:08:46 -0400 Subject: [PATCH] chore: Upgrade `setup-ocaml` feat: Support OCaml 5 chore!: Drop support for OCaml 4.12 --- .github/workflows/esy.yml | 6 +- .github/workflows/js.yml | 4 +- .github/workflows/opam.yml | 22 +- .github/workflows/release.yml | 6 +- dune | 2 + esy.lock/index.json | 623 +++++++++--------- esy.lock/opam/base-bytes.base/opam | 1 + .../opam/{base.v0.16.3 => base.v0.17.1}/opam | 15 +- esy.lock/opam/conf-bash.1/opam | 14 - .../{jsonrpc.1.20.1 => jsonrpc.1.21.0}/opam | 10 +- esy.lock/opam/{lsp.1.20.1 => lsp.1.21.0}/opam | 11 +- .../opam | 12 +- .../opam/ocaml-compiler-libs.v0.12.4/opam | 39 -- .../opam/ocaml-compiler-libs.v0.17.0/opam | 28 + .../opam | 21 +- .../opam | 8 +- .../opam/ocaml_intrinsics_kernel.v0.17.1/opam | 30 + .../{ocamlfind.1.9.3 => ocamlfind.1.9.8}/opam | 30 +- .../opam | 14 +- .../opam | 11 +- esy.lock/opam/ocp-indent.1.7.0/opam | 2 +- .../opam | 9 +- esy.lock/opam/result.1.5/opam | 25 - .../opam | 13 +- .../{stdio.v0.16.0 => stdio.v0.17.0}/opam | 11 +- .../opam/{topkg.1.0.7 => topkg.1.0.8}/opam | 10 +- esy.lock/opam/uutf.1.0.3/opam | 37 -- esy.lock/opam/uutf.1.0.4/opam | 42 ++ .../files/findlib.patch | 485 -------------- .../files/findlib.patch | 11 + .../package.json | 0 libbinaryen.opam | 2 +- package.json | 10 +- 33 files changed, 536 insertions(+), 1028 deletions(-) rename esy.lock/opam/{base.v0.16.3 => base.v0.17.1}/opam (72%) delete mode 100644 esy.lock/opam/conf-bash.1/opam rename esy.lock/opam/{jsonrpc.1.20.1 => jsonrpc.1.21.0}/opam (70%) rename esy.lock/opam/{lsp.1.20.1 => lsp.1.21.0}/opam (73%) rename esy.lock/opam/{merlin-lib.4.18-414 => merlin-lib.5.3-502}/opam (66%) delete mode 100644 esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam create mode 100644 esy.lock/opam/ocaml-compiler-libs.v0.17.0/opam rename esy.lock/opam/{ocaml-lsp-server.1.20.1-4.14 => ocaml-lsp-server.1.21.0}/opam (69%) rename esy.lock/opam/{ocaml-version.3.7.3 => ocaml-version.4.0.0}/opam (86%) create mode 100644 esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam rename esy.lock/opam/{ocamlfind.1.9.3 => ocamlfind.1.9.8}/opam (68%) rename esy.lock/opam/{ocamlformat-lib.0.26.1 => ocamlformat-lib.0.27.0}/opam (80%) rename esy.lock/opam/{ocamlformat.0.26.1 => ocamlformat.0.27.0}/opam (84%) rename esy.lock/opam/{ppx_yojson_conv_lib.v0.16.0 => ppx_yojson_conv_lib.v0.17.0}/opam (69%) delete mode 100644 esy.lock/opam/result.1.5/opam rename esy.lock/opam/{sexplib0.v0.16.0 => sexplib0.v0.17.0}/opam (65%) rename esy.lock/opam/{stdio.v0.16.0 => stdio.v0.17.0}/opam (69%) rename esy.lock/opam/{topkg.1.0.7 => topkg.1.0.8}/opam (82%) delete mode 100644 esy.lock/opam/uutf.1.0.3/opam create mode 100644 esy.lock/opam/uutf.1.0.4/opam delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/files/findlib.patch create mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/files/findlib.patch rename esy.lock/overrides/{opam__s__ocamlfind_opam__c__1.9.3_opam_override => opam__s__ocamlfind_opam__c__1.9.8_opam_override}/package.json (100%) diff --git a/.github/workflows/esy.yml b/.github/workflows/esy.yml index ea87805..1120f9a 100644 --- a/.github/workflows/esy.yml +++ b/.github/workflows/esy.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Setup node.js - uses: actions/setup-node@v3.6.0 + uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: node-version: "16" check-latest: true @@ -28,7 +28,7 @@ jobs: npm i -g shx - name: Checkout project - uses: actions/checkout@v3.5.3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: "recursive" @@ -38,7 +38,7 @@ jobs: - name: Esy cache id: esy-cache - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 + uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3 with: path: _export key: ${{ runner.os }}-esy-${{ hashFiles('esy.lock/index.json') }} diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 5523dc8..569929b 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Setup node.js - uses: actions/setup-node@v3.6.0 + uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: node-version: "16" check-latest: true @@ -31,7 +31,7 @@ jobs: echo "$HOME/cmake/bin" >> $GITHUB_PATH - name: Checkout project - uses: actions/checkout@v3.5.3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: "recursive" diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index cc53596..3b0baf9 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -11,27 +11,17 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, macos-latest, windows-latest] - ocaml-compiler: [4.12.1, 4.13.1, 4.14.1] + os: [ubuntu-latest, macos-latest, windows-latest] + ocaml-compiler: [4.13.1, 4.14.1, 5.3.0] steps: - name: Checkout project - uses: actions/checkout@v3.5.3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: "recursive" - name: Setup OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@v2 - if: ${{ startsWith(matrix.os, 'windows-') }} - with: - ocaml-compiler: ${{ matrix.ocaml-compiler }} - opam-repositories: | - opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset - default: https://github.com/ocaml/opam-repository.git - - - name: Setup OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@v2 - if: ${{ !startsWith(matrix.os, 'windows-') }} + uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} @@ -71,12 +61,12 @@ jobs: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100 - name: Checkout project - uses: actions/checkout@v3.5.3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: "recursive" - name: Setup OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38cf57a..df52996 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: brew install git-archive-all - name: Checkout code - uses: actions/checkout@v3.5.3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: submodules: "recursive" @@ -82,7 +82,7 @@ jobs: echo -n "$CHANGES" > CHANGES.md - name: Setup OCaml - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15 with: ocaml-compiler: 4.14.0 @@ -100,7 +100,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Setup NodeJS - uses: actions/setup-node@v3.6.0 + uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: node-version: "16" registry-url: "https://registry.npmjs.org" diff --git a/dune b/dune index f916576..70eacc1 100644 --- a/dune +++ b/dune @@ -125,6 +125,8 @@ binaryen -G "Unix Makefiles" + -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc + -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ "-DCMAKE_SYSTEM_NAME=Windows" ; GCC 7 (shipped with esy) doesn't like _ for unused variables "-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized" diff --git a/esy.lock/index.json b/esy.lock/index.json index 68a650d..a026379 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,15 +1,15 @@ { - "checksum": "91051cc4e132878618ec73bea2f08dbd", + "checksum": "8096f1a43ac441e386d8e73c0addbe20", "root": "@grain/libbinaryen@link-dev:./package.json", "node": { - "ocaml@4.14.1000@d41d8cd9": { - "id": "ocaml@4.14.1000@d41d8cd9", + "ocaml@5.2.0@d41d8cd9": { + "id": "ocaml@5.2.0@d41d8cd9", "name": "ocaml", - "version": "4.14.1000", + "version": "5.2.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.2.0.tgz#sha1:19a52f00bf76caa4de7d5c446b658966fd5c4350" ] }, "overrides": [], @@ -34,11 +34,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" @@ -61,39 +61,39 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, - "@opam/uutf@opam:1.0.3@3527936b": { - "id": "@opam/uutf@opam:1.0.3@3527936b", + "@opam/uutf@opam:1.0.4@ba7fbef7": { + "id": "@opam/uutf@opam:1.0.4@ba7fbef7", "name": "@opam/uutf", - "version": "opam:1.0.3", + "version": "opam:1.0.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/50/50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8#sha512:50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8", - "archive:https://erratique.ch/software/uutf/releases/uutf-1.0.3.tbz#sha512:50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8" + "archive:https://opam.ocaml.org/cache/sha512/e3/e35f408bc971cd8da3077e6c3321e0d8f4eb569898e0e219fde62dae78fbd0a0095cb7f036287656f6a1b346584f7b9f0c6dec0a5a092180da36e43247027598#sha512:e35f408bc971cd8da3077e6c3321e0d8f4eb569898e0e219fde62dae78fbd0a0095cb7f036287656f6a1b346584f7b9f0c6dec0a5a092180da36e43247027598", + "archive:https://erratique.ch/software/uutf/releases/uutf-1.0.4.tbz#sha512:e35f408bc971cd8da3077e6c3321e0d8f4eb569898e0e219fde62dae78fbd0a0095cb7f036287656f6a1b346584f7b9f0c6dec0a5a092180da36e43247027598" ], "opam": { "name": "uutf", - "version": "1.0.3", - "path": "esy.lock/opam/uutf.1.0.3" + "version": "1.0.4", + "path": "esy.lock/opam/uutf.1.0.4" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.0@d41d8cd9", "@opam/topkg@opam:1.0.8@eb5a05af", + "@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.2.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.3@3527936b", - "@opam/uucp@opam:16.0.0@ded5dcba", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.0@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", + "@opam/uucp@opam:16.0.0@ded5dcba", "@opam/topkg@opam:1.0.8@eb5a05af", + "@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.2.0@d41d8cd9", "@opam/uucp@opam:16.0.0@ded5dcba" ], "available": "true" }, @@ -144,39 +144,39 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.0@d41d8cd9", "@opam/topkg@opam:1.0.8@eb5a05af", + "@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.2.0@d41d8cd9" ], "available": "true" }, - "@opam/topkg@opam:1.0.7@e59fb83d": { - "id": "@opam/topkg@opam:1.0.7@e59fb83d", + "@opam/topkg@opam:1.0.8@eb5a05af": { + "id": "@opam/topkg@opam:1.0.8@eb5a05af", "name": "@opam/topkg", - "version": "opam:1.0.7", + "version": "opam:1.0.8", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/09/09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535#sha512:09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535", - "archive:https://erratique.ch/software/topkg/releases/topkg-1.0.7.tbz#sha512:09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535" + "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" ], "opam": { "name": "topkg", - "version": "1.0.7", - "path": "esy.lock/opam/topkg.1.0.7" + "version": "1.0.8", + "path": "esy.lock/opam/topkg.1.0.8" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.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.2.0@d41d8cd9", "@opam/ocamlbuild@opam:0.16.1@b3fc8209" ], "available": "true" }, @@ -198,7 +198,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "ocaml@5.2.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.17.2@700bb6ce", "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", @@ -206,7 +206,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "ocaml@5.2.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.17.2@700bb6ce", "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", @@ -232,41 +232,41 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, - "@opam/stdio@opam:v0.16.0@a75c1ca1": { - "id": "@opam/stdio@opam:v0.16.0@a75c1ca1", + "@opam/stdio@opam:v0.17.0@29b17754": { + "id": "@opam/stdio@opam:v0.17.0@29b17754", "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.17.2@31dc7e86", - "@opam/base@opam:v0.16.3@162b7c08", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/base@opam:v0.17.1@699decbd", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", - "@opam/base@opam:v0.16.3@162b7c08" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/base@opam:v0.17.1@699decbd" ], - "available": "true" + "available": "arch != \"arm32\" & 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.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "os != \"freebsd\"" }, - "@opam/sexplib0@opam:v0.16.0@c0ffad0c": { - "id": "@opam/sexplib0@opam:v0.16.0@c0ffad0c", + "@opam/sexplib0@opam:v0.17.0@21847769": { + "id": "@opam/sexplib0@opam:v0.17.0@21847769", "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.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], - "available": "true" + "available": "arch != \"arm32\" & 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.2.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.2.0@d41d8cd9" ], "extraSources": [ { "checksum": "sha256:e95062b4d0519ef8335c02f7d0f1952d11b814c7ab7e6d566a206116162fa2be", @@ -370,42 +370,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", + "ocaml@5.2.0@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", + "ocaml@5.2.0@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.17.2@31dc7e86" ], "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" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" - ], - "available": "true" - }, "@opam/re@opam:1.12.0@42f7a5b9": { "id": "@opam/re@opam:1.12.0@42f7a5b9", "name": "@opam/re", @@ -424,11 +398,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" @@ -451,47 +425,47 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/sexplib0@opam:v0.16.0@c0ffad0c", + "ocaml@5.2.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/sexplib0@opam:v0.17.0@21847769", "@opam/ppx_derivers@opam:1.2.1@d78727cd", - "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", "@opam/dune@opam:3.17.2@31dc7e86", "@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.2.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/sexplib0@opam:v0.17.0@21847769", "@opam/ppx_derivers@opam:1.2.1@d78727cd", - "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, - "@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", + "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/dune@opam:3.17.2@31dc7e86" ], - "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 +485,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -537,11 +511,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -563,16 +537,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, - "@opam/ocp-indent@opam:1.7.0@2da3c6e5": { - "id": "@opam/ocp-indent@opam:1.7.0@2da3c6e5", + "@opam/ocp-indent@opam:1.7.0@3e255333": { + "id": "@opam/ocp-indent@opam:1.7.0@3e255333", "name": "@opam/ocp-indent", "version": "opam:1.7.0", "source": { @@ -589,17 +563,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/cmdliner@opam:1.3.0@8e6dd99f", - "@opam/base-bytes@opam:base@19d0c2ff", + "@opam/base-bytes@opam:base@785dbd33", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/cmdliner@opam:1.3.0@8e6dd99f", - "@opam/base-bytes@opam:base@19d0c2ff" + "@opam/base-bytes@opam:base@785dbd33" ], "available": "true" }, @@ -621,39 +595,38 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4" ], "available": "true" }, - "@opam/ocamlformat-lib@opam:0.26.1@4318caf3": { - "id": "@opam/ocamlformat-lib@opam:0.26.1@4318caf3", + "@opam/ocamlformat-lib@opam:0.27.0@09e368b0": { + "id": "@opam/ocamlformat-lib@opam:0.27.0@09e368b0", "name": "@opam/ocamlformat-lib", - "version": "opam:0.26.1", + "version": "opam:0.27.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/da/da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7#sha256:da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7", - "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz#sha256:da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7" + "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-lib", - "version": "0.26.1", - "path": "esy.lock/opam/ocamlformat-lib.0.26.1" + "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.3@3527936b", + "ocaml@5.2.0@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", "@opam/uuseg@opam:16.0.0@bd0df457", - "@opam/stdio@opam:v0.16.0@a75c1ca1", - "@opam/result@opam:1.5@5a755845", - "@opam/ocp-indent@opam:1.7.0@2da3c6e5", - "@opam/ocaml-version@opam:3.7.3@4a24bdcc", + "@opam/stdio@opam:v0.17.0@29b17754", + "@opam/ocp-indent@opam:1.7.0@3e255333", + "@opam/ocaml-version@opam:4.0.0@db2acb74", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhir@opam:20240715@454ed5d1", @@ -662,18 +635,18 @@ "@opam/either@opam:1.0.0@378fa7c4", "@opam/dune-build-info@opam:3.17.2@b34a7b66", "@opam/dune@opam:3.17.2@31dc7e86", "@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.16.3@162b7c08", + "@opam/base@opam:v0.17.1@699decbd", "@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.3@3527936b", + "ocaml@5.2.0@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7", "@opam/uuseg@opam:16.0.0@bd0df457", - "@opam/stdio@opam:v0.16.0@a75c1ca1", - "@opam/result@opam:1.5@5a755845", - "@opam/ocp-indent@opam:1.7.0@2da3c6e5", - "@opam/ocaml-version@opam:3.7.3@4a24bdcc", + "@opam/stdio@opam:v0.17.0@29b17754", + "@opam/ocp-indent@opam:1.7.0@3e255333", + "@opam/ocaml-version@opam:4.0.0@db2acb74", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhir@opam:20240715@454ed5d1", @@ -682,69 +655,70 @@ "@opam/either@opam:1.0.0@378fa7c4", "@opam/dune-build-info@opam:3.17.2@b34a7b66", "@opam/dune@opam:3.17.2@31dc7e86", "@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.16.3@162b7c08", + "@opam/base@opam:v0.17.1@699decbd", "@opam/astring@opam:0.8.5@9975798d" ], "available": "true" }, - "@opam/ocamlformat@opam:0.26.1@095796c0": { - "id": "@opam/ocamlformat@opam:0.26.1@095796c0", + "@opam/ocamlformat@opam:0.27.0@6c2dc1c8": { + "id": "@opam/ocamlformat@opam:0.27.0@6c2dc1c8", "name": "@opam/ocamlformat", - "version": "opam:0.26.1", + "version": "opam:0.27.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/da/da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7#sha256:da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7", - "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz#sha256:da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7" + "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.26.1", - "path": "esy.lock/opam/ocamlformat.0.26.1" + "version": "0.27.0", + "path": "esy.lock/opam/ocamlformat.0.27.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/re@opam:1.12.0@42f7a5b9", - "@opam/ocamlformat-lib@opam:0.26.1@4318caf3", - "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/re@opam:1.12.0@42f7a5b9", + "@opam/ocamlformat-lib@opam:0.27.0@09e368b0", + "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/cmdliner@opam:1.3.0@8e6dd99f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/re@opam:1.12.0@42f7a5b9", - "@opam/ocamlformat-lib@opam:0.26.1@4318caf3", - "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/re@opam:1.12.0@42f7a5b9", + "@opam/ocamlformat-lib@opam:0.27.0@09e368b0", + "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/cmdliner@opam:1.3.0@8e6dd99f" ], "available": "true" }, - "@opam/ocamlfind@opam:1.9.3@6f4741ee": { - "id": "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "@opam/ocamlfind@opam:1.9.8@ee910ff5": { + "id": "@opam/ocamlfind@opam:1.9.8@ee910ff5", "name": "@opam/ocamlfind", - "version": "opam:1.9.3", + "version": "opam:1.9.8", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/24/24047dd8a0da5322253de9b7aa254e42#md5:24047dd8a0da5322253de9b7aa254e42", - "archive:http://download.camlcity.org/download/findlib-1.9.3.tar.gz#md5:24047dd8a0da5322253de9b7aa254e42" + "archive:https://opam.ocaml.org/cache/md5/ca/ca770e5806032a96131b670f6e07f146#md5:ca770e5806032a96131b670f6e07f146", + "archive:https://github.com/ocaml/ocamlfind/archive/refs/tags/findlib-1.9.8.tar.gz#md5:ca770e5806032a96131b670f6e07f146" ], "opam": { "name": "ocamlfind", - "version": "1.9.3", - "path": "esy.lock/opam/ocamlfind.1.9.3" + "version": "1.9.8", + "path": "esy.lock/opam/ocamlfind.1.9.8" } }, "overrides": [ { - "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.2.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.2.0@d41d8cd9" ], "available": "true" }, "@opam/ocamlc-loc@opam:3.17.2@d5743596": { @@ -765,11 +739,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dyn@opam:3.17.2@6d24df09", + "ocaml@5.2.0@d41d8cd9", "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dyn@opam:3.17.2@6d24df09", + "ocaml@5.2.0@d41d8cd9", "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" @@ -792,150 +766,176 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.2.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.2.0@d41d8cd9" ], "available": "true" }, - "@opam/ocaml-version@opam:3.7.3@4a24bdcc": { - "id": "@opam/ocaml-version@opam:3.7.3@4a24bdcc", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@ea7fa575": { + "id": "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@ea7fa575", + "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.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "arch != \"arm32\" & arch != \"x86_32\"" + }, + "@opam/ocaml-version@opam:4.0.0@db2acb74": { + "id": "@opam/ocaml-version@opam:4.0.0@db2acb74", "name": "@opam/ocaml-version", - "version": "opam:3.7.3", + "version": "opam:4.0.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/19/19a39d2f0d3cbcd35a97131ac254bacb#md5:19a39d2f0d3cbcd35a97131ac254bacb", - "archive:https://github.com/ocurrent/ocaml-version/releases/download/v3.7.3/ocaml-version-3.7.3.tbz#md5:19a39d2f0d3cbcd35a97131ac254bacb" + "archive:https://opam.ocaml.org/cache/md5/67/6734fe7a4f8ac3bea39a0bcf40a31a82#md5:6734fe7a4f8ac3bea39a0bcf40a31a82", + "archive:https://github.com/ocurrent/ocaml-version/releases/download/v4.0.0/ocaml-version-4.0.0.tbz#md5:6734fe7a4f8ac3bea39a0bcf40a31a82" ], "opam": { "name": "ocaml-version", - "version": "3.7.3", - "path": "esy.lock/opam/ocaml-version.3.7.3" + "version": "4.0.0", + "path": "esy.lock/opam/ocaml-version.4.0.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, - "@opam/ocaml-lsp-server@opam:1.20.1-4.14@38561156": { - "id": "@opam/ocaml-lsp-server@opam:1.20.1-4.14@38561156", + "@opam/ocaml-lsp-server@opam:1.21.0@3b310a8b": { + "id": "@opam/ocaml-lsp-server@opam:1.21.0@3b310a8b", "name": "@opam/ocaml-lsp-server", - "version": "opam:1.20.1-4.14", + "version": "opam:1.21.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/ac/ace96d00141e6d71156b519b2e36b8dedea7960ad923cfe940406dc807e6af59#sha256:ace96d00141e6d71156b519b2e36b8dedea7960ad923cfe940406dc807e6af59", - "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.20.1-4.14/lsp-1.20.1-4.14.tbz#sha256:ace96d00141e6d71156b519b2e36b8dedea7960ad923cfe940406dc807e6af59" + "archive:https://opam.ocaml.org/cache/sha256/67/67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717#sha256:67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.21.0/lsp-1.21.0.tbz#sha256:67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717" ], "opam": { "name": "ocaml-lsp-server", - "version": "1.20.1-4.14", - "path": "esy.lock/opam/ocaml-lsp-server.1.20.1-4.14" + "version": "1.21.0", + "path": "esy.lock/opam/ocaml-lsp-server.1.21.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/xdg@opam:3.17.2@fffb074d", "@opam/stdune@opam:3.17.2@d1b11ebb", "@opam/spawn@opam:v0.17.0@d0f69739", "@opam/re@opam:1.12.0@42f7a5b9", - "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.17.2@700bb6ce", "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", "@opam/ocamlc-loc@opam:3.17.2@d5743596", - "@opam/merlin-lib@opam:4.18-414@0232e98a", - "@opam/lsp@opam:1.20.1@d90cb238", - "@opam/jsonrpc@opam:1.20.1@e9106817", + "@opam/merlin-lib@opam:5.3-502@45a1163e", + "@opam/lsp@opam:1.21.0@1d6dfa56", + "@opam/jsonrpc@opam:1.21.0@53614e00", "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune-rpc@opam:3.17.2@022f705e", "@opam/dune-build-info@opam:3.17.2@b34a7b66", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/chrome-trace@opam:3.17.2@ece6ea1d", "@opam/camlp-streams@opam:5.0.1@8e96208c", - "@opam/base@opam:v0.16.3@162b7c08", + "@opam/base@opam:v0.17.1@699decbd", "@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", + "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/xdg@opam:3.17.2@fffb074d", "@opam/stdune@opam:3.17.2@d1b11ebb", "@opam/spawn@opam:v0.17.0@d0f69739", "@opam/re@opam:1.12.0@42f7a5b9", - "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.17.2@700bb6ce", "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", "@opam/ocamlc-loc@opam:3.17.2@d5743596", - "@opam/merlin-lib@opam:4.18-414@0232e98a", - "@opam/lsp@opam:1.20.1@d90cb238", - "@opam/jsonrpc@opam:1.20.1@e9106817", + "@opam/merlin-lib@opam:5.3-502@45a1163e", + "@opam/lsp@opam:1.21.0@1d6dfa56", + "@opam/jsonrpc@opam:1.21.0@53614e00", "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune-rpc@opam:3.17.2@022f705e", "@opam/dune-build-info@opam:3.17.2@b34a7b66", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/chrome-trace@opam:3.17.2@ece6ea1d", "@opam/camlp-streams@opam:5.0.1@8e96208c", - "@opam/base@opam:v0.16.3@162b7c08", + "@opam/base@opam:v0.17.1@699decbd", "@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.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, - "@opam/merlin-lib@opam:4.18-414@0232e98a": { - "id": "@opam/merlin-lib@opam:4.18-414@0232e98a", + "@opam/merlin-lib@opam:5.3-502@45a1163e": { + "id": "@opam/merlin-lib@opam:5.3-502@45a1163e", "name": "@opam/merlin-lib", - "version": "opam:4.18-414", + "version": "opam:5.3-502", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f6/f6d6f7a266141e358c1a869612c8135c859185d547ea3ba5c9ad7bb67fe30cc1#sha256:f6d6f7a266141e358c1a869612c8135c859185d547ea3ba5c9ad7bb67fe30cc1", - "archive:https://github.com/ocaml/merlin/releases/download/v4.18-414/merlin-4.18-414.tbz#sha256:f6d6f7a266141e358c1a869612c8135c859185d547ea3ba5c9ad7bb67fe30cc1" + "archive:https://opam.ocaml.org/cache/sha256/2c/2cea46f12397fa6e31ef0c0d4f5e11c1cfd916ee49420694005c95ebb3aa24bc#sha256:2cea46f12397fa6e31ef0c0d4f5e11c1cfd916ee49420694005c95ebb3aa24bc", + "archive:https://github.com/ocaml/merlin/releases/download/v5.3-502/merlin-5.3-502.tbz#sha256:2cea46f12397fa6e31ef0c0d4f5e11c1cfd916ee49420694005c95ebb3aa24bc" ], "opam": { "name": "merlin-lib", - "version": "4.18-414", - "path": "esy.lock/opam/merlin-lib.4.18-414" + "version": "5.3-502", + "path": "esy.lock/opam/merlin-lib.5.3-502" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4" ], "available": "true" @@ -958,11 +958,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -984,11 +984,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1010,11 +1010,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1036,75 +1036,75 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20240715@9d924351", + "ocaml@5.2.0@d41d8cd9", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhirCST@opam:20240715@b768dcc7", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20240715@9d924351", + "ocaml@5.2.0@d41d8cd9", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhirCST@opam:20240715@b768dcc7", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, - "@opam/lsp@opam:1.20.1@d90cb238": { - "id": "@opam/lsp@opam:1.20.1@d90cb238", + "@opam/lsp@opam:1.21.0@1d6dfa56": { + "id": "@opam/lsp@opam:1.21.0@1d6dfa56", "name": "@opam/lsp", - "version": "opam:1.20.1", + "version": "opam:1.21.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/27/27ee54389a46701012a612dccd1f6f29ff353e348c7ba6de0fee37767dba3921#sha256:27ee54389a46701012a612dccd1f6f29ff353e348c7ba6de0fee37767dba3921", - "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.20.1/lsp-1.20.1.tbz#sha256:27ee54389a46701012a612dccd1f6f29ff353e348c7ba6de0fee37767dba3921" + "archive:https://opam.ocaml.org/cache/sha256/67/67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717#sha256:67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.21.0/lsp-1.21.0.tbz#sha256:67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717" ], "opam": { "name": "lsp", - "version": "1.20.1", - "path": "esy.lock/opam/lsp.1.20.1" + "version": "1.21.0", + "path": "esy.lock/opam/lsp.1.21.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/uutf@opam:1.0.3@3527936b", - "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", - "@opam/jsonrpc@opam:1.20.1@e9106817", + "ocaml@5.2.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.21.0@53614e00", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/uutf@opam:1.0.3@3527936b", - "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", - "@opam/jsonrpc@opam:1.20.1@e9106817", + "ocaml@5.2.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.21.0@53614e00", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, - "@opam/jsonrpc@opam:1.20.1@e9106817": { - "id": "@opam/jsonrpc@opam:1.20.1@e9106817", + "@opam/jsonrpc@opam:1.21.0@53614e00": { + "id": "@opam/jsonrpc@opam:1.21.0@53614e00", "name": "@opam/jsonrpc", - "version": "opam:1.20.1", + "version": "opam:1.21.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/27/27ee54389a46701012a612dccd1f6f29ff353e348c7ba6de0fee37767dba3921#sha256:27ee54389a46701012a612dccd1f6f29ff353e348c7ba6de0fee37767dba3921", - "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.20.1/lsp-1.20.1.tbz#sha256:27ee54389a46701012a612dccd1f6f29ff353e348c7ba6de0fee37767dba3921" + "archive:https://opam.ocaml.org/cache/sha256/67/67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717#sha256:67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.21.0/lsp-1.21.0.tbz#sha256:67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717" ], "opam": { "name": "jsonrpc", - "version": "1.20.1", - "path": "esy.lock/opam/jsonrpc.1.20.1" + "version": "1.21.0", + "path": "esy.lock/opam/jsonrpc.1.21.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1126,10 +1126,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/sedlex@opam:3.3@8168b930", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhir@opam:20240715@454ed5d1", @@ -1138,7 +1138,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/sedlex@opam:3.3@8168b930", "@opam/ppxlib@opam:0.35.0@8cd01f8f", "@opam/menhirSdk@opam:20240715@9d924351", @@ -1167,11 +1167,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" @@ -1194,14 +1194,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.0@d41d8cd9", "@opam/topkg@opam:1.0.8@eb5a05af", + "@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.2.0@d41d8cd9", "@opam/astring@opam:0.8.5@9975798d" ], "available": "true" }, @@ -1223,11 +1223,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1249,12 +1249,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.17.2@d1b11ebb", + "ocaml@5.2.0@d41d8cd9", "@opam/stdune@opam:3.17.2@d1b11ebb", "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.17.2@d1b11ebb", + "ocaml@5.2.0@d41d8cd9", "@opam/stdune@opam:3.17.2@d1b11ebb", "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" @@ -1277,11 +1277,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1303,12 +1303,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "ocaml@5.2.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.17.2@700bb6ce", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "ocaml@5.2.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.17.2@700bb6ce", "@opam/dune@opam:3.17.2@31dc7e86" ], @@ -1365,13 +1365,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@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.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ], @@ -1395,11 +1395,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1421,12 +1421,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@5.2.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.2.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ], "available": "true" @@ -1449,11 +1449,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1471,24 +1471,6 @@ "dependencies": [], "devDependencies": [] }, - "@opam/conf-bash@opam:1@46c43d96": { - "id": "@opam/conf-bash@opam:1@46c43d96", - "name": "@opam/conf-bash", - "version": "opam:1", - "source": { - "type": "install", - "source": [ "no-source:" ], - "opam": { - "name": "conf-bash", - "version": "1", - "path": "esy.lock/opam/conf-bash.1" - } - }, - "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [], - "available": "true" - }, "@opam/cmdliner@opam:1.3.0@8e6dd99f": { "id": "@opam/cmdliner@opam:1.3.0@8e6dd99f", "name": "@opam/cmdliner", @@ -1507,9 +1489,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.2.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": [ "ocaml@5.2.0@d41d8cd9" ], "available": "true" }, "@opam/chrome-trace@opam:3.17.2@ece6ea1d": { @@ -1530,11 +1512,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1556,11 +1538,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], "available": "true" }, @@ -1600,8 +1582,8 @@ "devDependencies": [], "available": "true" }, - "@opam/base-bytes@opam:base@19d0c2ff": { - "id": "@opam/base-bytes@opam:base@19d0c2ff", + "@opam/base-bytes@opam:base@785dbd33": { + "id": "@opam/base-bytes@opam:base@785dbd33", "name": "@opam/base-bytes", "version": "opam:base", "source": { @@ -1615,43 +1597,44 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.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.3@6f4741ee" + "ocaml@5.2.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5" ], "available": "true" }, - "@opam/base@opam:v0.16.3@162b7c08": { - "id": "@opam/base@opam:v0.16.3@162b7c08", + "@opam/base@opam:v0.17.1@699decbd": { + "id": "@opam/base@opam:v0.17.1@699decbd", "name": "@opam/base", - "version": "opam:v0.16.3", + "version": "opam:v0.17.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/04/04572fc23a4651604cfcab83f720cb4c#md5:04572fc23a4651604cfcab83f720cb4c", - "archive:https://github.com/janestreet/base/archive/refs/tags/v0.16.3.tar.gz#md5:04572fc23a4651604cfcab83f720cb4c" + "archive:https://opam.ocaml.org/cache/md5/9a/9ad01b82a1013ca72b9b7628c9a5d954#md5:9ad01b82a1013ca72b9b7628c9a5d954", + "archive:https://github.com/janestreet/base/archive/refs/tags/v0.17.1.tar.gz#md5:9ad01b82a1013ca72b9b7628c9a5d954" ], "opam": { "name": "base", - "version": "v0.16.3", - "path": "esy.lock/opam/base.v0.16.3" + "version": "v0.17.1", + "path": "esy.lock/opam/base.v0.17.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@21847769", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@ea7fa575", "@opam/dune-configurator@opam:3.17.2@6a903a8c", - "@opam/dune@opam:3.17.2@31dc7e86", "@opam/conf-bash@opam:1@46c43d96", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@21847769", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@ea7fa575", "@opam/dune-configurator@opam:3.17.2@6a903a8c", - "@opam/dune@opam:3.17.2@31dc7e86", "@opam/conf-bash@opam:1@46c43d96" + "@opam/dune@opam:3.17.2@31dc7e86" ], - "available": "true" + "available": "arch != \"arm32\" & arch != \"x86_32\"" }, "@opam/astring@opam:0.8.5@9975798d": { "id": "@opam/astring@opam:0.8.5@9975798d", @@ -1671,12 +1654,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "ocaml@5.2.0@d41d8cd9", "@opam/topkg@opam:1.0.8@eb5a05af", + "@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.2.0@d41d8cd9" ], "available": "true" }, "@grain/libbinaryen@link-dev:./package.json": { @@ -1690,14 +1673,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", + "ocaml@5.2.0@d41d8cd9", "@opam/dune-configurator@opam:3.17.2@6a903a8c", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9" ], "devDependencies": [ - "@opam/ocamlformat@opam:0.26.1@095796c0", - "@opam/ocaml-lsp-server@opam:1.20.1-4.14@38561156", + "@opam/ocamlformat@opam:0.27.0@6c2dc1c8", + "@opam/ocaml-lsp-server@opam:1.21.0@3b310a8b", "@opam/js_of_ocaml-compiler@opam:5.9.1@e8650b39" ] }, diff --git a/esy.lock/opam/base-bytes.base/opam b/esy.lock/opam/base-bytes.base/opam index f1cae50..103dca9 100644 --- a/esy.lock/opam/base-bytes.base/opam +++ b/esy.lock/opam/base-bytes.base/opam @@ -7,3 +7,4 @@ depends: [ "ocamlfind" {>= "1.5.3"} ] synopsis: "Bytes library distributed with the OCaml compiler" +x-maintained: true diff --git a/esy.lock/opam/base.v0.16.3/opam b/esy.lock/opam/base.v0.17.1/opam similarity index 72% rename from esy.lock/opam/base.v0.16.3/opam rename to esy.lock/opam/base.v0.17.1/opam index c54e000..faba069 100644 --- a/esy.lock/opam/base.v0.16.3/opam +++ b/esy.lock/opam/base.v0.17.1/opam @@ -10,12 +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" & < "v0.18"} + "sexplib0" {>= "v0.17" & < "v0.18"} + "dune" {>= "3.11.0"} "dune-configurator" - "conf-bash" ] +available: arch != "arm32" & arch != "x86_32" synopsis: "Full standard library replacement for OCaml" description: " Full standard library replacement for OCaml @@ -32,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.3.tar.gz" + src: "https://github.com/janestreet/base/archive/refs/tags/v0.17.1.tar.gz" checksum: [ - "md5=04572fc23a4651604cfcab83f720cb4c" - "sha512=69380ed392faf4495459f97f70a10a6959fce71d2e6ba093472fc272141646307fd7872407de855dfa48ef0435f6587eae5aa50f4a67eac40a9e1946d0c3c070" + "md5=9ad01b82a1013ca72b9b7628c9a5d954" + "sha512=ed5eb5e83d8085fc06f111862d609b393e394bbdcc6e25bab50030a250ffa2e540dbee02169b6f28ec220f10f61d189cd7b5646eece910c63620f5174fb5a655" ] } diff --git a/esy.lock/opam/conf-bash.1/opam b/esy.lock/opam/conf-bash.1/opam deleted file mode 100644 index c427672..0000000 --- a/esy.lock/opam/conf-bash.1/opam +++ /dev/null @@ -1,14 +0,0 @@ -opam-version: "2.0" -maintainer: "code@bnwr.net" -homepage: "https://www.gnu.org/software/bash/" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -license: "GPL-3.0-or-later" -build: ["bash" "--version"] -depexts: [ - ["bash"] {os-family = "bsd"} - ["bash"] {os-distribution = "alpine"} -] -synopsis: "Virtual package to install the Bash shell" -description: "This package will install a system bash" -authors: "code@bnwr.net" -flags: conf diff --git a/esy.lock/opam/jsonrpc.1.20.1/opam b/esy.lock/opam/jsonrpc.1.21.0/opam similarity index 70% rename from esy.lock/opam/jsonrpc.1.20.1/opam rename to esy.lock/opam/jsonrpc.1.21.0/opam index cca7b68..07d7c80 100644 --- a/esy.lock/opam/jsonrpc.1.20.1/opam +++ b/esy.lock/opam/jsonrpc.1.21.0/opam @@ -36,12 +36,14 @@ build: [ "@doc" {with-doc} ] ] + +x-maintenance-intent: [ "(latest)" "(latest)-414" ] url { src: - "https://github.com/ocaml/ocaml-lsp/releases/download/1.20.1/lsp-1.20.1.tbz" + "https://github.com/ocaml/ocaml-lsp/releases/download/1.21.0/lsp-1.21.0.tbz" checksum: [ - "sha256=27ee54389a46701012a612dccd1f6f29ff353e348c7ba6de0fee37767dba3921" - "sha512=9e2d0fb2b316d0d1040e7043a7a38475217e5b727a669a1978c1850514a209ea7f7b04dbc9c7bf2654f9840d24d954f4530d5e93a807be633b487ef99c1c1b4f" + "sha256=67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717" + "sha512=e0f9abdcfc96c13d043b7e31ffc9991be52c4160dade5f71b277c7d8091d7271f5998abb6b30557955ba1615a4cc096b89ab5038da6b4e4e722fb598a0ff8ea8" ] } -x-commit-hash: "4c57c6ab72fdc9997e16db05ca41095c06df841c" +x-commit-hash: "643f59044f8fad14eb32cd52810008cf012c3008" diff --git a/esy.lock/opam/lsp.1.20.1/opam b/esy.lock/opam/lsp.1.21.0/opam similarity index 73% rename from esy.lock/opam/lsp.1.20.1/opam rename to esy.lock/opam/lsp.1.21.0/opam index 910e928..ccc277f 100644 --- a/esy.lock/opam/lsp.1.20.1/opam +++ b/esy.lock/opam/lsp.1.21.0/opam @@ -31,6 +31,7 @@ depends: [ "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: [ @@ -46,12 +47,14 @@ build: [ "@doc" {with-doc} ] ] + +x-maintenance-intent: [ "(latest)" "(latest)-414" ] url { src: - "https://github.com/ocaml/ocaml-lsp/releases/download/1.20.1/lsp-1.20.1.tbz" + "https://github.com/ocaml/ocaml-lsp/releases/download/1.21.0/lsp-1.21.0.tbz" checksum: [ - "sha256=27ee54389a46701012a612dccd1f6f29ff353e348c7ba6de0fee37767dba3921" - "sha512=9e2d0fb2b316d0d1040e7043a7a38475217e5b727a669a1978c1850514a209ea7f7b04dbc9c7bf2654f9840d24d954f4530d5e93a807be633b487ef99c1c1b4f" + "sha256=67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717" + "sha512=e0f9abdcfc96c13d043b7e31ffc9991be52c4160dade5f71b277c7d8091d7271f5998abb6b30557955ba1615a4cc096b89ab5038da6b4e4e722fb598a0ff8ea8" ] } -x-commit-hash: "4c57c6ab72fdc9997e16db05ca41095c06df841c" +x-commit-hash: "643f59044f8fad14eb32cd52810008cf012c3008" diff --git a/esy.lock/opam/merlin-lib.4.18-414/opam b/esy.lock/opam/merlin-lib.5.3-502/opam similarity index 66% rename from esy.lock/opam/merlin-lib.4.18-414/opam rename to esy.lock/opam/merlin-lib.5.3-502/opam index d7192b2..e3720d6 100644 --- a/esy.lock/opam/merlin-lib.4.18-414/opam +++ b/esy.lock/opam/merlin-lib.5.3-502/opam @@ -10,8 +10,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.14" & < "4.15"} - "dune" {>= "2.9.0"} + "ocaml" {>= "5.2" & < "5.3"} + "dune" {>= "3.0.0"} "csexp" {>= "1.5.1"} "alcotest" {with-test & >= "1.3.0" } "menhir" {dev & >= "20201216"} @@ -26,10 +26,10 @@ description: thoroughly documented, and its public API might break with any new release." url { src: - "https://github.com/ocaml/merlin/releases/download/v4.18-414/merlin-4.18-414.tbz" + "https://github.com/ocaml/merlin/releases/download/v5.3-502/merlin-5.3-502.tbz" checksum: [ - "sha256=f6d6f7a266141e358c1a869612c8135c859185d547ea3ba5c9ad7bb67fe30cc1" - "sha512=4f272bdb028fd984fef406f7e1eadd0a3ab99d94016316f1b842782b1d1bba2bd50dcf3b4021c2096c6d9b5e5f9f6bae61bedcfd9f933f15c190e01777ef83a9" + "sha256=2cea46f12397fa6e31ef0c0d4f5e11c1cfd916ee49420694005c95ebb3aa24bc" + "sha512=e94abb9ae38149245337db033e2c3891c7ec772168e99abf1bda0216a894c0854e7170b56fe88eba83ec98f2ebc0f5c7c723e8db14f59eeb6dd348bec12c6d62" ] } -x-commit-hash: "2b9cd21c24a687ca4dc6d0a191942b13903eae82" +x-commit-hash: "ac951c635e09d6d72462eb9bb70ee4b9ee844d0d" 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 a2df8c6..0000000 --- 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 0000000..ec1b9b6 --- /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.20.1-4.14/opam b/esy.lock/opam/ocaml-lsp-server.1.21.0/opam similarity index 69% rename from esy.lock/opam/ocaml-lsp-server.1.20.1-4.14/opam rename to esy.lock/opam/ocaml-lsp-server.1.21.0/opam index 31a467d..36b3654 100644 --- a/esy.lock/opam/ocaml-lsp-server.1.20.1-4.14/opam +++ b/esy.lock/opam/ocaml-lsp-server.1.21.0/opam @@ -21,8 +21,8 @@ depends: [ "dune" {>= "3.0"} "yojson" "base" {>= "v0.16.0"} - "lsp" {= "1.20.1"} - "jsonrpc" {= "1.20.1"} + "lsp" {= version} + "jsonrpc" {= version} "re" {>= "1.5.0"} "ppx_yojson_conv_lib" {>= "v0.14"} "dune-rpc" {>= "3.4.0"} @@ -30,21 +30,22 @@ depends: [ "dyn" "stdune" "fiber" {>= "3.1.1" & < "4.0.0"} - "ocaml" {>= "4.14.0" & < "5.0"} + "ocaml" {>= "5.2.0" & < "5.3"} "xdg" "ordering" "dune-build-info" "spawn" "astring" "camlp-streams" - "ppx_expect" {>= "v0.15.0" & < "v0.17.0" & with-test} + "ppx_expect" {>= "v0.17.0" & with-test} "ocamlformat" {with-test & = "0.26.2"} "ocamlc-loc" {>= "3.7.0"} "pp" {>= "1.1.2"} "csexp" {>= "1.5"} "ocamlformat-rpc-lib" {>= "0.21.0"} "odoc" {with-doc} - "merlin-lib" {>= "4.18" & < "5.0"} + "merlin-lib" {>= "5.2" & < "6.0"} + "ppx_yojson_conv" {with-dev-setup} ] dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" build: [ @@ -60,12 +61,14 @@ build: [ "@doc" {with-doc} ] ] + +x-maintenance-intent: [ "(latest)" "(latest)-414" ] url { src: - "https://github.com/ocaml/ocaml-lsp/releases/download/1.20.1-4.14/lsp-1.20.1-4.14.tbz" + "https://github.com/ocaml/ocaml-lsp/releases/download/1.21.0/lsp-1.21.0.tbz" checksum: [ - "sha256=ace96d00141e6d71156b519b2e36b8dedea7960ad923cfe940406dc807e6af59" - "sha512=abc56f38168c13f30e1c8a572526c187ab87d84b3df4cc20f6c7abf031f259620a303a33d39cdfe7051704d397f8b8415073e3b1920c0dcd7905db6689ca7965" + "sha256=67870337ff23d0d2ba43774bfb58a8fde04977ea37da4d2dc500ed0b57cef717" + "sha512=e0f9abdcfc96c13d043b7e31ffc9991be52c4160dade5f71b277c7d8091d7271f5998abb6b30557955ba1615a4cc096b89ab5038da6b4e4e722fb598a0ff8ea8" ] } -x-commit-hash: "40c510660ced868698040ca1b480e9d237ee3845" +x-commit-hash: "643f59044f8fad14eb32cd52810008cf012c3008" diff --git a/esy.lock/opam/ocaml-version.3.7.3/opam b/esy.lock/opam/ocaml-version.4.0.0/opam similarity index 86% rename from esy.lock/opam/ocaml-version.3.7.3/opam rename to esy.lock/opam/ocaml-version.4.0.0/opam index e907054..1d4828e 100644 --- a/esy.lock/opam/ocaml-version.3.7.3/opam +++ b/esy.lock/opam/ocaml-version.4.0.0/opam @@ -43,12 +43,12 @@ build: [ ] ] dev-repo: "git+https://github.com/ocurrent/ocaml-version.git" -x-maintenance-intent: [ "(latest)" ] url { src: - "https://github.com/ocurrent/ocaml-version/releases/download/v3.7.3/ocaml-version-3.7.3.tbz" + "https://github.com/ocurrent/ocaml-version/releases/download/v4.0.0/ocaml-version-4.0.0.tbz" checksum: [ - "md5=19a39d2f0d3cbcd35a97131ac254bacb" - "sha512=f38cc6e78ed0e3590757ce083baf8954c98243486264de1742006a9f96fdc15080d38e1cd6475bb6a989e2e12204bffa66617ecb93719498470820ab4fd3ad5c" + "md5=6734fe7a4f8ac3bea39a0bcf40a31a82" + "sha512=093a7aadb382a21ab5ae2a1d87bc06f9ecb4584ae6a8a2b492ffdf23dc4ae2788ce19cdf2ea87191dc7ee391ae2d26b734342880742f73cb700933d8cf6856e5" ] } +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 0000000..e4cd8e9 --- /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 != "arm32" & 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/ocamlfind.1.9.3/opam b/esy.lock/opam/ocamlfind.1.9.8/opam similarity index 68% rename from esy.lock/opam/ocamlfind.1.9.3/opam rename to esy.lock/opam/ocamlfind.1.9.8/opam index d734d63..d9fe393 100644 --- a/esy.lock/opam/ocamlfind.1.9.3/opam +++ b/esy.lock/opam/ocamlfind.1.9.8/opam @@ -1,28 +1,31 @@ opam-version: "2.0" synopsis: "A library manager for OCaml" -description: """ +description: """\ Findlib is a library manager for OCaml. It provides a convention how to store libraries, and a file format ("META") to describe the properties of libraries. There is also a tool (ocamlfind) for interpreting the META files, so that it is very easy to use libraries -in programs and scripts. -""" -license: "MIT" +in programs and scripts.""" maintainer: "Thomas Gazagnaire " authors: "Gerd Stolpmann " +license: "MIT" homepage: "http://projects.camlcity.org/projects/findlib.html" bug-reports: "https://github.com/ocaml/ocamlfind/issues" depends: [ - "ocaml" {>= "4.00.0" & < "5.0"} + "ocaml" {>= "3.08.0"} ] depopts: ["graphics"] build: [ [ "./configure" - "-bindir" bin - "-sitelib" lib - "-mandir" man - "-config" "%{lib}%/findlib.conf" + "-bindir" + bin + "-sitelib" + lib + "-mandir" + man + "-config" + "%{lib}%/findlib.conf" "-no-custom" "-no-camlp4" {!ocaml:preinstalled & ocaml:version >= "4.02.0"} "-no-topfind" {ocaml:preinstalled} @@ -36,9 +39,10 @@ install: [ ] dev-repo: "git+https://github.com/ocaml/ocamlfind.git" url { - src: "http://download.camlcity.org/download/findlib-1.9.3.tar.gz" + src: + "https://github.com/ocaml/ocamlfind/archive/refs/tags/findlib-1.9.8.tar.gz" checksum: [ - "md5=24047dd8a0da5322253de9b7aa254e42" - "sha512=27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea" + "md5=ca770e5806032a96131b670f6e07f146" + "sha512=8967986de2ab4ec5993f437b0a4206742adf37aa7a292a3bba0a04438d78539b84d001191e60b2d5bde98a695b38cba2593b7051f7749adbdb964a0df3c4b661" ] -} +} \ No newline at end of file diff --git a/esy.lock/opam/ocamlformat-lib.0.26.1/opam b/esy.lock/opam/ocamlformat-lib.0.27.0/opam similarity index 80% rename from esy.lock/opam/ocamlformat-lib.0.26.1/opam rename to esy.lock/opam/ocamlformat-lib.0.27.0/opam index 1b35c15..1843cd1 100644 --- a/esy.lock/opam/ocamlformat-lib.0.26.1/opam +++ b/esy.lock/opam/ocamlformat-lib.0.27.0/opam @@ -17,14 +17,15 @@ authors: [ homepage: "https://github.com/ocaml-ppx/ocamlformat" bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" depends: [ - "ocaml" {>= "4.08" & < "5.2"} + "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" + "fpath" {>= "0.7.3"} "menhir" {>= "20201216"} "menhirLib" {>= "20201216"} "menhirSdk" {>= "20201216"} @@ -36,7 +37,6 @@ depends: [ "uutf" {>= "1.0.1"} "csexp" {>= "1.4.0"} "astring" - "result" "camlp-streams" "odoc" {with-doc} ] @@ -59,10 +59,10 @@ 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.26.1/ocamlformat-0.26.1.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz" checksum: [ - "sha256=da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7" - "sha512=b7413f8dc47ba3a2372e89d59cae54f9a602ab81e31cd14ed986a831111080b79a5a3cc45dac04d8ffae5054c35bf29fe9559f145c76c87a30e191ed5400942a" + "sha256=ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15" + "sha512=4d2a8965a7b7ad45f8f4e76c01cf38bfa68462b07dfa7bdb2db23bd3e3017b214e6780f036679fa8595dde4167a01d957e3af8837274320449014e306773f917" ] } -x-commit-hash: "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3" +x-commit-hash: "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1" diff --git a/esy.lock/opam/ocamlformat.0.26.1/opam b/esy.lock/opam/ocamlformat.0.27.0/opam similarity index 84% rename from esy.lock/opam/ocamlformat.0.26.1/opam rename to esy.lock/opam/ocamlformat.0.27.0/opam index 86b7eba..b4e242b 100644 --- a/esy.lock/opam/ocamlformat.0.26.1/opam +++ b/esy.lock/opam/ocamlformat.0.27.0/opam @@ -22,8 +22,9 @@ authors: [ homepage: "https://github.com/ocaml-ppx/ocamlformat" bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" depends: [ - "ocaml" {>= "4.08" & < "5.2"} + "ocaml" {>= "4.08"} "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} @@ -49,10 +50,10 @@ 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.26.1/ocamlformat-0.26.1.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz" checksum: [ - "sha256=da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7" - "sha512=b7413f8dc47ba3a2372e89d59cae54f9a602ab81e31cd14ed986a831111080b79a5a3cc45dac04d8ffae5054c35bf29fe9559f145c76c87a30e191ed5400942a" + "sha256=ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15" + "sha512=4d2a8965a7b7ad45f8f4e76c01cf38bfa68462b07dfa7bdb2db23bd3e3017b214e6780f036679fa8595dde4167a01d957e3af8837274320449014e306773f917" ] } -x-commit-hash: "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3" +x-commit-hash: "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1" diff --git a/esy.lock/opam/ocp-indent.1.7.0/opam b/esy.lock/opam/ocp-indent.1.7.0/opam index 3e65bc1..c6c47b9 100644 --- a/esy.lock/opam/ocp-indent.1.7.0/opam +++ b/esy.lock/opam/ocp-indent.1.7.0/opam @@ -32,7 +32,7 @@ run-test: [ depends: [ "ocaml" "dune" - "cmdliner" {>= "1.0.0"} + "cmdliner" {>= "1.0.0" & < "2.0.0"} "ocamlfind" "base-bytes" ] 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 c3e72b4..d58fda4 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/result.1.5/opam b/esy.lock/opam/result.1.5/opam deleted file mode 100644 index da55ed4..0000000 --- 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/sexplib0.v0.16.0/opam b/esy.lock/opam/sexplib0.v0.17.0/opam similarity index 65% rename from esy.lock/opam/sexplib0.v0.16.0/opam rename to esy.lock/opam/sexplib0.v0.17.0/opam index d9c5f04..4a8cdc5 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 != "arm32" & 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 69% rename from esy.lock/opam/stdio.v0.16.0/opam rename to esy.lock/opam/stdio.v0.17.0/opam index bd23d60..daecaa2 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 != "arm32" & 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/topkg.1.0.7/opam b/esy.lock/opam/topkg.1.0.8/opam similarity index 82% rename from esy.lock/opam/topkg.1.0.7/opam rename to esy.lock/opam/topkg.1.0.8/opam index 37c84bf..304ccb9 100644 --- a/esy.lock/opam/topkg.1.0.7/opam +++ b/esy.lock/opam/topkg.1.0.8/opam @@ -1,6 +1,8 @@ opam-version: "2.0" synopsis: "The transitory OCaml software packager" description: """\ +**Warning** Topkg is in maintenance mode and should not longer be used. + Topkg is a packager for distributing OCaml software. It provides an API to describe the files a package installs in a given build configuration and to specify information about the package's @@ -25,7 +27,7 @@ Topkg-care is distributed under the ISC license it depends on [cmdliner]: http://erratique.ch/software/cmdliner [webbrowser]: http://erratique.ch/software/webbrowser -Home page: http://erratique.ch/software/topkg""" +Home page: """ maintainer: "Daniel Bünzli " authors: "The topkg programmers" license: "ISC" @@ -34,15 +36,15 @@ homepage: "https://erratique.ch/software/topkg" doc: "https://erratique.ch/software/topkg/doc" bug-reports: "https://github.com/dbuenzli/topkg/issues" depends: [ - "ocaml" {>= "4.05.0"} + "ocaml" {>= "4.08.0"} "ocamlfind" {build & >= "1.6.1"} "ocamlbuild" ] 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.7.tbz" + src: "https://erratique.ch/software/topkg/releases/topkg-1.0.8.tbz" checksum: - "sha512=09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535" + "sha512=4b632b60137852bb72ff9c8cdc2e16ac5ece6473569e50963fef9c1e800a0933a516bea1107b04011645afa4a1e78893c82dbce0aa8de2970d4d6c6d0dd2fe02" } x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/uutf.1.0.3/opam b/esy.lock/opam/uutf.1.0.3/opam deleted file mode 100644 index 5ca1391..0000000 --- a/esy.lock/opam/uutf.1.0.3/opam +++ /dev/null @@ -1,37 +0,0 @@ -opam-version: "2.0" -synopsis: """Non-blocking streaming Unicode codec for OCaml""" -maintainer: ["Daniel Bünzli "] -authors: ["The uutf programmers"] -homepage: "https://erratique.ch/software/uutf" -doc: "https://erratique.ch/software/uutf/doc/" -dev-repo: "git+https://erratique.ch/repos/uutf.git" -bug-reports: "https://github.com/dbuenzli/uutf/issues" -license: ["ISC"] -tags: ["unicode" "text" "utf-8" "utf-16" "codec" "org:erratique"] -depends: ["ocaml" {>= "4.03.0"} - "ocamlfind" {build} - "ocamlbuild" {build} - "topkg" {build & >= "1.0.3"}] -depopts: ["cmdliner"] -conflicts: ["cmdliner" {< "0.9.8"}] -build: [["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%" - "--with-cmdliner" "%{cmdliner:installed}%"]] -url { - src: "https://erratique.ch/software/uutf/releases/uutf-1.0.3.tbz" - checksum: "sha512=50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8"} -description: """ -Uutf is a non-blocking streaming codec to decode and encode the UTF-8, -UTF-16, UTF-16LE and UTF-16BE encoding schemes. It can efficiently -work character by character without blocking on IO. Decoders perform -character position tracking and support newline normalization. - -Functions are also provided to fold over the characters of UTF encoded -OCaml string values and to directly encode characters in OCaml -Buffer.t values. **Note** that since OCaml 4.14, that functionality -can be found in the Stdlib and you are encouraged to migrate to it. - -Uutf has no dependency and is distributed under the ISC license. - -Home page: http://erratique.ch/software/uutf -Contact: Daniel Bünzli ``""" -x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/uutf.1.0.4/opam b/esy.lock/opam/uutf.1.0.4/opam new file mode 100644 index 0000000..04c6c94 --- /dev/null +++ b/esy.lock/opam/uutf.1.0.4/opam @@ -0,0 +1,42 @@ +opam-version: "2.0" +synopsis: "Non-blocking streaming Unicode codec for OCaml" +description: """\ +**Warning.** You are encouraged not to use this library. + +- As of OCaml 4.14, both UTF encoding and decoding are available + in the standard library, see the `String` and `Buffer` modules. +- If you are looking for a stream abstraction compatible with + effect based concurrency look into [`bytesrw`] package.""" +maintainer: "Daniel Bünzli " +authors: "The uutf programmers" +license: "ISC" +tags: ["unicode" "text" "utf-8" "utf-16" "codec" "org:erratique"] +homepage: "https://erratique.ch/software/uutf" +doc: "https://erratique.ch/software/uutf/doc/" +bug-reports: "https://github.com/dbuenzli/uutf/issues" +depends: [ + "ocaml" {>= "4.08.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build & >= "1.0.3"} +] +depopts: ["cmdliner"] +conflicts: [ + "cmdliner" {< "1.3.0"} +] +build: [ + "ocaml" + "pkg/pkg.ml" + "build" + "--dev-pkg" + "%{dev}%" + "--with-cmdliner" + "%{cmdliner:installed}%" +] +dev-repo: "git+https://erratique.ch/repos/uutf.git" +url { + src: "https://erratique.ch/software/uutf/releases/uutf-1.0.4.tbz" + checksum: + "sha512=e35f408bc971cd8da3077e6c3321e0d8f4eb569898e0e219fde62dae78fbd0a0095cb7f036287656f6a1b346584f7b9f0c6dec0a5a092180da36e43247027598" +} +x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/files/findlib.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/files/findlib.patch deleted file mode 100644 index 3aa5aa6..0000000 --- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/files/findlib.patch +++ /dev/null @@ -1,485 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -281,10 +281,8 @@ - - - let identify_dir d = -- if is_win then -- failwith "identify_dir"; (* not available *) - let s = Unix.stat d in -- (s.Unix.st_dev, s.Unix.st_ino) -+ (s.Unix.st_dev, s.Unix.st_ino) - ;; - - diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/files/findlib.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/files/findlib.patch new file mode 100644 index 0000000..560da81 --- /dev/null +++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/files/findlib.patch @@ -0,0 +1,11 @@ +--- ./Makefile ++++ ./Makefile +@@ -56,7 +56,7 @@ + export USE_CYGPATH; \ + cat findlib.conf.in | \ + $(SH) tools/patch '@SITELIB@' '$(FINDLIB_OCAML_SITELIB)' | \ +- $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' -p >findlib.conf ++ $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ + echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ + fi diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/package.json similarity index 100% rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/package.json rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/package.json diff --git a/libbinaryen.opam b/libbinaryen.opam index 766a8c8..c67bba8 100644 --- a/libbinaryen.opam +++ b/libbinaryen.opam @@ -16,7 +16,7 @@ depends: [ "dune" {>= "3.0.0"} "dune-configurator" {>= "3.0.0"} "js_of_ocaml-compiler" {with-test & >= "4.1.0" < "6.0.0"} - "ocaml" {>= "4.12"} + "ocaml" {>= "4.13"} ] depexts: [ ["gcc-g++"] { os-distribution = "cygwinports" } diff --git a/package.json b/package.json index e54ebdf..4c9ba95 100644 --- a/package.json +++ b/package.json @@ -5,28 +5,26 @@ "author": "Blaine Bublitz ", "license": "Apache-2.0", "dependencies": { - "ocaml": ">= 4.12.0 < 5.0.0", + "ocaml": ">= 4.13.0 < 5.4.0", "@opam/conf-cmake": "grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", "@opam/dune": ">= 3.0.0", "@opam/dune-configurator": ">= 3.0.0" }, "devDependencies": { "@opam/js_of_ocaml-compiler": ">= 4.1.0 < 6.0.0", - "@opam/ocamlformat": "0.26.1", + "@opam/ocamlformat": "0.27.0", "@opam/ocaml-lsp-server": "> 1.9.1 < 2.0.0" }, "resolutions": { "@opam/ocp-indent": "1.7.0", - "@opam/ocamlfind": "1.9.3" + "@opam/ocamlfind": "1.9.8" }, "esy": { "build": [ "dune build -p libbinaryen -j 4" ], "buildEnv": { - "PATH": "#{os == 'windows' ? '/usr/x86_64-w64-mingw32/sys-root/mingw/bin' : '' : $PATH }", - "CC": "#{os == 'windows' ? 'x86_64-w64-mingw32-gcc' : ''}", - "CXX": "#{os == 'windows' ? 'x86_64-w64-mingw32-g++' : ''}" + "PATH": "#{os == 'windows' ? '/usr/x86_64-w64-mingw32/sys-root/mingw/bin' : '' : $PATH }" }, "exportedEnv": { "PATH": {