From 526e918795b2a8e9e0dea10e75edd6cd0489f9cb Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Sun, 16 Feb 2025 16:44:07 -0600 Subject: [PATCH 01/13] chore: Pin CI dependencies --- .github/workflows/esy.yml | 4 ++-- .github/workflows/opam.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/esy.yml b/.github/workflows/esy.yml index 9b88739c..3a4aae3d 100644 --- a/.github/workflows/esy.yml +++ b/.github/workflows/esy.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-22.04, macos-latest, windows-latest] steps: - name: Setup node.js @@ -29,7 +29,7 @@ jobs: # It also adds `shx` globally for cross-platform shell commands - name: Setup environment run: | - npm i -g esy + npm i -g esy@0.6.12 npm i -g shx - name: Checkout project diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 0e999a2f..57d7c249 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-22.04, macos-latest, windows-latest] ocaml-compiler: [4.12.1, 4.13.1, 4.14.1] steps: From 441e625eff65f6c31365ddd72078d6a789430315 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Sun, 16 Feb 2025 17:34:48 -0600 Subject: [PATCH 02/13] remove jsoo sourcemap flag --- test/dune | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/dune b/test/dune index 57a1356f..e9f7192b 100644 --- a/test/dune +++ b/test/dune @@ -5,8 +5,7 @@ (flags :standard (:include ./config/ocamlopt_flags.sexp)) - (js_of_ocaml - (flags --no-sourcemap))) + (js_of_ocaml)) (rule (alias runtest) From 13a15863ac56dbdef568a5ac4bc86b66e6d1a5b1 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Tue, 4 Mar 2025 10:37:46 -0600 Subject: [PATCH 03/13] Upgrade esy and actions --- .github/workflows/esy.yml | 6 +++--- .github/workflows/opam.yml | 6 +++--- .github/workflows/release.yml | 2 +- package.json | 6 ++---- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/esy.yml b/.github/workflows/esy.yml index 3a4aae3d..73e91b0a 100644 --- a/.github/workflows/esy.yml +++ b/.github/workflows/esy.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] steps: - name: Setup node.js @@ -29,7 +29,7 @@ jobs: # It also adds `shx` globally for cross-platform shell commands - name: Setup environment run: | - npm i -g esy@0.6.12 + npm i -g esy@0.8.0 npm i -g shx - name: Checkout project @@ -43,7 +43,7 @@ jobs: - name: Esy cache id: esy-cache - uses: actions/cache@v3.3.1 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: path: _export key: ${{ runner.os }}-esy-${{ hashFiles('esy.lock/index.json') }} diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 57d7c249..ce99b79a 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] ocaml-compiler: [4.12.1, 4.13.1, 4.14.1] steps: @@ -26,7 +26,7 @@ jobs: submodules: "recursive" - name: Setup OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10 if: ${{ startsWith(matrix.os, 'windows-') }} with: ocaml-compiler: ${{ matrix.ocaml-compiler }} @@ -35,7 +35,7 @@ jobs: default: https://github.com/ocaml/opam-repository.git - name: Setup OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10 if: ${{ !startsWith(matrix.os, 'windows-') }} with: ocaml-compiler: ${{ matrix.ocaml-compiler }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8fc6eefb..728681b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,7 +84,7 @@ jobs: echo -n "$CHANGES" > CHANGES.md - name: Setup OCaml - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10 with: ocaml-compiler: 4.14.0 diff --git a/package.json b/package.json index c0b09786..b67ee42d 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "@opam/ocaml-lsp-server": ">= 1.9.1 < 1.13.0" }, "resolutions": { - "@opam/ocp-indent": "1.7.0" + "@opam/ocp-indent": "1.7.0", + "@opam/ocamlfind": "1.9.2" }, "esy": { "build": "dune build -p binaryen" @@ -25,9 +26,6 @@ "test": "esy b dune runtest --display=short", "format": "dune build @fmt --auto-promote" }, - "installConfig": { - "pnp": false - }, "publishConfig": { "access": "public" }, From 7f2df8634f2c0c4e679c7fc419b0ef9311454302 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Tue, 4 Mar 2025 10:39:59 -0600 Subject: [PATCH 04/13] esy deps --- esy.lock/index.json | 1176 +++++++++-------- esy.lock/opam/astring.0.8.5/opam | 9 +- esy.lock/opam/base-bytes.base/opam | 1 + esy.lock/opam/base.v0.16.3/opam | 1 + esy.lock/opam/camlp-streams.5.0.1/opam | 1 + .../opam | 11 +- .../{cmdliner.1.2.0 => cmdliner.1.3.0}/opam | 7 +- esy.lock/opam/conf-bash.1/opam | 14 + esy.lock/opam/cppo.1.6.9/opam | 39 - .../opam | 11 +- .../opam | 11 +- .../{dune-rpc.3.11.1 => dune-rpc.3.17.2}/opam | 11 +- .../opam/{dune.3.11.1 => dune.3.17.2}/opam | 34 +- esy.lock/opam/{dyn.3.11.1 => dyn.3.17.2}/opam | 11 +- esy.lock/opam/either.1.0.0/opam | 1 + esy.lock/opam/fiber.3.7.0/opam | 2 +- esy.lock/opam/fpath.0.7.3/opam | 9 +- esy.lock/opam/gen.1.1/opam | 2 +- .../opam | 19 +- .../{menhir.20230608 => menhir.20240715}/opam | 7 +- esy.lock/opam/menhirCST.20240715/opam | 29 + .../opam | 8 +- .../opam | 8 +- .../opam/ocaml-compiler-libs.v0.12.4/opam | 2 +- esy.lock/opam/ocamlbuild.0.14.2+win/opam | 38 - esy.lock/opam/ocamlbuild.0.16.1/opam | 44 + .../{ocamlfind.1.9.6 => ocamlfind.1.9.2}/opam | 12 +- .../files/0001-Harden-test-for-OCaml-5.patch | 12 - .../opam | 8 +- esy.lock/opam/ocamlformat.0.24.1/opam | 4 +- esy.lock/opam/octavius.1.2.2/opam | 5 +- esy.lock/opam/omd.1.3.2/opam | 2 +- .../{ordering.3.11.1 => ordering.3.17.2}/opam | 11 +- esy.lock/opam/{pp.1.2.0 => pp.2.0.0}/opam | 11 +- esy.lock/opam/ppx_derivers.1.2.1/opam | 5 +- .../{ppxlib.0.29.1 => ppxlib.0.35.0}/opam | 27 +- esy.lock/opam/{re.1.11.0 => re.1.12.0}/opam | 12 +- esy.lock/opam/result.1.5/opam | 5 +- esy.lock/opam/{sedlex.3.2 => sedlex.3.3}/opam | 8 +- esy.lock/opam/seq.base/files/META.seq | 4 - esy.lock/opam/seq.base/files/seq.install | 3 - esy.lock/opam/seq.base/opam | 20 +- .../{spawn.v0.15.1 => spawn.v0.17.0}/opam | 13 +- .../{stdune.3.11.1 => stdune.3.17.2}/opam | 13 +- esy.lock/opam/topkg.1.0.7/opam | 3 +- .../opam/{uucp.15.1.0 => uucp.16.0.0}/opam | 11 +- .../opam/{uuseg.15.1.0 => uuseg.16.0.0}/opam | 9 +- esy.lock/opam/uutf.1.0.3/opam | 3 +- esy.lock/opam/{xdg.3.11.1 => xdg.3.17.2}/opam | 10 +- .../opam/{yojson.2.1.1 => yojson.2.2.2}/opam | 11 +- .../files/ocamlbuild-0.14.2.patch | 0 .../files/winpatch.patch | 11 - .../package.json | 29 - .../files/findlib-1.9.2.patch | 471 +++++++ .../package.json | 2 +- .../files/findlib.patch | 11 - 56 files changed, 1398 insertions(+), 854 deletions(-) rename esy.lock/opam/{chrome-trace.3.11.1 => chrome-trace.3.17.2}/opam (65%) rename esy.lock/opam/{cmdliner.1.2.0 => cmdliner.1.3.0}/opam (88%) create mode 100644 esy.lock/opam/conf-bash.1/opam delete mode 100644 esy.lock/opam/cppo.1.6.9/opam rename esy.lock/opam/{dune-build-info.3.11.1 => dune-build-info.3.17.2}/opam (72%) rename esy.lock/opam/{dune-configurator.3.11.1 => dune-configurator.3.17.2}/opam (72%) rename esy.lock/opam/{dune-rpc.3.11.1 => dune-rpc.3.17.2}/opam (66%) rename esy.lock/opam/{dune.3.11.1 => dune.3.17.2}/opam (51%) rename esy.lock/opam/{dyn.3.11.1 => dyn.3.17.2}/opam (64%) rename esy.lock/opam/{js_of_ocaml-compiler.5.4.0 => js_of_ocaml-compiler.5.9.1}/opam (71%) rename esy.lock/opam/{menhir.20230608 => menhir.20240715}/opam (69%) create mode 100644 esy.lock/opam/menhirCST.20240715/opam rename esy.lock/opam/{menhirLib.20230608 => menhirLib.20240715}/opam (67%) rename esy.lock/opam/{menhirSdk.20230608 => menhirSdk.20240715}/opam (67%) delete mode 100644 esy.lock/opam/ocamlbuild.0.14.2+win/opam create mode 100644 esy.lock/opam/ocamlbuild.0.16.1/opam rename esy.lock/opam/{ocamlfind.1.9.6 => ocamlfind.1.9.2}/opam (70%) delete mode 100644 esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch rename esy.lock/opam/{ocamlformat-rpc-lib.0.26.1 => ocamlformat-rpc-lib.0.27.0}/opam (78%) rename esy.lock/opam/{ordering.3.11.1 => ordering.3.17.2}/opam (62%) rename esy.lock/opam/{pp.1.2.0 => pp.2.0.0}/opam (78%) rename esy.lock/opam/{ppxlib.0.29.1 => ppxlib.0.35.0}/opam (61%) rename esy.lock/opam/{re.1.11.0 => re.1.12.0}/opam (71%) rename esy.lock/opam/{sedlex.3.2 => sedlex.3.3}/opam (83%) delete mode 100644 esy.lock/opam/seq.base/files/META.seq delete mode 100644 esy.lock/opam/seq.base/files/seq.install rename esy.lock/opam/{spawn.v0.15.1 => spawn.v0.17.0}/opam (71%) rename esy.lock/opam/{stdune.3.11.1 => stdune.3.17.2}/opam (66%) rename esy.lock/opam/{uucp.15.1.0 => uucp.16.0.0}/opam (79%) rename esy.lock/opam/{uuseg.15.1.0 => uuseg.16.0.0}/opam (84%) rename esy.lock/opam/{xdg.3.11.1 => xdg.3.17.2}/opam (67%) rename esy.lock/opam/{yojson.2.1.1 => yojson.2.2.2}/opam (73%) delete mode 100644 esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/files/ocamlbuild-0.14.2.patch delete mode 100644 esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/files/winpatch.patch delete mode 100644 esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/package.json create mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/files/findlib-1.9.2.patch rename esy.lock/overrides/{opam__s__ocamlfind_opam__c__1.9.6_opam_override => opam__s__ocamlfind_opam__c__1.9.2_opam_override}/package.json (92%) delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch diff --git a/esy.lock/index.json b/esy.lock/index.json index d4434021..f74fb23a 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "2aceb017bd41774397cd5824bc330c3f", + "checksum": "6c3e7d599c785cb84c37f4676d957748", "root": "@grain/binaryen.ml@link-dev:./package.json", "node": { "ocaml@4.14.1000@d41d8cd9": { @@ -16,60 +16,61 @@ "dependencies": [], "devDependencies": [] }, - "@opam/yojson@opam:2.1.1@ad5e299c": { - "id": "@opam/yojson@opam:2.1.1@ad5e299c", + "@opam/yojson@opam:2.2.2@0786d153": { + "id": "@opam/yojson@opam:2.2.2@0786d153", "name": "@opam/yojson", - "version": "opam:2.1.1", + "version": "opam:2.2.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d5/d58183207b198dc065866239066e074c34f9e139c0d9c4175a38809790e88173#sha256:d58183207b198dc065866239066e074c34f9e139c0d9c4175a38809790e88173", - "archive:https://github.com/ocaml-community/yojson/releases/download/2.1.1/yojson-2.1.1.tbz#sha256:d58183207b198dc065866239066e074c34f9e139c0d9c4175a38809790e88173" + "archive:https://opam.ocaml.org/cache/sha256/9a/9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595#sha256:9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595", + "archive:https://github.com/ocaml-community/yojson/releases/download/2.2.2/yojson-2.2.2.tbz#sha256:9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595" ], "opam": { "name": "yojson", - "version": "2.1.1", - "path": "esy.lock/opam/yojson.2.1.1" + "version": "2.2.2", + "path": "esy.lock/opam/yojson.2.2.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/cppo@opam:1.6.9@db929a12", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@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@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/xdg@opam:3.11.1@1e207b0b": { - "id": "@opam/xdg@opam:3.11.1@1e207b0b", + "@opam/xdg@opam:3.17.2@fffb074d": { + "id": "@opam/xdg@opam:3.17.2@fffb074d", "name": "@opam/xdg", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "xdg", - "version": "3.11.1", - "path": "esy.lock/opam/xdg.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/xdg.3.17.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/uutf@opam:1.0.3@47c95a18": { - "id": "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/uutf@opam:1.0.3@3527936b": { + "id": "@opam/uutf@opam:1.0.3@3527936b", "name": "@opam/uutf", "version": "opam:1.0.3", "source": { @@ -86,71 +87,74 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", - "@opam/cmdliner@opam:1.2.0@b0c6143c", + "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", + "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@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@4.14.1000@d41d8cd9" ], + "available": "true" }, - "@opam/uuseg@opam:15.1.0@af4a84a3": { - "id": "@opam/uuseg@opam:15.1.0@af4a84a3", + "@opam/uuseg@opam:16.0.0@bd0df457": { + "id": "@opam/uuseg@opam:16.0.0@bd0df457", "name": "@opam/uuseg", - "version": "opam:15.1.0", + "version": "opam:16.0.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/1e/1e9460dc5a856c985d40c61fd1560bdfdb8bbaf8d7430405814589b47d4a7f7869658d1e3198c7a9132412e9b4b85402ceb4bda5040da426b69e9aef4222a23a#sha512:1e9460dc5a856c985d40c61fd1560bdfdb8bbaf8d7430405814589b47d4a7f7869658d1e3198c7a9132412e9b4b85402ceb4bda5040da426b69e9aef4222a23a", - "archive:https://erratique.ch/software/uuseg/releases/uuseg-15.1.0.tbz#sha512:1e9460dc5a856c985d40c61fd1560bdfdb8bbaf8d7430405814589b47d4a7f7869658d1e3198c7a9132412e9b4b85402ceb4bda5040da426b69e9aef4222a23a" + "archive:https://opam.ocaml.org/cache/sha512/35/355139aee2a72baddf3d811e522948456147546ee946b6eca20f57711865770d4b8d32ea01a7338b8e6cdedb4423ee65cee387704bb9c0c057bcbd65012679b8#sha512:355139aee2a72baddf3d811e522948456147546ee946b6eca20f57711865770d4b8d32ea01a7338b8e6cdedb4423ee65cee387704bb9c0c057bcbd65012679b8", + "archive:https://erratique.ch/software/uuseg/releases/uuseg-16.0.0.tbz#sha512:355139aee2a72baddf3d811e522948456147546ee946b6eca20f57711865770d4b8d32ea01a7338b8e6cdedb4423ee65cee387704bb9c0c057bcbd65012679b8" ], "opam": { "name": "uuseg", - "version": "15.1.0", - "path": "esy.lock/opam/uuseg.15.1.0" + "version": "16.0.0", + "path": "esy.lock/opam/uuseg.16.0.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/uucp@opam:15.1.0@ef3e0a4e", "@opam/topkg@opam:1.0.7@7ee47d76", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", - "@opam/cmdliner@opam:1.2.0@b0c6143c", + "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.2@48f9d5d4", + "@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:15.1.0@ef3e0a4e" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/uucp@opam:16.0.0@ded5dcba" + ], + "available": "true" }, - "@opam/uucp@opam:15.1.0@ef3e0a4e": { - "id": "@opam/uucp@opam:15.1.0@ef3e0a4e", + "@opam/uucp@opam:16.0.0@ded5dcba": { + "id": "@opam/uucp@opam:16.0.0@ded5dcba", "name": "@opam/uucp", - "version": "opam:15.1.0", + "version": "opam:16.0.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/99/998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364#sha512:998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364", - "archive:https://erratique.ch/software/uucp/releases/uucp-15.1.0.tbz#sha512:998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364" + "archive:https://opam.ocaml.org/cache/sha512/5c/5c06d8cadb2b011b1e4ac52e14732044f6ab8e9c11e1184950ff8629b26bd173f1264247623a635b8aa4033e287bfe42d709994f19a3d79f7cbfd20158aa4992#sha512:5c06d8cadb2b011b1e4ac52e14732044f6ab8e9c11e1184950ff8629b26bd173f1264247623a635b8aa4033e287bfe42d709994f19a3d79f7cbfd20158aa4992", + "archive:https://erratique.ch/software/uucp/releases/uucp-16.0.0.tbz#sha512:5c06d8cadb2b011b1e4ac52e14732044f6ab8e9c11e1184950ff8629b26bd173f1264247623a635b8aa4033e287bfe42d709994f19a3d79f7cbfd20158aa4992" ], "opam": { "name": "uucp", - "version": "15.1.0", - "path": "esy.lock/opam/uucp.15.1.0" + "version": "16.0.0", + "path": "esy.lock/opam/uucp.16.0.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", - "@opam/cmdliner@opam:1.2.0@b0c6143c", + "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", + "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@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@4.14.1000@d41d8cd9" ], + "available": "true" }, - "@opam/topkg@opam:1.0.7@7ee47d76": { - "id": "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/topkg@opam:1.0.7@e59fb83d": { + "id": "@opam/topkg@opam:1.0.7@e59fb83d", "name": "@opam/topkg", "version": "opam:1.0.7", "source": { @@ -167,47 +171,48 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.16.1@b3fc8209" + ], + "available": "true" }, - "@opam/stdune@opam:3.11.1@9a840882": { - "id": "@opam/stdune@opam:3.11.1@9a840882", + "@opam/stdune@opam:3.17.2@d1b11ebb": { + "id": "@opam/stdune@opam:3.17.2@d1b11ebb", "name": "@opam/stdune", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "stdune", - "version": "3.11.1", - "path": "esy.lock/opam/stdune.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/stdune.3.17.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@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", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@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", "@opam/base-unix@opam:base@87d0b2eb" - ] + ], + "available": "true" }, "@opam/stdlib-shims@opam:0.3.0@72c7bc98": { "id": "@opam/stdlib-shims@opam:0.3.0@72c7bc98", @@ -227,12 +232,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@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", @@ -252,39 +258,41 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/base@opam:v0.16.3@de1ba42e", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/base@opam:v0.16.3@162b7c08", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/base@opam:v0.16.3@de1ba42e" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/base@opam:v0.16.3@162b7c08" + ], + "available": "true" }, - "@opam/spawn@opam:v0.15.1@85e9d6f1": { - "id": "@opam/spawn@opam:v0.15.1@85e9d6f1", + "@opam/spawn@opam:v0.17.0@d0f69739": { + "id": "@opam/spawn@opam:v0.17.0@d0f69739", "name": "@opam/spawn", - "version": "opam:v0.15.1", + "version": "opam:v0.17.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/9a/9afdee314fab6c3fcd689ab6eb5608d6b78078e6dede3953a47debde06c19d50#sha256:9afdee314fab6c3fcd689ab6eb5608d6b78078e6dede3953a47debde06c19d50", - "archive:https://github.com/janestreet/spawn/archive/v0.15.1.tar.gz#sha256:9afdee314fab6c3fcd689ab6eb5608d6b78078e6dede3953a47debde06c19d50" + "archive:https://opam.ocaml.org/cache/sha256/33/33fbb5cd4c3387a6829095cfa73d5fc2eff572be61647e6052010bfbd0c2df49#sha256:33fbb5cd4c3387a6829095cfa73d5fc2eff572be61647e6052010bfbd0c2df49", + "archive:https://github.com/janestreet/spawn/releases/download/v0.17.0/spawn-v0.17.0.tbz#sha256:33fbb5cd4c3387a6829095cfa73d5fc2eff572be61647e6052010bfbd0c2df49" ], "opam": { "name": "spawn", - "version": "v0.15.1", - "path": "esy.lock/opam/spawn.v0.15.1" + "version": "v0.17.0", + "path": "esy.lock/opam/spawn.v0.17.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@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", @@ -304,15 +312,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/seq@opam:base@d8d7de1d": { - "id": "@opam/seq@opam:base@d8d7de1d", + "@opam/seq@opam:base@5ed5af70": { + "id": "@opam/seq@opam:base@5ed5af70", "name": "@opam/seq", "version": "opam:base", "source": { @@ -328,44 +337,58 @@ "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "extraSources": [ + { + "checksum": "sha256:e95062b4d0519ef8335c02f7d0f1952d11b814c7ab7e6d566a206116162fa2be", + "url": "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/seq/META.seq", + "relativePath": "META.seq" + }, + { + "checksum": "sha256:fff926c2c4d5a82b6c94c60c4c35eb06e3d39975893ebe6b1f0e6557cbe34904", + "url": "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/seq/seq.install", + "relativePath": "seq.install" + } + ], + "available": "true" }, - "@opam/sedlex@opam:3.2@eab3a2e0": { - "id": "@opam/sedlex@opam:3.2@eab3a2e0", + "@opam/sedlex@opam:3.3@8168b930": { + "id": "@opam/sedlex@opam:3.3@8168b930", "name": "@opam/sedlex", - "version": "opam:3.2", + "version": "opam:3.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/b6/b67eec3a80a7fed8e6c91e47260b0843#md5:b67eec3a80a7fed8e6c91e47260b0843", - "archive:https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.2.tar.gz#md5:b67eec3a80a7fed8e6c91e47260b0843" + "archive:https://opam.ocaml.org/cache/md5/46/4603d572e24f3515fe7e7d0b665bdda6#md5:4603d572e24f3515fe7e7d0b665bdda6", + "archive:https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.3.tar.gz#md5:4603d572e24f3515fe7e7d0b665bdda6" ], "opam": { "name": "sedlex", - "version": "3.2", - "path": "esy.lock/opam/sedlex.3.2" + "version": "3.3", + "path": "esy.lock/opam/sedlex.3.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@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.29.1@a8bb9506", - "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@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@1c6a6533": { - "id": "@opam/result@opam:1.5@1c6a6533", + "@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/md5/1b/1b82dec78849680b49ae9a8a365b831b#md5:1b82dec78849680b49ae9a8a365b831b", - "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#md5:1b82dec78849680b49ae9a8a365b831b" + "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", @@ -375,70 +398,73 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/re@opam:1.11.0@87deb463": { - "id": "@opam/re@opam:1.11.0@87deb463", + "@opam/re@opam:1.12.0@42f7a5b9": { + "id": "@opam/re@opam:1.12.0@42f7a5b9", "name": "@opam/re", - "version": "opam:1.11.0", + "version": "opam:1.12.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/01/01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f#sha256:01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f", - "archive:https://github.com/ocaml/ocaml-re/releases/download/1.11.0/re-1.11.0.tbz#sha256:01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f" + "archive:https://opam.ocaml.org/cache/sha256/a0/a01f2bf22f72c2f4ababd8d3e7635e35c1bf6bc5a41ad6d5a007454ddabad1d4#sha256:a01f2bf22f72c2f4ababd8d3e7635e35c1bf6bc5a41ad6d5a007454ddabad1d4", + "archive:https://github.com/ocaml/ocaml-re/releases/download/1.12.0/re-1.12.0.tbz#sha256:a01f2bf22f72c2f4ababd8d3e7635e35c1bf6bc5a41ad6d5a007454ddabad1d4" ], "opam": { "name": "re", - "version": "1.11.0", - "path": "esy.lock/opam/re.1.11.0" + "version": "1.12.0", + "path": "esy.lock/opam/re.1.12.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@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@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/ppxlib@opam:0.29.1@a8bb9506": { - "id": "@opam/ppxlib@opam:0.29.1@a8bb9506", + "@opam/ppxlib@opam:0.35.0@8cd01f8f": { + "id": "@opam/ppxlib@opam:0.35.0@8cd01f8f", "name": "@opam/ppxlib", - "version": "opam:0.29.1", + "version": "opam:0.35.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c8/c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79#sha256:c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79", - "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.29.1/ppxlib-0.29.1.tbz#sha256:c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79" + "archive:https://opam.ocaml.org/cache/sha256/d9/d9d959fc9f84260487e45684dc741898a92fc5506b61a7f5cac65d21832db925#sha256:d9d959fc9f84260487e45684dc741898a92fc5506b61a7f5cac65d21832db925", + "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.35.0/ppxlib-0.35.0.tbz#sha256:d9d959fc9f84260487e45684dc741898a92fc5506b61a7f5cac65d21832db925" ], "opam": { "name": "ppxlib", - "version": "0.29.1", - "path": "esy.lock/opam/ppxlib.0.29.1" + "version": "0.35.0", + "path": "esy.lock/opam/ppxlib.0.35.0" } }, "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ppx_derivers@opam:1.2.1@d78727cd", + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@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", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "@opam/ppx_derivers@opam:1.2.1@d78727cd", + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@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", @@ -458,23 +484,24 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@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.1.1@ad5e299c", - "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/ppx_derivers@opam:1.2.1@e2cbad12": { - "id": "@opam/ppx_derivers@opam:1.2.1@e2cbad12", + "@opam/ppx_derivers@opam:1.2.1@d78727cd": { + "id": "@opam/ppx_derivers@opam:1.2.1@d78727cd", "name": "@opam/ppx_derivers", "version": "opam:1.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/5d/5dc2bf130c1db3c731fe0fffc5648b41#md5:5dc2bf130c1db3c731fe0fffc5648b41", - "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#md5:5dc2bf130c1db3c731fe0fffc5648b41" + "archive:https://opam.ocaml.org/cache/sha256/b6/b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95#sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95", + "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95" ], "opam": { "name": "ppx_derivers", @@ -484,72 +511,75 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/pp@opam:1.2.0@16430027": { - "id": "@opam/pp@opam:1.2.0@16430027", + "@opam/pp@opam:2.0.0@2177bbde": { + "id": "@opam/pp@opam:2.0.0@2177bbde", "name": "@opam/pp", - "version": "opam:1.2.0", + "version": "opam:2.0.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/a5/a5e822573c55afb42db29ec56eacd1f2acd8f65cf2df2878e291de374ce6909c#sha256:a5e822573c55afb42db29ec56eacd1f2acd8f65cf2df2878e291de374ce6909c", - "archive:https://github.com/ocaml-dune/pp/releases/download/1.2.0/pp-1.2.0.tbz#sha256:a5e822573c55afb42db29ec56eacd1f2acd8f65cf2df2878e291de374ce6909c" + "archive:https://opam.ocaml.org/cache/sha256/86/8651351518b092b4a2def4e08171c276152f92fb6a84a8b19b6b929ccdb44419#sha256:8651351518b092b4a2def4e08171c276152f92fb6a84a8b19b6b929ccdb44419", + "archive:https://github.com/ocaml-dune/pp/releases/download/2.0.0/pp-2.0.0.tbz#sha256:8651351518b092b4a2def4e08171c276152f92fb6a84a8b19b6b929ccdb44419" ], "opam": { "name": "pp", - "version": "1.2.0", - "path": "esy.lock/opam/pp.1.2.0" + "version": "2.0.0", + "path": "esy.lock/opam/pp.2.0.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/ordering@opam:3.11.1@92c57daa": { - "id": "@opam/ordering@opam:3.11.1@92c57daa", + "@opam/ordering@opam:3.17.2@700bb6ce": { + "id": "@opam/ordering@opam:3.17.2@700bb6ce", "name": "@opam/ordering", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "ordering", - "version": "3.11.1", - "path": "esy.lock/opam/ordering.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/ordering.3.17.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/omd@opam:1.3.2@511d53d2": { - "id": "@opam/omd@opam:1.3.2@511d53d2", + "@opam/omd@opam:1.3.2@f6edb8b8": { + "id": "@opam/omd@opam:1.3.2@f6edb8b8", "name": "@opam/omd", "version": "opam:1.3.2", "source": { "type": "install", "source": [ "archive:https://opam.ocaml.org/cache/sha256/60/6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb#sha256:6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb", - "archive:https://github.com/ocaml/omd/releases/download/1.3.2/omd-1.3.2.tbz#sha256:6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb" + "archive:https://github.com/ocaml/opam-source-archives/raw/main/omd-1.3.2.tbz#sha256:6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb" ], "opam": { "name": "omd", @@ -559,16 +589,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/base-bytes@opam:base@19d0c2ff", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/base-bytes@opam:base@785dbd33", "@opam/base-bigarray@opam:base@b03491b0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/base-bytes@opam:base@19d0c2ff", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/base-bytes@opam:base@785dbd33", "@opam/base-bigarray@opam:base@b03491b0" - ] + ], + "available": "true" }, "@opam/odoc-parser@opam:2.0.0@a08011a0": { "id": "@opam/odoc-parser@opam:2.0.0@a08011a0", @@ -588,28 +619,29 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/camlp-streams@opam:5.0.1@daaa0f94", - "@opam/astring@opam:0.8.5@1300cee8", + "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", + "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/camlp-streams@opam:5.0.1@8e96208c", + "@opam/astring@opam:0.8.5@9975798d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/camlp-streams@opam:5.0.1@daaa0f94", - "@opam/astring@opam:0.8.5@1300cee8" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", + "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/camlp-streams@opam:5.0.1@8e96208c", + "@opam/astring@opam:0.8.5@9975798d" + ], + "available": "true" }, - "@opam/octavius@opam:1.2.2@2205cc65": { - "id": "@opam/octavius@opam:1.2.2@2205cc65", + "@opam/octavius@opam:1.2.2@558886f0": { + "id": "@opam/octavius@opam:1.2.2@558886f0", "name": "@opam/octavius", "version": "opam:1.2.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/72/72f9e1d996e6c5089fc513cc9218607b#md5:72f9e1d996e6c5089fc513cc9218607b", - "archive:https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz#md5:72f9e1d996e6c5089fc513cc9218607b" + "archive:https://opam.ocaml.org/cache/sha256/ea/eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad#sha256:eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad", + "archive:https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz#sha256:eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad" ], "opam": { "name": "octavius", @@ -619,12 +651,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@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", @@ -644,47 +677,49 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c", - "@opam/base-bytes@opam:base@19d0c2ff", + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/cmdliner@opam:1.3.0@8e6dd99f", + "@opam/base-bytes@opam:base@785dbd33", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c", - "@opam/base-bytes@opam:base@19d0c2ff" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/cmdliner@opam:1.3.0@8e6dd99f", + "@opam/base-bytes@opam:base@785dbd33" + ], + "available": "true" }, - "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda": { - "id": "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", + "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f": { + "id": "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", "name": "@opam/ocamlformat-rpc-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-rpc-lib", - "version": "0.26.1", - "path": "esy.lock/opam/ocamlformat-rpc-lib.0.26.1" + "version": "0.27.0", + "path": "esy.lock/opam/ocamlformat-rpc-lib.0.27.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@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.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4" - ] + ], + "available": "true" }, - "@opam/ocamlformat@opam:0.24.1@d7f4254d": { - "id": "@opam/ocamlformat@opam:0.24.1@d7f4254d", + "@opam/ocamlformat@opam:0.24.1@01d7df0f": { + "id": "@opam/ocamlformat@opam:0.24.1@01d7df0f", "name": "@opam/ocamlformat", "version": "opam:0.24.1", "source": { @@ -701,105 +736,93 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/uuseg@opam:15.1.0@af4a84a3", - "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.11.0@87deb463", + "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@3527936b", + "@opam/uuseg@opam:16.0.0@bd0df457", + "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.12.0@42f7a5b9", "@opam/odoc-parser@opam:2.0.0@a08011a0", "@opam/ocp-indent@opam:1.7.0@2da3c6e5", "@opam/ocaml-version@opam:3.5.0@6bef55f5", - "@opam/menhirSdk@opam:20230608@36f21a74", - "@opam/menhirLib@opam:20230608@cf13bc0d", - "@opam/menhir@opam:20230608@c0081728", - "@opam/fpath@opam:0.7.3@674d8125", + "@opam/menhirSdk@opam:20240715@9d924351", + "@opam/menhirLib@opam:20240715@3e1794bd", + "@opam/menhir@opam:20240715@454ed5d1", + "@opam/fpath@opam:0.7.3@d817a3b5", "@opam/fix@opam:20230505@941a65ff", - "@opam/either@opam:1.0.0@be5a1416", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/cmdliner@opam:1.2.0@b0c6143c", - "@opam/base@opam:v0.16.3@de1ba42e", + "@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/base@opam:v0.16.3@162b7c08", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/uuseg@opam:15.1.0@af4a84a3", - "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.11.0@87deb463", + "ocaml@4.14.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@3527936b", + "@opam/uuseg@opam:16.0.0@bd0df457", + "@opam/stdio@opam:v0.16.0@a75c1ca1", "@opam/re@opam:1.12.0@42f7a5b9", "@opam/odoc-parser@opam:2.0.0@a08011a0", "@opam/ocp-indent@opam:1.7.0@2da3c6e5", "@opam/ocaml-version@opam:3.5.0@6bef55f5", - "@opam/menhirSdk@opam:20230608@36f21a74", - "@opam/menhirLib@opam:20230608@cf13bc0d", - "@opam/menhir@opam:20230608@c0081728", - "@opam/fpath@opam:0.7.3@674d8125", + "@opam/menhirSdk@opam:20240715@9d924351", + "@opam/menhirLib@opam:20240715@3e1794bd", + "@opam/menhir@opam:20240715@454ed5d1", + "@opam/fpath@opam:0.7.3@d817a3b5", "@opam/fix@opam:20230505@941a65ff", - "@opam/either@opam:1.0.0@be5a1416", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/cmdliner@opam:1.2.0@b0c6143c", - "@opam/base@opam:v0.16.3@de1ba42e" - ] + "@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/base@opam:v0.16.3@162b7c08" + ], + "available": "true" }, - "@opam/ocamlfind@opam:1.9.6@da5169c7": { - "id": "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlfind@opam:1.9.2@48f9d5d4": { + "id": "@opam/ocamlfind@opam:1.9.2@48f9d5d4", "name": "@opam/ocamlfind", - "version": "opam:1.9.6", + "version": "opam:1.9.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/96/96c6ee50a32cca9ca277321262dbec57#md5:96c6ee50a32cca9ca277321262dbec57", - "archive:http://download.camlcity.org/download/findlib-1.9.6.tar.gz#md5:96c6ee50a32cca9ca277321262dbec57" + "archive:https://opam.ocaml.org/cache/md5/18/180b69dd4474614ad6044d879c467232#md5:180b69dd4474614ad6044d879c467232", + "archive:http://download.camlcity.org/download/findlib-1.9.2.tar.gz#md5:180b69dd4474614ad6044d879c467232" ], "opam": { "name": "ocamlfind", - "version": "1.9.6", - "path": "esy.lock/opam/ocamlfind.1.9.6" + "version": "1.9.2", + "path": "esy.lock/opam/ocamlfind.1.9.2" } }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override" } ], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "available": "true" }, - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d": { - "id": "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", + "@opam/ocamlbuild@opam:0.16.1@b3fc8209": { + "id": "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "name": "@opam/ocamlbuild", - "version": "opam:0.14.2+win", + "version": "opam:0.16.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/2f/2f407fadd57b073155a6aead887d9676#md5:2f407fadd57b073155a6aead887d9676", - "archive:https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.2.tar.gz#md5:2f407fadd57b073155a6aead887d9676" + "archive:https://opam.ocaml.org/cache/sha512/e9/e918b9a0081f271e507c7a4f4d5d5a7cdf818ca51c52acec1bac85ddad5f6cad078cb3c568252fbcf5401c2d75323ed8f50fdd881bda1c9632840320408393ae#sha512:e918b9a0081f271e507c7a4f4d5d5a7cdf818ca51c52acec1bac85ddad5f6cad078cb3c568252fbcf5401c2d75323ed8f50fdd881bda1c9632840320408393ae", + "archive:https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.16.1.tar.gz#sha512:e918b9a0081f271e507c7a4f4d5d5a7cdf818ca51c52acec1bac85ddad5f6cad078cb3c568252fbcf5401c2d75323ed8f50fdd881bda1c9632840320408393ae" ], "opam": { "name": "ocamlbuild", - "version": "0.14.2+win", - "path": "esy.lock/opam/ocamlbuild.0.14.2+win" + "version": "0.16.1", + "path": "esy.lock/opam/ocamlbuild.0.16.1" } }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override" - } - ], + "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], - "extraSources": [ - { - "checksum": - "sha256:a9b7e1829a3304e5a073d8ddea29d3d8272698e93b7e1ee659ae5e31e5cfb6b9", - "url": - "https://raw.githubusercontent.com/ocaml-opam/opam-repository-mingw/354a87b397856f2a70024c5c83fc5001074935b6/packages/ocamlbuild/ocamlbuild.0.14.2/files/ocamlbuild-0.14.2.patch", - "relativePath": "ocamlbuild-0.14.2.patch" - } - ] + "available": "true" }, "@opam/ocaml-version@opam:3.5.0@6bef55f5": { "id": "@opam/ocaml-version@opam:3.5.0@6bef55f5", @@ -819,12 +842,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770": { "id": "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", @@ -844,43 +868,44 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/xdg@opam:3.11.1@1e207b0b", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.11.1@9a840882", - "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.11.0@87deb463", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/xdg@opam:3.17.2@fffb074d", "@opam/uutf@opam:1.0.3@3527936b", + "@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/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/omd@opam:1.3.2@511d53d2", - "@opam/octavius@opam:1.2.2@2205cc65", - "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", - "@opam/fiber@opam:3.7.0@d70e2471", "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune-rpc@opam:3.11.1@1197fefa", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.11.1@0e9213a3", + "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.17.2@700bb6ce", + "@opam/omd@opam:1.3.2@f6edb8b8", + "@opam/octavius@opam:1.2.2@558886f0", + "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", + "@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", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/xdg@opam:3.11.1@1e207b0b", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.11.1@9a840882", - "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.11.0@87deb463", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/xdg@opam:3.17.2@fffb074d", "@opam/uutf@opam:1.0.3@3527936b", + "@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/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/omd@opam:1.3.2@511d53d2", - "@opam/octavius@opam:1.2.2@2205cc65", - "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", - "@opam/fiber@opam:3.7.0@d70e2471", "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune-rpc@opam:3.11.1@1197fefa", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.11.1@0e9213a3" - ] + "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.17.2@700bb6ce", + "@opam/omd@opam:1.3.2@f6edb8b8", + "@opam/octavius@opam:1.2.2@558886f0", + "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", + "@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" + ], + "available": "true" }, - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882": { - "id": "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1": { + "id": "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", "name": "@opam/ocaml-compiler-libs", "version": "opam:v0.12.4", "source": { @@ -897,133 +922,166 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/menhirSdk@opam:20230608@36f21a74": { - "id": "@opam/menhirSdk@opam:20230608@36f21a74", + "@opam/menhirSdk@opam:20240715@9d924351": { + "id": "@opam/menhirSdk@opam:20240715@9d924351", "name": "@opam/menhirSdk", - "version": "opam:20230608", + "version": "opam:20240715", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/8f/8ff26b1e3685c472b7b3aba2fe938a43#md5:8ff26b1e3685c472b7b3aba2fe938a43", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20230608/archive.tar.gz#md5:8ff26b1e3685c472b7b3aba2fe938a43" + "archive:https://opam.ocaml.org/cache/md5/d3/d39a8943fe1be28199e5ec1f4133504c#md5:d39a8943fe1be28199e5ec1f4133504c", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz#md5:d39a8943fe1be28199e5ec1f4133504c" ], "opam": { "name": "menhirSdk", - "version": "20230608", - "path": "esy.lock/opam/menhirSdk.20230608" + "version": "20240715", + "path": "esy.lock/opam/menhirSdk.20240715" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/menhirLib@opam:20230608@cf13bc0d": { - "id": "@opam/menhirLib@opam:20230608@cf13bc0d", + "@opam/menhirLib@opam:20240715@3e1794bd": { + "id": "@opam/menhirLib@opam:20240715@3e1794bd", "name": "@opam/menhirLib", - "version": "opam:20230608", + "version": "opam:20240715", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/8f/8ff26b1e3685c472b7b3aba2fe938a43#md5:8ff26b1e3685c472b7b3aba2fe938a43", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20230608/archive.tar.gz#md5:8ff26b1e3685c472b7b3aba2fe938a43" + "archive:https://opam.ocaml.org/cache/md5/d3/d39a8943fe1be28199e5ec1f4133504c#md5:d39a8943fe1be28199e5ec1f4133504c", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz#md5:d39a8943fe1be28199e5ec1f4133504c" ], "opam": { "name": "menhirLib", - "version": "20230608", - "path": "esy.lock/opam/menhirLib.20230608" + "version": "20240715", + "path": "esy.lock/opam/menhirLib.20240715" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/menhir@opam:20230608@c0081728": { - "id": "@opam/menhir@opam:20230608@c0081728", + "@opam/menhirCST@opam:20240715@b768dcc7": { + "id": "@opam/menhirCST@opam:20240715@b768dcc7", + "name": "@opam/menhirCST", + "version": "opam:20240715", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/d3/d39a8943fe1be28199e5ec1f4133504c#md5:d39a8943fe1be28199e5ec1f4133504c", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz#md5:d39a8943fe1be28199e5ec1f4133504c" + ], + "opam": { + "name": "menhirCST", + "version": "20240715", + "path": "esy.lock/opam/menhirCST.20240715" + } + }, + "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/menhir@opam:20240715@454ed5d1": { + "id": "@opam/menhir@opam:20240715@454ed5d1", "name": "@opam/menhir", - "version": "opam:20230608", + "version": "opam:20240715", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/8f/8ff26b1e3685c472b7b3aba2fe938a43#md5:8ff26b1e3685c472b7b3aba2fe938a43", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20230608/archive.tar.gz#md5:8ff26b1e3685c472b7b3aba2fe938a43" + "archive:https://opam.ocaml.org/cache/md5/d3/d39a8943fe1be28199e5ec1f4133504c#md5:d39a8943fe1be28199e5ec1f4133504c", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz#md5:d39a8943fe1be28199e5ec1f4133504c" ], "opam": { "name": "menhir", - "version": "20230608", - "path": "esy.lock/opam/menhir.20230608" + "version": "20240715", + "path": "esy.lock/opam/menhir.20240715" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20230608@36f21a74", - "@opam/menhirLib@opam:20230608@cf13bc0d", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@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:20230608@36f21a74", - "@opam/menhirLib@opam:20230608@cf13bc0d", - "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@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/js_of_ocaml-compiler@opam:5.4.0@1442ca67": { - "id": "@opam/js_of_ocaml-compiler@opam:5.4.0@1442ca67", + "@opam/js_of_ocaml-compiler@opam:5.9.1@e8650b39": { + "id": "@opam/js_of_ocaml-compiler@opam:5.9.1@e8650b39", "name": "@opam/js_of_ocaml-compiler", - "version": "opam:5.4.0", + "version": "opam:5.9.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f1/f1215de133867fefdb16e2798a225ee0446469a57462af0deebdd22d2a8d3b94#sha256:f1215de133867fefdb16e2798a225ee0446469a57462af0deebdd22d2a8d3b94", - "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/5.4.0/js_of_ocaml-5.4.0.tbz#sha256:f1215de133867fefdb16e2798a225ee0446469a57462af0deebdd22d2a8d3b94" + "archive:https://opam.ocaml.org/cache/sha256/68/68c95c60871d8e9c9a54c82f35e2ed50413bcb440f220d0b3516b2a1ee1c7307#sha256:68c95c60871d8e9c9a54c82f35e2ed50413bcb440f220d0b3516b2a1ee1c7307", + "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/5.9.1/js_of_ocaml-5.9.1.tbz#sha256:68c95c60871d8e9c9a54c82f35e2ed50413bcb440f220d0b3516b2a1ee1c7307" ], "opam": { "name": "js_of_ocaml-compiler", - "version": "5.4.0", - "path": "esy.lock/opam/js_of_ocaml-compiler.5.4.0" + "version": "5.9.1", + "path": "esy.lock/opam/js_of_ocaml-compiler.5.9.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/sedlex@opam:3.2@eab3a2e0", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/menhirSdk@opam:20230608@36f21a74", - "@opam/menhirLib@opam:20230608@cf13bc0d", - "@opam/menhir@opam:20230608@c0081728", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c", + "ocaml@4.14.1000@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.2@48f9d5d4", + "@opam/menhirSdk@opam:20240715@9d924351", + "@opam/menhirLib@opam:20240715@3e1794bd", + "@opam/menhir@opam:20240715@454ed5d1", + "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/cmdliner@opam:1.3.0@8e6dd99f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/sedlex@opam:3.2@eab3a2e0", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/menhirSdk@opam:20230608@36f21a74", - "@opam/menhirLib@opam:20230608@cf13bc0d", - "@opam/menhir@opam:20230608@c0081728", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c" - ] + "ocaml@4.14.1000@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", + "@opam/menhirLib@opam:20240715@3e1794bd", + "@opam/menhir@opam:20240715@454ed5d1", + "@opam/dune@opam:3.17.2@31dc7e86", + "@opam/cmdliner@opam:1.3.0@8e6dd99f" + ], + "available": "true" }, - "@opam/gen@opam:1.1@059b2731": { - "id": "@opam/gen@opam:1.1@059b2731", + "@opam/gen@opam:1.1@55327887": { + "id": "@opam/gen@opam:1.1@55327887", "name": "@opam/gen", "version": "opam:1.1", "source": { @@ -1040,23 +1098,24 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@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@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/fpath@opam:0.7.3@674d8125": { - "id": "@opam/fpath@opam:0.7.3@674d8125", + "@opam/fpath@opam:0.7.3@d817a3b5": { + "id": "@opam/fpath@opam:0.7.3@d817a3b5", "name": "@opam/fpath", "version": "opam:0.7.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/07/0740b530e8fed5b0adc5eee8463cfc2f#md5:0740b530e8fed5b0adc5eee8463cfc2f", - "archive:https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz#md5:0740b530e8fed5b0adc5eee8463cfc2f" + "archive:https://opam.ocaml.org/cache/sha256/12/12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f#sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f", + "archive:https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz#sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f" ], "opam": { "name": "fpath", @@ -1066,15 +1125,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", - "@opam/astring@opam:0.8.5@1300cee8", + "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", + "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@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@1300cee8" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/astring@opam:0.8.5@9975798d" + ], + "available": "true" }, "@opam/fix@opam:20230505@941a65ff": { "id": "@opam/fix@opam:20230505@941a65ff", @@ -1094,15 +1154,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/fiber@opam:3.7.0@d70e2471": { - "id": "@opam/fiber@opam:3.7.0@d70e2471", + "@opam/fiber@opam:3.7.0@bf633a34": { + "id": "@opam/fiber@opam:3.7.0@bf633a34", "name": "@opam/fiber", "version": "opam:3.7.0", "source": { @@ -1119,17 +1180,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.11.1@9a840882", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@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.11.1@9a840882", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.17.2@d1b11ebb", + "@opam/dyn@opam:3.17.2@6d24df09", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/either@opam:1.0.0@be5a1416": { - "id": "@opam/either@opam:1.0.0@be5a1416", + "@opam/either@opam:1.0.0@378fa7c4": { + "id": "@opam/either@opam:1.0.0@378fa7c4", "name": "@opam/either", "version": "opam:1.0.0", "source": { @@ -1146,138 +1208,146 @@ }, "overrides": [], "dependencies": [ - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:3.11.1@ba2e0e6a" ] + "devDependencies": [ + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/dyn@opam:3.11.1@d3c74846": { - "id": "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/dyn@opam:3.17.2@6d24df09": { + "id": "@opam/dyn@opam:3.17.2@6d24df09", "name": "@opam/dyn", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "dyn", - "version": "3.11.1", - "path": "esy.lock/opam/dyn.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/dyn.3.17.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@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:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", + "@opam/ordering@opam:3.17.2@700bb6ce", + "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/dune-rpc@opam:3.11.1@1197fefa": { - "id": "@opam/dune-rpc@opam:3.11.1@1197fefa", + "@opam/dune-rpc@opam:3.17.2@022f705e": { + "id": "@opam/dune-rpc@opam:3.17.2@022f705e", "name": "@opam/dune-rpc", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "dune-rpc", - "version": "3.11.1", - "path": "esy.lock/opam/dune-rpc.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/dune-rpc.3.17.2" } }, "overrides": [], "dependencies": [ - "@opam/xdg@opam:3.11.1@1e207b0b", - "@opam/stdune@opam:3.11.1@9a840882", "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/xdg@opam:3.17.2@fffb074d", + "@opam/stdune@opam:3.17.2@d1b11ebb", "@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", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/xdg@opam:3.11.1@1e207b0b", - "@opam/stdune@opam:3.11.1@9a840882", "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/xdg@opam:3.17.2@fffb074d", + "@opam/stdune@opam:3.17.2@d1b11ebb", "@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" - ] + ], + "available": "true" }, - "@opam/dune-configurator@opam:3.11.1@24d75a5c": { - "id": "@opam/dune-configurator@opam:3.11.1@24d75a5c", + "@opam/dune-configurator@opam:3.17.2@6a903a8c": { + "id": "@opam/dune-configurator@opam:3.17.2@6a903a8c", "name": "@opam/dune-configurator", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "dune-configurator", - "version": "3.11.1", - "path": "esy.lock/opam/dune-configurator.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/dune-configurator.3.17.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@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.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" - ] + ], + "available": "true" }, - "@opam/dune-build-info@opam:3.11.1@0dfbdab2": { - "id": "@opam/dune-build-info@opam:3.11.1@0dfbdab2", + "@opam/dune-build-info@opam:3.17.2@b34a7b66": { + "id": "@opam/dune-build-info@opam:3.17.2@b34a7b66", "name": "@opam/dune-build-info", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "dune-build-info", - "version": "3.11.1", - "path": "esy.lock/opam/dune-build-info.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/dune-build-info.3.17.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/dune@opam:3.11.1@ba2e0e6a": { - "id": "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dune@opam:3.17.2@31dc7e86": { + "id": "@opam/dune@opam:3.17.2@31dc7e86", "name": "@opam/dune", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "dune", - "version": "3.11.1", - "path": "esy.lock/opam/dune.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/dune.3.17.2" } }, "overrides": [], @@ -1289,7 +1359,8 @@ "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" - ] + ], + "available": "true" }, "@opam/csexp@opam:1.5.2@46614bf4": { "id": "@opam/csexp@opam:1.5.2@46614bf4", @@ -1309,46 +1380,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] - }, - "@opam/cppo@opam:1.6.9@db929a12": { - "id": "@opam/cppo@opam:1.6.9@db929a12", - "name": "@opam/cppo", - "version": "opam:1.6.9", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/d2/d23ffe85ac7dc8f0afd1ddf622770d09#md5:d23ffe85ac7dc8f0afd1ddf622770d09", - "archive:https://github.com/ocaml-community/cppo/archive/v1.6.9.tar.gz#md5:d23ffe85ac7dc8f0afd1ddf622770d09" - ], - "opam": { - "name": "cppo", - "version": "1.6.9", - "path": "esy.lock/opam/cppo.1.6.9" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/base-unix@opam:base@87d0b2eb", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" ], - "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/base-unix@opam:base@87d0b2eb" - ] + "available": "true" }, "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9": { - "id": - "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9", + "id": "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9", "name": "@opam/conf-cmake", - "version": - "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", + "version": "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", "source": { "type": "install", "source": [ @@ -1359,55 +1402,75 @@ "dependencies": [], "devDependencies": [] }, - "@opam/cmdliner@opam:1.2.0@b0c6143c": { - "id": "@opam/cmdliner@opam:1.2.0@b0c6143c", + "@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", - "version": "opam:1.2.0", + "version": "opam:1.3.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/6f/6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b#sha512:6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b", - "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-1.2.0.tbz#sha512:6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b" + "archive:https://opam.ocaml.org/cache/sha512/4c/4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283#sha512:4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283", + "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-1.3.0.tbz#sha512:4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283" ], "opam": { "name": "cmdliner", - "version": "1.2.0", - "path": "esy.lock/opam/cmdliner.1.2.0" + "version": "1.3.0", + "path": "esy.lock/opam/cmdliner.1.3.0" } }, "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "available": "true" }, - "@opam/chrome-trace@opam:3.11.1@0e9213a3": { - "id": "@opam/chrome-trace@opam:3.11.1@0e9213a3", + "@opam/chrome-trace@opam:3.17.2@ece6ea1d": { + "id": "@opam/chrome-trace@opam:3.17.2@ece6ea1d", "name": "@opam/chrome-trace", - "version": "opam:3.11.1", + "version": "opam:3.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/9d/9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64", + "archive:https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz#sha256:9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" ], "opam": { "name": "chrome-trace", - "version": "3.11.1", - "path": "esy.lock/opam/chrome-trace.3.11.1" + "version": "3.17.2", + "path": "esy.lock/opam/chrome-trace.3.17.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, - "@opam/camlp-streams@opam:5.0.1@daaa0f94": { - "id": "@opam/camlp-streams@opam:5.0.1@daaa0f94", + "@opam/camlp-streams@opam:5.0.1@8e96208c": { + "id": "@opam/camlp-streams@opam:5.0.1@8e96208c", "name": "@opam/camlp-streams", "version": "opam:5.0.1", "source": { @@ -1424,12 +1487,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "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.11.1@ba2e0e6a" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86" + ], + "available": "true" }, "@opam/base-unix@opam:base@87d0b2eb": { "id": "@opam/base-unix@opam:base@87d0b2eb", @@ -1446,7 +1510,8 @@ }, "overrides": [], "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [], + "available": "true" }, "@opam/base-threads@opam:base@36803084": { "id": "@opam/base-threads@opam:base@36803084", @@ -1463,10 +1528,11 @@ }, "overrides": [], "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [] + "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": { @@ -1480,12 +1546,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7" - ] + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4" + ], + "available": "true" }, "@opam/base-bigarray@opam:base@b03491b0": { "id": "@opam/base-bigarray@opam:base@b03491b0", @@ -1502,10 +1569,11 @@ }, "overrides": [], "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [], + "available": "true" }, - "@opam/base@opam:v0.16.3@de1ba42e": { - "id": "@opam/base@opam:v0.16.3@de1ba42e", + "@opam/base@opam:v0.16.3@162b7c08": { + "id": "@opam/base@opam:v0.16.3@162b7c08", "name": "@opam/base", "version": "opam:v0.16.3", "source": { @@ -1523,24 +1591,26 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@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" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.16.0@c0ffad0c", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a" - ] + "@opam/dune-configurator@opam:3.17.2@6a903a8c", + "@opam/dune@opam:3.17.2@31dc7e86", "@opam/conf-bash@opam:1@46c43d96" + ], + "available": "true" }, - "@opam/astring@opam:0.8.5@1300cee8": { - "id": "@opam/astring@opam:0.8.5@1300cee8", + "@opam/astring@opam:0.8.5@9975798d": { + "id": "@opam/astring@opam:0.8.5@9975798d", "name": "@opam/astring", "version": "opam:0.8.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/e1/e148907c24157d1df43bec89b58b3ec8#md5:e148907c24157d1df43bec89b58b3ec8", - "archive:https://erratique.ch/software/astring/releases/astring-0.8.5.tbz#md5:e148907c24157d1df43bec89b58b3ec8" + "archive:https://opam.ocaml.org/cache/sha256/86/865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa#sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa", + "archive:https://erratique.ch/software/astring/releases/astring-0.8.5.tbz#sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa" ], "opam": { "name": "astring", @@ -1550,12 +1620,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", + "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", + "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "available": "true" }, "@grain/libbinaryen@114.0.0@d41d8cd9": { "id": "@grain/libbinaryen@114.0.0@d41d8cd9", @@ -1570,8 +1641,8 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "@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": [], @@ -1589,16 +1660,15 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dune-configurator@opam:3.17.2@6a903a8c", + "@opam/dune@opam:3.17.2@31dc7e86", "@grain/libbinaryen@114.0.0@d41d8cd9" ], "devDependencies": [ - "@opam/ocamlformat@opam:0.24.1@d7f4254d", + "@opam/ocamlformat@opam:0.24.1@01d7df0f", "@opam/ocaml-lsp-server@opam:1.12.4@c24ab770", - "@opam/js_of_ocaml-compiler@opam:5.4.0@1442ca67" - ], - "installConfig": { "pnp": false } + "@opam/js_of_ocaml-compiler@opam:5.9.1@e8650b39" + ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { "id": "@esy-ocaml/substs@0.0.1@d41d8cd9", diff --git a/esy.lock/opam/astring.0.8.5/opam b/esy.lock/opam/astring.0.8.5/opam index 338a06a3..b49dff50 100644 --- a/esy.lock/opam/astring.0.8.5/opam +++ b/esy.lock/opam/astring.0.8.5/opam @@ -32,6 +32,11 @@ Astring depends only on the OCaml standard library. It is distributed under the ISC license. """ url { -archive: "https://erratique.ch/software/astring/releases/astring-0.8.5.tbz" -checksum: "e148907c24157d1df43bec89b58b3ec8" + src: "https://erratique.ch/software/astring/releases/astring-0.8.5.tbz" + checksum: [ + "sha256=865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa" + "md5=e148907c24157d1df43bec89b58b3ec8" + ] } + +x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/base-bytes.base/opam b/esy.lock/opam/base-bytes.base/opam index f1cae506..103dca96 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.16.3/opam index 30f29f5f..c54e0004 100644 --- a/esy.lock/opam/base.v0.16.3/opam +++ b/esy.lock/opam/base.v0.16.3/opam @@ -14,6 +14,7 @@ depends: [ "sexplib0" {>= "v0.16" & < "v0.17"} "dune" {>= "2.0.0"} "dune-configurator" + "conf-bash" ] synopsis: "Full standard library replacement for OCaml" description: " diff --git a/esy.lock/opam/camlp-streams.5.0.1/opam b/esy.lock/opam/camlp-streams.5.0.1/opam index 60e51311..8cb097f4 100644 --- a/esy.lock/opam/camlp-streams.5.0.1/opam +++ b/esy.lock/opam/camlp-streams.5.0.1/opam @@ -30,6 +30,7 @@ authors: ["Daniel de Rauglaudre" "Xavier Leroy"] license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" homepage: "https://github.com/ocaml/camlp-streams" bug-reports: "https://github.com/ocaml/camlp-streams/issues" +x-maintenance-intent: ["(latest)"] depends: [ "dune" {>= "2.7"} "ocaml" {>= "4.02.3"} diff --git a/esy.lock/opam/chrome-trace.3.11.1/opam b/esy.lock/opam/chrome-trace.3.17.2/opam similarity index 65% rename from esy.lock/opam/chrome-trace.3.11.1/opam rename to esy.lock/opam/chrome-trace.3.17.2/opam index da2dd42d..f327ee64 100644 --- a/esy.lock/opam/chrome-trace.3.11.1/opam +++ b/esy.lock/opam/chrome-trace.3.17.2/opam @@ -9,11 +9,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -31,10 +32,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/cmdliner.1.2.0/opam b/esy.lock/opam/cmdliner.1.3.0/opam similarity index 88% rename from esy.lock/opam/cmdliner.1.2.0/opam rename to esy.lock/opam/cmdliner.1.3.0/opam index b29bd296..a44943d8 100644 --- a/esy.lock/opam/cmdliner.1.2.0/opam +++ b/esy.lock/opam/cmdliner.1.3.0/opam @@ -33,7 +33,8 @@ install: [ ] dev-repo: "git+https://erratique.ch/repos/cmdliner.git" url { - src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.2.0.tbz" + src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.3.0.tbz" checksum: - "sha512=6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b" -} \ No newline at end of file + "sha512=4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283" +} +x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/conf-bash.1/opam b/esy.lock/opam/conf-bash.1/opam new file mode 100644 index 00000000..c4276720 --- /dev/null +++ b/esy.lock/opam/conf-bash.1/opam @@ -0,0 +1,14 @@ +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/cppo.1.6.9/opam b/esy.lock/opam/cppo.1.6.9/opam deleted file mode 100644 index 9c51ec6d..00000000 --- a/esy.lock/opam/cppo.1.6.9/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "Code preprocessor like cpp for OCaml" -description: """\ -Cppo is an equivalent of the C preprocessor for OCaml programs. -It allows the definition of simple macros and file inclusion. - -Cppo is: - -* more OCaml-friendly than cpp -* easy to learn without consulting a manual -* reasonably fast -* simple to install and to maintain""" -maintainer: [ - "Martin Jambon " "Yishuai Li " -] -authors: "Martin Jambon" -license: "BSD-3-Clause" -homepage: "https://github.com/ocaml-community/cppo" -doc: "https://ocaml-community.github.io/cppo" -bug-reports: "https://github.com/ocaml-community/cppo/issues" -depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "1.10"} - "base-unix" -] -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} - ["dune" "build" "-p" name "@doc"] {with-doc} -] -dev-repo: "git+https://github.com/ocaml-community/cppo.git" -url { - src: "https://github.com/ocaml-community/cppo/archive/v1.6.9.tar.gz" - checksum: [ - "md5=d23ffe85ac7dc8f0afd1ddf622770d09" - "sha512=26ff5a7b7f38c460661974b23ca190f0feae3a99f1974e0fd12ccf08745bd7d91b7bc168c70a5385b837bfff9530e0e4e41cf269f23dd8cf16ca658008244b44" - ] -} \ No newline at end of file diff --git a/esy.lock/opam/dune-build-info.3.11.1/opam b/esy.lock/opam/dune-build-info.3.17.2/opam similarity index 72% rename from esy.lock/opam/dune-build-info.3.11.1/opam rename to esy.lock/opam/dune-build-info.3.17.2/opam index f0bb6ed4..465f2b8f 100644 --- a/esy.lock/opam/dune-build-info.3.11.1/opam +++ b/esy.lock/opam/dune-build-info.3.17.2/opam @@ -15,11 +15,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -37,10 +38,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/dune-configurator.3.11.1/opam b/esy.lock/opam/dune-configurator.3.17.2/opam similarity index 72% rename from esy.lock/opam/dune-configurator.3.11.1/opam rename to esy.lock/opam/dune-configurator.3.17.2/opam index 8ee593d1..9a9d1f41 100644 --- a/esy.lock/opam/dune-configurator.3.11.1/opam +++ b/esy.lock/opam/dune-configurator.3.17.2/opam @@ -17,13 +17,14 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.04.0"} "base-unix" "csexp" {>= "1.5.0"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -41,10 +42,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/dune-rpc.3.11.1/opam b/esy.lock/opam/dune-rpc.3.17.2/opam similarity index 66% rename from esy.lock/opam/dune-rpc.3.11.1/opam rename to esy.lock/opam/dune-rpc.3.17.2/opam index 9ec69814..9a29b0e1 100644 --- a/esy.lock/opam/dune-rpc.3.11.1/opam +++ b/esy.lock/opam/dune-rpc.3.17.2/opam @@ -8,7 +8,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "csexp" "ordering" "dyn" @@ -18,6 +18,7 @@ depends: [ "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -35,10 +36,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/dune.3.11.1/opam b/esy.lock/opam/dune.3.17.2/opam similarity index 51% rename from esy.lock/opam/dune.3.11.1/opam rename to esy.lock/opam/dune.3.17.2/opam index e79328ce..5133920d 100644 --- a/esy.lock/opam/dune.3.11.1/opam +++ b/esy.lock/opam/dune.3.17.2/opam @@ -2,19 +2,19 @@ opam-version: "2.0" synopsis: "Fast, portable, and opinionated build system" description: """ -dune is a build system that was designed to simplify the release of +Dune is a build system that was designed to simplify the release of Jane Street packages. It reads metadata from "dune" files following a very simple s-expression syntax. -dune is fast, has very low-overhead, and supports parallel builds on +Dune is fast, has very low-overhead, and supports parallel builds on all platforms. It has no system dependencies; all you need to build dune or packages using dune is OCaml. You don't need make or bash as long as the packages themselves don't use bash explicitly. -dune supports multi-package development by simply dropping multiple -repositories into the same directory. +Dune is composable; supporting multi-package development by simply +dropping multiple repositories into the same directory. -It also supports multi-context builds, such as building against +Dune also supports multi-context builds, such as building against several opam roots/switches simultaneously. This helps maintaining packages across several versions of OCaml and gives cross-compilation for free. @@ -35,6 +35,7 @@ conflicts: [ "jbuilder" {= "transition"} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(latest)"] build: [ ["ocaml" "boot/bootstrap.ml" "-j" jobs] ["./_boot/dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs] @@ -45,13 +46,28 @@ depends: [ ("ocaml" {>= "4.08"} | ("ocaml" {>= "4.02" & < "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" + "lwt" { with-dev-setup & os != "win32" } + "cinaps" { with-dev-setup } + "csexp" { with-dev-setup & >= "1.3.0" } + "js_of_ocaml" { with-dev-setup & os != "win32" } + "js_of_ocaml-compiler" { with-dev-setup & os != "win32" } + "mdx" { with-dev-setup & >= "2.3.0" & os != "win32" } + "menhir" { with-dev-setup & os != "win32" } + "ocamlfind" { with-dev-setup & os != "win32" } + "odoc" { with-dev-setup & >= "2.4.0" & os != "win32" } + "ppx_expect" { with-dev-setup & >= "v0.17" & os != "win32" } + "ppx_inline_test" { with-dev-setup & os != "win32" } + "ppxlib" { with-dev-setup & os != "win32" } + "ctypes" { with-dev-setup & os != "win32" } + "utop" { with-dev-setup & >= "2.6.0" & os != "win32" } + "melange" { with-dev-setup & >= "4.0.0-51" & os != "win32" } ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/dyn.3.11.1/opam b/esy.lock/opam/dyn.3.17.2/opam similarity index 64% rename from esy.lock/opam/dyn.3.11.1/opam rename to esy.lock/opam/dyn.3.17.2/opam index 30ca00c8..fd3a8de0 100644 --- a/esy.lock/opam/dyn.3.11.1/opam +++ b/esy.lock/opam/dyn.3.17.2/opam @@ -8,13 +8,14 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "ordering" {= version} "pp" {>= "1.1.0"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(none)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -32,10 +33,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/either.1.0.0/opam b/esy.lock/opam/either.1.0.0/opam index 651c06e4..a368c2da 100644 --- a/esy.lock/opam/either.1.0.0/opam +++ b/esy.lock/opam/either.1.0.0/opam @@ -13,6 +13,7 @@ doc: "https://mirage.github.io/either" bug-reports: "https://github.com/mirage/either/issues" depends: [ "dune" {>= "2.0"} + "ocaml" ] build: [ ["dune" "subst"] {dev} diff --git a/esy.lock/opam/fiber.3.7.0/opam b/esy.lock/opam/fiber.3.7.0/opam index 6a402766..fbf728c3 100644 --- a/esy.lock/opam/fiber.3.7.0/opam +++ b/esy.lock/opam/fiber.3.7.0/opam @@ -8,7 +8,7 @@ bug-reports: "https://github.com/ocaml-dune/fiber/issues" depends: [ "dune" {>= "3.6"} "ocaml" {>= "4.08"} - "ppx_expect" {with-test} + "ppx_expect" {with-test & < "v0.17"} "dyn" "stdune" "odoc" {with-doc} diff --git a/esy.lock/opam/fpath.0.7.3/opam b/esy.lock/opam/fpath.0.7.3/opam index ae3336e4..62b86304 100644 --- a/esy.lock/opam/fpath.0.7.3/opam +++ b/esy.lock/opam/fpath.0.7.3/opam @@ -31,6 +31,11 @@ license. [astring]: http://erratique.ch/software/astring """ url { -archive: "https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz" -checksum: "0740b530e8fed5b0adc5eee8463cfc2f" + src: "https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz" + checksum: [ + "sha256=12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f" + "md5=0740b530e8fed5b0adc5eee8463cfc2f" + ] } + +x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/gen.1.1/opam b/esy.lock/opam/gen.1.1/opam index 30e8e332..cf9ae07c 100644 --- a/esy.lock/opam/gen.1.1/opam +++ b/esy.lock/opam/gen.1.1/opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "1.1"} "seq" "odoc" {with-doc} - "qcheck" {with-test} + "qcheck" {with-test & >= "0.9"} "qtest" {with-test} "ounit2" {with-test} "ocaml" { >= "4.03.0" } diff --git a/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam b/esy.lock/opam/js_of_ocaml-compiler.5.9.1/opam similarity index 71% rename from esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam rename to esy.lock/opam/js_of_ocaml-compiler.5.9.1/opam index d25dd008..89af4b17 100644 --- a/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam +++ b/esy.lock/opam/js_of_ocaml-compiler.5.9.1/opam @@ -11,18 +11,19 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues" depends: [ - "dune" {>= "3.7"} - "ocaml" {>= "4.08" & < "5.2"} + "dune" {>= "3.15"} + "ocaml" {>= "4.08" & < "5.4"} "num" {with-test} "ppx_expect" {>= "v0.14.2" & with-test} - "ppxlib" {>= "0.15.0"} + "ppxlib" {>= "0.15.0" & < "0.36.0"} "re" {with-test} "cmdliner" {>= "1.1.0"} - "sedlex" {>= "2.3"} + "sedlex" {>= "3.3"} + "qcheck" {with-test} "menhir" "menhirLib" "menhirSdk" - "yojson" + "yojson" {>= "1.6"} "odoc" {with-doc} ] depopts: ["ocamlfind"] @@ -46,10 +47,10 @@ build: [ ] url { src: - "https://github.com/ocsigen/js_of_ocaml/releases/download/5.4.0/js_of_ocaml-5.4.0.tbz" + "https://github.com/ocsigen/js_of_ocaml/releases/download/5.9.1/js_of_ocaml-5.9.1.tbz" checksum: [ - "sha256=f1215de133867fefdb16e2798a225ee0446469a57462af0deebdd22d2a8d3b94" - "sha512=610cd22818bc6f0a0163f0eec74f58338e18709a6101639f65e58241a9216ed286c3cb091b41e36a82c926de5f030d718a6e76a493e885e61456047a8da153c9" + "sha256=68c95c60871d8e9c9a54c82f35e2ed50413bcb440f220d0b3516b2a1ee1c7307" + "sha512=288d68ea7a45e92375cf51c34bb1071dd26d0d8de54883f3422639561e1494ff43aa45c3d7466627fd7b5a9bb29a0c75e5744a3e7147f5d544bf2c5414083778" ] } -x-commit-hash: "705b9e39bfb6ab22afbb606dc85c81d1c30faff4" +x-commit-hash: "a02342914f3221a298730d61537cc0d939ccb6e0" diff --git a/esy.lock/opam/menhir.20230608/opam b/esy.lock/opam/menhir.20240715/opam similarity index 69% rename from esy.lock/opam/menhir.20230608/opam rename to esy.lock/opam/menhir.20240715/opam index 994e202c..b27bf538 100644 --- a/esy.lock/opam/menhir.20230608/opam +++ b/esy.lock/opam/menhir.20240715/opam @@ -17,13 +17,14 @@ depends: [ "dune" {>= "2.8.0"} "menhirLib" {= version} "menhirSdk" {= version} + "menhirCST" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20230608/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz" checksum: [ - "md5=8ff26b1e3685c472b7b3aba2fe938a43" - "sha512=334b9dcb1283a28b8547082a89536b1d439ff588290b8eaecdf4802c5f74dbc8d16ad6fc6c0820036183518d83e2cc273a75787a8b41137424c8e7ee82e2b50a" + "md5=d39a8943fe1be28199e5ec1f4133504c" + "sha512=4f933cfc9026f5f2ffda9b0e626862560a233c35ecf097d179edd926d9009bdf46b6611294aea02b63c34427348568f37376a033fbe8cf98a7746fa6f1354dbd" ] } diff --git a/esy.lock/opam/menhirCST.20240715/opam b/esy.lock/opam/menhirCST.20240715/opam new file mode 100644 index 00000000..381585e9 --- /dev/null +++ b/esy.lock/opam/menhirCST.20240715/opam @@ -0,0 +1,29 @@ + +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues" +license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.08" } + "dune" { >= "2.8.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Runtime support library for parsers generated by Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz" + checksum: [ + "md5=d39a8943fe1be28199e5ec1f4133504c" + "sha512=4f933cfc9026f5f2ffda9b0e626862560a233c35ecf097d179edd926d9009bdf46b6611294aea02b63c34427348568f37376a033fbe8cf98a7746fa6f1354dbd" + ] +} diff --git a/esy.lock/opam/menhirLib.20230608/opam b/esy.lock/opam/menhirLib.20240715/opam similarity index 67% rename from esy.lock/opam/menhirLib.20230608/opam rename to esy.lock/opam/menhirLib.20240715/opam index a83c2db7..14b68d29 100644 --- a/esy.lock/opam/menhirLib.20230608/opam +++ b/esy.lock/opam/menhirLib.20240715/opam @@ -8,7 +8,7 @@ authors: [ homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues" -license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" +license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" build: [ ["dune" "build" "-p" name "-j" jobs] ] @@ -22,9 +22,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20230608/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz" checksum: [ - "md5=8ff26b1e3685c472b7b3aba2fe938a43" - "sha512=334b9dcb1283a28b8547082a89536b1d439ff588290b8eaecdf4802c5f74dbc8d16ad6fc6c0820036183518d83e2cc273a75787a8b41137424c8e7ee82e2b50a" + "md5=d39a8943fe1be28199e5ec1f4133504c" + "sha512=4f933cfc9026f5f2ffda9b0e626862560a233c35ecf097d179edd926d9009bdf46b6611294aea02b63c34427348568f37376a033fbe8cf98a7746fa6f1354dbd" ] } diff --git a/esy.lock/opam/menhirSdk.20230608/opam b/esy.lock/opam/menhirSdk.20240715/opam similarity index 67% rename from esy.lock/opam/menhirSdk.20230608/opam rename to esy.lock/opam/menhirSdk.20240715/opam index 892f0922..d99be8a3 100644 --- a/esy.lock/opam/menhirSdk.20230608/opam +++ b/esy.lock/opam/menhirSdk.20240715/opam @@ -8,7 +8,7 @@ authors: [ homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues" -license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" +license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" build: [ ["dune" "build" "-p" name "-j" jobs] ] @@ -22,9 +22,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20230608/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20240715/archive.tar.gz" checksum: [ - "md5=8ff26b1e3685c472b7b3aba2fe938a43" - "sha512=334b9dcb1283a28b8547082a89536b1d439ff588290b8eaecdf4802c5f74dbc8d16ad6fc6c0820036183518d83e2cc273a75787a8b41137424c8e7ee82e2b50a" + "md5=d39a8943fe1be28199e5ec1f4133504c" + "sha512=4f933cfc9026f5f2ffda9b0e626862560a233c35ecf097d179edd926d9009bdf46b6611294aea02b63c34427348568f37376a033fbe8cf98a7746fa6f1354dbd" ] } diff --git a/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam b/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam index 14c9f753..a2df8c61 100644 --- a/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam +++ b/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam @@ -10,7 +10,7 @@ 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"} + "ocaml" {>= "4.04.1" & < "5.2.0"} "odoc" {with-doc} ] build: [ diff --git a/esy.lock/opam/ocamlbuild.0.14.2+win/opam b/esy.lock/opam/ocamlbuild.0.14.2+win/opam deleted file mode 100644 index 19651dfb..00000000 --- a/esy.lock/opam/ocamlbuild.0.14.2+win/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -synopsis: - "OCamlbuild is a build system with builtin rules to easily build most OCaml projects" -maintainer: "Gabriel Scherer " -authors: ["Nicolas Pouillard" "Berke Durak"] -license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception" -homepage: "https://github.com/ocaml/ocamlbuild/" -doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc" -bug-reports: "https://github.com/ocaml/ocamlbuild/issues" -depends: [ - "ocaml" {>= "4.03"} -] -conflicts: [ - "base-ocamlbuild" - "ocamlfind" {< "1.6.2"} -] -build: [ - [make "all"] -] -install: [ - [make "install"] - ["mkdir" "-p" "%{lib}%/ocamlbuild"] - ["install" "-m" "0644" "META" "%{lib}%/ocamlbuild"] -] -dev-repo: "git+https://github.com/ocaml/ocamlbuild.git" -url { - src: "https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.2.tar.gz" - checksum: [ - "md5=2f407fadd57b073155a6aead887d9676" - "sha512=f568bf10431a1f701e8bd7554dc662400a0d978411038bbad93d44dceab02874490a8a5886a9b44e017347e7949997f13f5c3752f74e1eb5e273d2beb19a75fd" - ] -} -extra-source "ocamlbuild-0.14.2.patch" { - src: "https://raw.githubusercontent.com/ocaml-opam/opam-repository-mingw/354a87b397856f2a70024c5c83fc5001074935b6/packages/ocamlbuild/ocamlbuild.0.14.2/files/ocamlbuild-0.14.2.patch" - checksum: "sha256=a9b7e1829a3304e5a073d8ddea29d3d8272698e93b7e1ee659ae5e31e5cfb6b9" -} -patches: "ocamlbuild-0.14.2.patch" -available: os = "win32" diff --git a/esy.lock/opam/ocamlbuild.0.16.1/opam b/esy.lock/opam/ocamlbuild.0.16.1/opam new file mode 100644 index 00000000..83ff5735 --- /dev/null +++ b/esy.lock/opam/ocamlbuild.0.16.1/opam @@ -0,0 +1,44 @@ +opam-version: "2.0" +maintainer: "Gabriel Scherer " +authors: ["Nicolas Pouillard" "Berke Durak"] +homepage: "https://github.com/ocaml/ocamlbuild/" +bug-reports: "https://github.com/ocaml/ocamlbuild/issues" +license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception" +doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc" +dev-repo: "git+https://github.com/ocaml/ocamlbuild.git" +synopsis: + "OCamlbuild is a build system with builtin rules to easily build most OCaml projects" + +build: [ + [ + make + "-f" + "configure.make" + "all" + "OCAMLBUILD_PREFIX=%{prefix}%" + "OCAMLBUILD_BINDIR=%{bin}%" + "OCAMLBUILD_LIBDIR=%{lib}%" + "OCAMLBUILD_MANDIR=%{man}%" + "OCAML_NATIVE=%{ocaml:native}%" + "OCAML_NATIVE_TOOLS=%{ocaml:native}%" + ] + [make "check-if-preinstalled" "all" "opam-install"] +] + +conflicts: [ + "base-ocamlbuild" + "ocamlfind" {< "1.6.2"} +] + +depends: [ + "ocaml" {>= "4.08"} + "ocamlfind" {with-test} + "menhirLib" {with-test} +] + +url { + src: "https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.16.1.tar.gz" + checksum: [ + "sha512=e918b9a0081f271e507c7a4f4d5d5a7cdf818ca51c52acec1bac85ddad5f6cad078cb3c568252fbcf5401c2d75323ed8f50fdd881bda1c9632840320408393ae" + ] +} diff --git a/esy.lock/opam/ocamlfind.1.9.6/opam b/esy.lock/opam/ocamlfind.1.9.2/opam similarity index 70% rename from esy.lock/opam/ocamlfind.1.9.6/opam rename to esy.lock/opam/ocamlfind.1.9.2/opam index a81f0c50..4c0e46df 100644 --- a/esy.lock/opam/ocamlfind.1.9.6/opam +++ b/esy.lock/opam/ocamlfind.1.9.2/opam @@ -13,7 +13,7 @@ authors: "Gerd Stolpmann " homepage: "http://projects.camlcity.org/projects/findlib.html" bug-reports: "https://github.com/ocaml/ocamlfind/issues" depends: [ - "ocaml" {>= "3.08.0"} + "ocaml" {>= "4.00.0" & < "5.0"} ] depopts: ["graphics"] build: [ @@ -34,15 +34,11 @@ install: [ [make "install"] ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} ] -extra-files: ["0001-Harden-test-for-OCaml-5.patch" "md5=3cddbf72164c29d4e50e077a92a37c6c"] -# See https://github.com/ocaml/ocamlfind/pull/61 -patches: ["0001-Harden-test-for-OCaml-5.patch"] dev-repo: "git+https://github.com/ocaml/ocamlfind.git" url { - src: "http://download.camlcity.org/download/findlib-1.9.6.tar.gz" + src: "http://download.camlcity.org/download/findlib-1.9.2.tar.gz" checksum: [ - "md5=96c6ee50a32cca9ca277321262dbec57" - "sha512=cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027" + "md5=180b69dd4474614ad6044d879c467232" + "sha512=c43d43e502869d52e7eb0e5fcf900039fd4ce0c997a4c823f8d5d9ead0c62120447a787723b884bda0db210e9e60fb513d767c4ea6c18bb38effdc8e35a4b75e" ] } -available: os != "win32" diff --git a/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch b/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch deleted file mode 100644 index 8011238c..00000000 --- a/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff a/configure b/configure ---- a/configure -+++ b/configure -@@ -294,7 +294,7 @@ - # If findlib has been configured -sitelib $(ocamlc -where) then there's - # nothing to do, but otherwise we need to put OCaml's Standard Library - # into the path setting. -- if [ ! -e "${ocaml_sitelib}/stdlib/META" ]; then -+ if [ ! -e "${ocaml_sitelib}/stdlib.cmi" ]; then - ocamlpath="${ocaml_core_stdlib}${path_sep}${ocamlpath}" - fi - fi diff --git a/esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam b/esy.lock/opam/ocamlformat-rpc-lib.0.27.0/opam similarity index 78% rename from esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam rename to esy.lock/opam/ocamlformat-rpc-lib.0.27.0/opam index e685d68a..9b9c3ed4 100644 --- a/esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam +++ b/esy.lock/opam/ocamlformat-rpc-lib.0.27.0/opam @@ -40,10 +40,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git" url { src: - "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.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.24.1/opam b/esy.lock/opam/ocamlformat.0.24.1/opam index 55a959bc..6648f324 100644 --- a/esy.lock/opam/ocamlformat.0.24.1/opam +++ b/esy.lock/opam/ocamlformat.0.24.1/opam @@ -7,9 +7,9 @@ authors: ["Josh Berdine "] homepage: "https://github.com/ocaml-ppx/ocamlformat" bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" depends: [ - "ocaml" {>= "4.08"} + "ocaml" {>= "4.08" & < "5.2"} "alcotest" {with-test} - "base" {>= "v0.12.0"} + "base" {>= "v0.12.0" & < "v0.17.0"} "cmdliner" {>= "1.1.0"} "dune" {>= "2.8"} "dune-build-info" diff --git a/esy.lock/opam/octavius.1.2.2/opam b/esy.lock/opam/octavius.1.2.2/opam index 0539c097..e67874dc 100644 --- a/esy.lock/opam/octavius.1.2.2/opam +++ b/esy.lock/opam/octavius.1.2.2/opam @@ -29,5 +29,8 @@ synopsis: "Ocamldoc comment syntax parser" description: "Octavius is a library to parse the `ocamldoc` comment syntax." url { src: "https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz" - checksum: "md5=72f9e1d996e6c5089fc513cc9218607b" + checksum: [ + "sha256=eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad" + "md5=72f9e1d996e6c5089fc513cc9218607b" + ] } diff --git a/esy.lock/opam/omd.1.3.2/opam b/esy.lock/opam/omd.1.3.2/opam index ad2e5014..3a805c06 100644 --- a/esy.lock/opam/omd.1.3.2/opam +++ b/esy.lock/opam/omd.1.3.2/opam @@ -41,7 +41,7 @@ build: [ ] dev-repo: "git+https://github.com/ocaml/omd.git" url { - src: "https://github.com/ocaml/omd/releases/download/1.3.2/omd-1.3.2.tbz" + src: "https://github.com/ocaml/opam-source-archives/raw/main/omd-1.3.2.tbz" checksum: [ "sha256=6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb" "sha512=fa2070a5f5d30b2cc422937ac4158bb087134a69d47fa15df403afb1c0c60a73dd436c949faa8d44e0b65bdee039779d86191b55085b717253f91ef20a69ef98" diff --git a/esy.lock/opam/ordering.3.11.1/opam b/esy.lock/opam/ordering.3.17.2/opam similarity index 62% rename from esy.lock/opam/ordering.3.11.1/opam rename to esy.lock/opam/ordering.3.17.2/opam index 5416c807..4a309ed8 100644 --- a/esy.lock/opam/ordering.3.11.1/opam +++ b/esy.lock/opam/ordering.3.17.2/opam @@ -8,11 +8,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(none)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -30,10 +31,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/pp.1.2.0/opam b/esy.lock/opam/pp.2.0.0/opam similarity index 78% rename from esy.lock/opam/pp.1.2.0/opam rename to esy.lock/opam/pp.2.0.0/opam index 9f4fad20..3eb57512 100644 --- a/esy.lock/opam/pp.1.2.0/opam +++ b/esy.lock/opam/pp.2.0.0/opam @@ -29,8 +29,9 @@ doc: "https://ocaml-dune.github.io/pp/" bug-reports: "https://github.com/ocaml-dune/pp/issues" depends: [ "dune" {>= "2.8"} - "ocaml" {>= "4.08.0"} + "ocaml" {>= "4.08"} "ppx_expect" {with-test} + "ocamlformat" {with-dev-setup & = "0.26.2"} "odoc" {with-doc} ] build: [ @@ -50,10 +51,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-dune/pp.git" url { src: - "https://github.com/ocaml-dune/pp/releases/download/1.2.0/pp-1.2.0.tbz" + "https://github.com/ocaml-dune/pp/releases/download/2.0.0/pp-2.0.0.tbz" checksum: [ - "sha256=a5e822573c55afb42db29ec56eacd1f2acd8f65cf2df2878e291de374ce6909c" - "sha512=912164c2aa7241d73f735dadfbefe8ed0138d241579d2e885440e068fac78eb9f0b3d782c2420e757e313168c1725daff6ab91800dd315b1e05288456998b40a" + "sha256=8651351518b092b4a2def4e08171c276152f92fb6a84a8b19b6b929ccdb44419" + "sha512=78cb68f35c0b975dd1e91bd83d5e33bcec1ee642431585d55864c483c70a032755dfcf21ec5697691e7e7554381ddb580639fd149e28ba6f74d04d2ee43d360d" ] } -x-commit-hash: "83b68c740f21acdcfe54436355ab328372871357" +x-commit-hash: "b6741dd41ef5fc5bda8b3640097ac29818a43577" diff --git a/esy.lock/opam/ppx_derivers.1.2.1/opam b/esy.lock/opam/ppx_derivers.1.2.1/opam index 484b2654..d06e23b2 100644 --- a/esy.lock/opam/ppx_derivers.1.2.1/opam +++ b/esy.lock/opam/ppx_derivers.1.2.1/opam @@ -19,5 +19,8 @@ ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.""" url { src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz" - checksum: "md5=5dc2bf130c1db3c731fe0fffc5648b41" + checksum: [ + "sha256=b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95" + "md5=5dc2bf130c1db3c731fe0fffc5648b41" + ] } diff --git a/esy.lock/opam/ppxlib.0.29.1/opam b/esy.lock/opam/ppxlib.0.35.0/opam similarity index 61% rename from esy.lock/opam/ppxlib.0.29.1/opam rename to esy.lock/opam/ppxlib.0.35.0/opam index 0a04c32e..b31b3583 100644 --- a/esy.lock/opam/ppxlib.0.29.1/opam +++ b/esy.lock/opam/ppxlib.0.35.0/opam @@ -1,9 +1,9 @@ opam-version: "2.0" -synopsis: "Standard library for ppx rewriters" +synopsis: "Standard infrastructure for ppx rewriters" description: """ -Ppxlib is the standard library for ppx rewriters and other programs -that manipulate the in-memory representation of OCaml programs, a.k.a -the "Parsetree". +Ppxlib is the standard infrastructure for ppx rewriters +and other programs that manipulate the in-memory representation of +OCaml programs, a.k.a the "Parsetree". It also comes bundled with two ppx rewriters that are commonly used to write tools that manipulate and/or generate Parsetree values; @@ -19,8 +19,8 @@ homepage: "https://github.com/ocaml-ppx/ppxlib" doc: "https://ocaml-ppx.github.io/ppxlib/" bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues" depends: [ - "dune" {>= "2.7"} - "ocaml" {>= "4.04.1" & < "5.1.0"} + "dune" {>= "3.8"} + "ocaml" {>= "4.08.0" & < "5.4.0"} "ocaml-compiler-libs" {>= "v0.11.0"} "ppx_derivers" {>= "1.0"} "sexplib0" {>= "v0.12"} @@ -29,13 +29,13 @@ depends: [ "ocamlfind" {with-test} "re" {with-test & >= "1.9.0"} "cinaps" {with-test & >= "v0.12.1"} - "base" {with-test & < "v0.16.0" } - "stdio" {with-test} + "ocamlformat" {with-dev-setup & = "0.26.2"} "odoc" {with-doc} ] conflicts: [ "ocaml-migrate-parsetree" {< "2.0.0"} - "base-effects" + "ocaml-base-compiler" {= "5.1.0~alpha1"} + "ocaml-variants" {= "5.1.0~alpha1+options"} ] build: [ ["dune" "subst"] {dev} @@ -52,12 +52,13 @@ build: [ ] ] dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git" +x-maintenance-intent: ["(latest)"] url { src: - "https://github.com/ocaml-ppx/ppxlib/releases/download/0.29.1/ppxlib-0.29.1.tbz" + "https://github.com/ocaml-ppx/ppxlib/releases/download/0.35.0/ppxlib-0.35.0.tbz" checksum: [ - "sha256=c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79" - "sha512=edc468e9111cc26e31825e475fd72f55123a22fe86548e07e7d111796fecb8d60359b1b53c7eac383e5e2114cbae74dfd9c166f330e84cbeab4ddfd5797e322f" + "sha256=d9d959fc9f84260487e45684dc741898a92fc5506b61a7f5cac65d21832db925" + "sha512=e428b1e3b89261c7efdaa18016264d1afbf067cb9b0d41124b04796c2487ac7ca8ee9a24a60d56f20d1774cb44aaa9ecf1512f17455812ba8d62d4ef93616ee7" ] } -x-commit-hash: "36fcba0408b78963a730e0be92abdbab00b0ea26" +x-commit-hash: "3a791083c612e91fa4e6a9660ef69776ea750324" diff --git a/esy.lock/opam/re.1.11.0/opam b/esy.lock/opam/re.1.12.0/opam similarity index 71% rename from esy.lock/opam/re.1.11.0/opam rename to esy.lock/opam/re.1.12.0/opam index 303af008..48eca0af 100644 --- a/esy.lock/opam/re.1.11.0/opam +++ b/esy.lock/opam/re.1.12.0/opam @@ -20,9 +20,9 @@ build: [ ] depends: [ - "ocaml" {>= "4.03"} + "ocaml" {>= "4.12"} "dune" {>= "2.0"} - "ounit" {with-test} + "ounit2" {with-test} "seq" ] @@ -37,10 +37,10 @@ Pure OCaml regular expressions with: """ url { src: - "https://github.com/ocaml/ocaml-re/releases/download/1.11.0/re-1.11.0.tbz" + "https://github.com/ocaml/ocaml-re/releases/download/1.12.0/re-1.12.0.tbz" checksum: [ - "sha256=01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f" - "sha512=3e3712cc1266ec1f27620f3508ea2ebba338f4083b07d8a69dccee1facfdc1971a6c39f9deea664d2a62fd7f2cfd2eae816ca4c274acfadaee992a3befc4b757" + "sha256=a01f2bf22f72c2f4ababd8d3e7635e35c1bf6bc5a41ad6d5a007454ddabad1d4" + "sha512=f0726826e1e677f7ecdf447d46d814a11d3844ec6e5c0527be8c73c7afdb08aacfca47ea764eda325bcd7064aff07c1d3441c935ee5a0fc99ede8707f81a451d" ] } -x-commit-hash: "2dd38515c76c40299596d39f18d9b9a20f00d788" +x-commit-hash: "f09672608781dc05172ad980a6e9a483c3b9d534" diff --git a/esy.lock/opam/result.1.5/opam b/esy.lock/opam/result.1.5/opam index 6b7b68d7..da55ed46 100644 --- a/esy.lock/opam/result.1.5/opam +++ b/esy.lock/opam/result.1.5/opam @@ -18,5 +18,8 @@ Result module defined in this library.""" url { src: "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz" - checksum: "md5=1b82dec78849680b49ae9a8a365b831b" + checksum: [ + "sha256=7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32" + "md5=1b82dec78849680b49ae9a8a365b831b" + ] } diff --git a/esy.lock/opam/sedlex.3.2/opam b/esy.lock/opam/sedlex.3.3/opam similarity index 83% rename from esy.lock/opam/sedlex.3.2/opam rename to esy.lock/opam/sedlex.3.3/opam index b978761c..89b5577a 100644 --- a/esy.lock/opam/sedlex.3.2/opam +++ b/esy.lock/opam/sedlex.3.3/opam @@ -17,7 +17,7 @@ bug-reports: "https://github.com/ocaml-community/sedlex/issues" depends: [ "ocaml" {>= "4.08"} "dune" {>= "3.0"} - "ppxlib" {>= "0.26.0"} + "ppxlib" {>= "0.26.0" & < "0.36.0"} "gen" "ppx_expect" {with-test} "odoc" {with-doc} @@ -40,9 +40,9 @@ dev-repo: "git+https://github.com/ocaml-community/sedlex.git" doc: "https://ocaml-community.github.io/sedlex/index.html" url { src: - "https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.2.tar.gz" + "https://github.com/ocaml-community/sedlex/archive/refs/tags/v3.3.tar.gz" checksum: [ - "md5=b67eec3a80a7fed8e6c91e47260b0843" - "sha512=00e257d1b97e99d49028d2e38b20a05c6aa151c362991c37c17522bf58c19e273b762ea39dd9783ed9ecc60d11dadeabb0487e16b4af91536e45e7e18c86cfe9" + "md5=4603d572e24f3515fe7e7d0b665bdda6" + "sha512=791b172b59256cb77df1bbd9e3136aa79e65bcb3df1f64bbe10933d624bad59a7d8b358c35abd07c267b89a3feb01f935e927ffc4fe9c6eb2ac6637cfa9b42cd" ] } diff --git a/esy.lock/opam/seq.base/files/META.seq b/esy.lock/opam/seq.base/files/META.seq deleted file mode 100644 index 06b95eff..00000000 --- a/esy.lock/opam/seq.base/files/META.seq +++ /dev/null @@ -1,4 +0,0 @@ -name="seq" -version="[distributed with OCaml 4.07 or above]" -description="dummy backward-compatibility package for iterators" -requires="" diff --git a/esy.lock/opam/seq.base/files/seq.install b/esy.lock/opam/seq.base/files/seq.install deleted file mode 100644 index c4d70206..00000000 --- a/esy.lock/opam/seq.base/files/seq.install +++ /dev/null @@ -1,3 +0,0 @@ -lib:[ - "META.seq" {"META"} -] diff --git a/esy.lock/opam/seq.base/opam b/esy.lock/opam/seq.base/opam index b33d8c7d..c732d3eb 100644 --- a/esy.lock/opam/seq.base/opam +++ b/esy.lock/opam/seq.base/opam @@ -9,7 +9,19 @@ dev-repo: "git+https://github.com/ocaml/ocaml.git" bug-reports: "https://caml.inria.fr/mantis/main_page.php" synopsis: "Compatibility package for OCaml's standard iterator type starting from 4.07." -extra-files: [ - ["seq.install" "md5=026b31e1df290373198373d5aaa26e42"] - ["META.seq" "md5=b33c8a1a6c7ed797816ce27df4855107"] -] +extra-source "seq.install" { + src: + "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/seq/seq.install" + checksum: [ + "sha256=fff926c2c4d5a82b6c94c60c4c35eb06e3d39975893ebe6b1f0e6557cbe34904" + "md5=026b31e1df290373198373d5aaa26e42" + ] +} +extra-source "META.seq" { + src: + "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/seq/META.seq" + checksum: [ + "sha256=e95062b4d0519ef8335c02f7d0f1952d11b814c7ab7e6d566a206116162fa2be" + "md5=b33c8a1a6c7ed797816ce27df4855107" + ] +} diff --git a/esy.lock/opam/spawn.v0.15.1/opam b/esy.lock/opam/spawn.v0.17.0/opam similarity index 71% rename from esy.lock/opam/spawn.v0.15.1/opam rename to esy.lock/opam/spawn.v0.17.0/opam index 5be3a994..7b2449e9 100644 --- a/esy.lock/opam/spawn.v0.15.1/opam +++ b/esy.lock/opam/spawn.v0.17.0/opam @@ -18,8 +18,8 @@ fork takes time proportional to the process memory while vfork is constant time. In application using a lot of memory, vfork can be thousands of times faster than fork. """ -maintainer: ["Jane Street developers"] -authors: ["Jane Street Group, LLC"] +maintainer: ["opensource@janestreet.com"] +authors: ["Jane Street Group, LLC "] license: "MIT" homepage: "https://github.com/janestreet/spawn" doc: "https://janestreet.github.io/spawn/" @@ -44,13 +44,14 @@ build: [ "@doc" {with-doc} ] ] +available: os != "freebsd" dev-repo: "git+https://github.com/janestreet/spawn.git" -x-commit-hash: "13d279ebfa8c40d4bafe18cddfdff0de54b4eaff" url { src: - "https://github.com/janestreet/spawn/archive/v0.15.1.tar.gz" + "https://github.com/janestreet/spawn/releases/download/v0.17.0/spawn-v0.17.0.tbz" checksum: [ - "sha256=9afdee314fab6c3fcd689ab6eb5608d6b78078e6dede3953a47debde06c19d50" - "sha512=efdb31d5ec5ea36d0bc80224d4ee04e46ce3428d1662870e6cebece92bc313d6eebee378802c0c059dd6e0cafea515308c31b7dfaf04a098eb4566583c1e9ed4" + "sha256=33fbb5cd4c3387a6829095cfa73d5fc2eff572be61647e6052010bfbd0c2df49" + "sha512=bb85d1f706774793170f2d52ccbeeeaf67558046b8012bdd8a9cefc46215522a4d59a4a6f21296b0825158e6853a2430f2642ee714e1d1d8b726442d52006fc1" ] } +x-commit-hash: "085ea6d333be59451c5fde6b50d9e4e1264fbb9c" diff --git a/esy.lock/opam/stdune.3.11.1/opam b/esy.lock/opam/stdune.3.17.2/opam similarity index 66% rename from esy.lock/opam/stdune.3.11.1/opam rename to esy.lock/opam/stdune.3.17.2/opam index 2dfc9253..0c03eece 100644 --- a/esy.lock/opam/stdune.3.11.1/opam +++ b/esy.lock/opam/stdune.3.17.2/opam @@ -9,16 +9,17 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "base-unix" "dyn" {= version} "ordering" {= version} - "pp" {>= "1.2.0"} + "pp" {>= "2.0.0"} "csexp" {>= "1.5.0"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" +x-maintenance-intent: ["(none)"] build: [ ["dune" "subst"] {dev} ["rm" "-rf" "vendor/csexp"] @@ -36,10 +37,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/topkg.1.0.7/opam b/esy.lock/opam/topkg.1.0.7/opam index 83fc06f4..37c84bf2 100644 --- a/esy.lock/opam/topkg.1.0.7/opam +++ b/esy.lock/opam/topkg.1.0.7/opam @@ -44,4 +44,5 @@ url { src: "https://erratique.ch/software/topkg/releases/topkg-1.0.7.tbz" checksum: "sha512=09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535" -} \ No newline at end of file +} +x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/uucp.15.1.0/opam b/esy.lock/opam/uucp.16.0.0/opam similarity index 79% rename from esy.lock/opam/uucp.15.1.0/opam rename to esy.lock/opam/uucp.16.0.0/opam index f3abfcad..4f9b95d2 100644 --- a/esy.lock/opam/uucp.15.1.0/opam +++ b/esy.lock/opam/uucp.16.0.0/opam @@ -21,12 +21,12 @@ depends: [ "ocamlfind" {build} "ocamlbuild" {build} "topkg" {build & >= "1.0.3"} - "uucd" {with-test & dev & >= "15.1.0" & < "16.0.0"} + "uucd" {with-test & dev & >= "16.0.0" & < "17.0.0"} "uunf" {with-test} ] depopts: ["uunf" "cmdliner"] conflicts: [ - "uunf" {< "15.1.0" | >= "16.0.0"} + "uunf" {< "16.0.0" | >= "17.0.0"} "cmdliner" {< "1.1.0"} ] build: [ @@ -45,7 +45,8 @@ post-messages: {failure & (arch = "ppc64" | arch = "arm64")} dev-repo: "git+https://erratique.ch/repos/uucp.git" url { - src: "https://erratique.ch/software/uucp/releases/uucp-15.1.0.tbz" + src: "https://erratique.ch/software/uucp/releases/uucp-16.0.0.tbz" checksum: - "sha512=998f94fadb72357b15a3042a3d11c31b3e16f281822673f2defdd515cd1394d55de1817628be8bd5c030175f9e62c53630d4139a1c0253800f9fb898b0f11364" -} \ No newline at end of file + "sha512=5c06d8cadb2b011b1e4ac52e14732044f6ab8e9c11e1184950ff8629b26bd173f1264247623a635b8aa4033e287bfe42d709994f19a3d79f7cbfd20158aa4992" +} +x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/uuseg.15.1.0/opam b/esy.lock/opam/uuseg.16.0.0/opam similarity index 84% rename from esy.lock/opam/uuseg.15.1.0/opam rename to esy.lock/opam/uuseg.16.0.0/opam index c1a87203..03886ed9 100644 --- a/esy.lock/opam/uuseg.15.1.0/opam +++ b/esy.lock/opam/uuseg.16.0.0/opam @@ -29,7 +29,7 @@ depends: [ "ocamlfind" {build} "ocamlbuild" {build} "topkg" {build & >= "1.0.3"} - "uucp" {>= "15.1.0" & < "16.0.0"} + "uucp" {>= "16.0.0" & < "17.0.0"} ] depopts: ["uutf" "cmdliner"] conflicts: [ @@ -49,7 +49,8 @@ build: [ ] dev-repo: "git+https://erratique.ch/repos/uuseg.git" url { - src: "https://erratique.ch/software/uuseg/releases/uuseg-15.1.0.tbz" + src: "https://erratique.ch/software/uuseg/releases/uuseg-16.0.0.tbz" checksum: - "sha512=1e9460dc5a856c985d40c61fd1560bdfdb8bbaf8d7430405814589b47d4a7f7869658d1e3198c7a9132412e9b4b85402ceb4bda5040da426b69e9aef4222a23a" -} \ No newline at end of file + "sha512=355139aee2a72baddf3d811e522948456147546ee946b6eca20f57711865770d4b8d32ea01a7338b8e6cdedb4423ee65cee387704bb9c0c057bcbd65012679b8" +} +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 index e96cc4a4..5ca13919 100644 --- a/esy.lock/opam/uutf.1.0.3/opam +++ b/esy.lock/opam/uutf.1.0.3/opam @@ -33,4 +33,5 @@ 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 ``""" \ No newline at end of file +Contact: Daniel Bünzli ``""" +x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/esy.lock/opam/xdg.3.11.1/opam b/esy.lock/opam/xdg.3.17.2/opam similarity index 67% rename from esy.lock/opam/xdg.3.11.1/opam rename to esy.lock/opam/xdg.3.17.2/opam index 9a6a17d0..5471a8f9 100644 --- a/esy.lock/opam/xdg.3.11.1/opam +++ b/esy.lock/opam/xdg.3.17.2/opam @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08"} "odoc" {with-doc} ] @@ -31,10 +31,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.17.2/dune-3.17.2.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=9deafeed0ecfe9e65e642cd8e6197f0864f73fcd7b94b5b199ae4d2e07a2ea64" + "sha512=1e85bb297a12c9571b8645541d85a719deffb619d5e4f48dbf4566ac14e9f385d8a05342698a6f9c81ba17325b1da4ad004a5772d66cd88ed135c43d43e88f9e" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "fedec664a6ba500f94ba4558112f52d5719bed4d" diff --git a/esy.lock/opam/yojson.2.1.1/opam b/esy.lock/opam/yojson.2.2.2/opam similarity index 73% rename from esy.lock/opam/yojson.2.1.1/opam rename to esy.lock/opam/yojson.2.2.2/opam index 0703d53b..1d971fe0 100644 --- a/esy.lock/opam/yojson.2.1.1/opam +++ b/esy.lock/opam/yojson.2.2.2/opam @@ -12,12 +12,11 @@ maintainer: [ authors: ["Martin Jambon"] license: "BSD-3-Clause" homepage: "https://github.com/ocaml-community/yojson" -doc: "https://ocaml-community.github.io/yojson" +doc: "https://ocaml.org/p/yojson/latest" bug-reports: "https://github.com/ocaml-community/yojson/issues" depends: [ "dune" {>= "2.7"} "ocaml" {>= "4.02.3"} - "cppo" {build} "alcotest" {with-test & >= "0.8.5"} "seq" {>= "0.2.2"} "odoc" {with-doc} @@ -39,10 +38,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-community/yojson.git" url { src: - "https://github.com/ocaml-community/yojson/releases/download/2.1.1/yojson-2.1.1.tbz" + "https://github.com/ocaml-community/yojson/releases/download/2.2.2/yojson-2.2.2.tbz" checksum: [ - "sha256=d58183207b198dc065866239066e074c34f9e139c0d9c4175a38809790e88173" - "sha512=f7b8529900acb29bc6236d8312d3ebcadbcb3f9d361c8acaed9f7fc7e30527b41a1f3cff80382dde445e6da18a4edc5a9c6758af24affce1022d0741dbd9daeb" + "sha256=9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595" + "sha512=ac52eae3ca1d3129a7885ca638e6ae5bcfc387598a82cc30d3e4988fd154f1756719c399f96e950d898c79a6dbd4ccc44b6f468bcafbd620e6945a0415b41e0c" ] } -x-commit-hash: "57bc8ca0eaf5bdb423fcdece49ea0d1c2866f90c" +x-commit-hash: "3f82b79d1865eec82c6f498ee1835a90c74c31b4" diff --git a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/files/ocamlbuild-0.14.2.patch b/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/files/ocamlbuild-0.14.2.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/files/winpatch.patch b/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/files/winpatch.patch deleted file mode 100644 index bba9929f..00000000 --- a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/files/winpatch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -271,7 +271,7 @@ - echo ' "ocamlbuild.byte" {"ocamlbuild.byte"}' >> ocamlbuild.install - ifeq ($(OCAML_NATIVE), true) - echo ' "ocamlbuild.native" {"ocamlbuild.native"}' >> ocamlbuild.install -- echo ' "ocamlbuild.native" {"ocamlbuild"}' >> ocamlbuild.install -+ echo " \"ocamlbuild.native\" {\"ocamlbuild${EXE}\"}" >> ocamlbuild.install - else - echo ' "ocamlbuild.byte" {"ocamlbuild"}' >> ocamlbuild.install - endif diff --git a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/package.json deleted file mode 100644 index b57a42cc..00000000 --- a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override/package.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "build": [ - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < winpatch.patch' : 'true'}" - ], - [ - "make", - "-f", - "configure.make", - "all", - "OCAMLBUILD_PREFIX=#{self.install}", - "OCAMLBUILD_BINDIR=#{self.bin}", - "OCAMLBUILD_LIBDIR=#{self.lib}", - "OCAMLBUILD_MANDIR=#{self.man}", - "OCAMLBUILD_NATIVE=true", - "OCAMLBUILD_NATIVE_TOOLS=true", - "EXE=#{os == 'windows' ? '.exe': ''}" - ], - [ - "make", - "check-if-preinstalled", - "all", - "EXE=#{os == 'windows' ? '.exe': ''}", - "opam-install" - ] - ] -} diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/files/findlib-1.9.2.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/files/findlib-1.9.2.patch new file mode 100644 index 00000000..3e3ee5a2 --- /dev/null +++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/files/findlib-1.9.2.patch @@ -0,0 +1,471 @@ +--- ./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 diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/package.json similarity index 92% rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/package.json index bf169e50..0b0e3319 100644 --- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json +++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/package.json @@ -3,7 +3,7 @@ [ "bash", "-c", - "#{os == 'windows' ? 'patch -p1 < findlib.patch' : 'true'}" + "#{os == 'windows' ? 'patch -p1 < findlib-1.9.2.patch' : 'true'}" ], [ "./configure", diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch deleted file mode 100644 index d545632a..00000000 --- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -55,7 +55,7 @@ - export USE_CYGPATH; \ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' | \ -- $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' -p >findlib.conf -+ $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ - echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ - fi From b10d3bd43a8a1b7133435e61c103bd4793f6b3f1 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 14:30:47 -0600 Subject: [PATCH 05/13] back to ocamlfind 1.9.8 --- esy.lock/index.json | 40 +- .../{ocamlfind.1.9.2 => ocamlfind.1.9.8}/opam | 30 +- .../files/findlib-1.9.2.patch | 471 ------------------ .../files/findlib.patch | 11 + .../package.json | 2 +- package.json | 3 +- 6 files changed, 50 insertions(+), 507 deletions(-) rename esy.lock/opam/{ocamlfind.1.9.2 => ocamlfind.1.9.8}/opam (68%) delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/files/findlib-1.9.2.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.2_opam_override => opam__s__ocamlfind_opam__c__1.9.8_opam_override}/package.json (92%) diff --git a/esy.lock/index.json b/esy.lock/index.json index f74fb23a..36f064ab 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "6c3e7d599c785cb84c37f4676d957748", + "checksum": "2aceb017bd41774397cd5824bc330c3f", "root": "@grain/binaryen.ml@link-dev:./package.json", "node": { "ocaml@4.14.1000@d41d8cd9": { @@ -88,7 +88,7 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@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" @@ -116,7 +116,7 @@ "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.2@48f9d5d4", + "@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" @@ -145,7 +145,7 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@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" @@ -171,7 +171,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -677,14 +677,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "ocaml@4.14.1000@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@785dbd33", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "ocaml@4.14.1000@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@785dbd33" @@ -774,25 +774,25 @@ ], "available": "true" }, - "@opam/ocamlfind@opam:1.9.2@48f9d5d4": { - "id": "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@opam/ocamlfind@opam:1.9.8@ee910ff5": { + "id": "@opam/ocamlfind@opam:1.9.8@ee910ff5", "name": "@opam/ocamlfind", - "version": "opam:1.9.2", + "version": "opam:1.9.8", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/18/180b69dd4474614ad6044d879c467232#md5:180b69dd4474614ad6044d879c467232", - "archive:http://download.camlcity.org/download/findlib-1.9.2.tar.gz#md5:180b69dd4474614ad6044d879c467232" + "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.2", - "path": "esy.lock/opam/ocamlfind.1.9.2" + "version": "1.9.8", + "path": "esy.lock/opam/ocamlfind.1.9.8" } }, "overrides": [ { - "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override" } ], "dependencies": [ @@ -1060,7 +1060,7 @@ "ocaml@4.14.1000@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.2@48f9d5d4", + "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhir@opam:20240715@454ed5d1", @@ -1126,7 +1126,7 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@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" @@ -1546,11 +1546,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "ocaml@4.14.1000@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.2@48f9d5d4" + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5" ], "available": "true" }, @@ -1621,7 +1621,7 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@e59fb83d", - "@opam/ocamlfind@opam:1.9.2@48f9d5d4", + "@opam/ocamlfind@opam:1.9.8@ee910ff5", "@opam/ocamlbuild@opam:0.16.1@b3fc8209", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], diff --git a/esy.lock/opam/ocamlfind.1.9.2/opam b/esy.lock/opam/ocamlfind.1.9.8/opam similarity index 68% rename from esy.lock/opam/ocamlfind.1.9.2/opam rename to esy.lock/opam/ocamlfind.1.9.8/opam index 4c0e46df..d9fe3931 100644 --- a/esy.lock/opam/ocamlfind.1.9.2/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.2.tar.gz" + src: + "https://github.com/ocaml/ocamlfind/archive/refs/tags/findlib-1.9.8.tar.gz" checksum: [ - "md5=180b69dd4474614ad6044d879c467232" - "sha512=c43d43e502869d52e7eb0e5fcf900039fd4ce0c997a4c823f8d5d9ead0c62120447a787723b884bda0db210e9e60fb513d767c4ea6c18bb38effdc8e35a4b75e" + "md5=ca770e5806032a96131b670f6e07f146" + "sha512=8967986de2ab4ec5993f437b0a4206742adf37aa7a292a3bba0a04438d78539b84d001191e60b2d5bde98a695b38cba2593b7051f7749adbdb964a0df3c4b661" ] -} +} \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/files/findlib-1.9.2.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/files/findlib-1.9.2.patch deleted file mode 100644 index 3e3ee5a2..00000000 --- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/files/findlib-1.9.2.patch +++ /dev/null @@ -1,471 +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 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 00000000..560da810 --- /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.2_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/package.json similarity index 92% rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/package.json rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/package.json index 0b0e3319..bf169e50 100644 --- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.2_opam_override/package.json +++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.8_opam_override/package.json @@ -3,7 +3,7 @@ [ "bash", "-c", - "#{os == 'windows' ? 'patch -p1 < findlib-1.9.2.patch' : 'true'}" + "#{os == 'windows' ? 'patch -p1 < findlib.patch' : 'true'}" ], [ "./configure", diff --git a/package.json b/package.json index b67ee42d..722f3ff0 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,7 @@ "@opam/ocaml-lsp-server": ">= 1.9.1 < 1.13.0" }, "resolutions": { - "@opam/ocp-indent": "1.7.0", - "@opam/ocamlfind": "1.9.2" + "@opam/ocp-indent": "1.7.0" }, "esy": { "build": "dune build -p binaryen" From 0e1d8ea5674dc1caff20ae8b06594245bf6fbe1d Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 16:18:33 -0600 Subject: [PATCH 06/13] ensure -W flag isn't the issue --- test/config/ocamlopt_flags.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/config/ocamlopt_flags.ml b/test/config/ocamlopt_flags.ml index df053bd9..2cbf28e3 100644 --- a/test/config/ocamlopt_flags.ml +++ b/test/config/ocamlopt_flags.ml @@ -9,8 +9,8 @@ let () = | Some "macosx" -> (* These flags preserve the original C++ error behavior. Ref https://github.com/ocaml/ocaml/issues/10423 *) [ "-cc"; "clang++" ] - | Some _ -> default - | None -> default + | Some "mingw" -> [ "-Wall"; "-Wextra" ] + | _ -> default in C.Flags.write_sexp "ocamlopt_flags.sexp" ocamlopt_flags) From ff58fcb806a4d1acc2c202dadf41cdbd4dfd011b Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 16:34:31 -0600 Subject: [PATCH 07/13] windows --- test/config/ocamlopt_flags.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config/ocamlopt_flags.ml b/test/config/ocamlopt_flags.ml index 2cbf28e3..ba38a24b 100644 --- a/test/config/ocamlopt_flags.ml +++ b/test/config/ocamlopt_flags.ml @@ -9,7 +9,7 @@ let () = | Some "macosx" -> (* These flags preserve the original C++ error behavior. Ref https://github.com/ocaml/ocaml/issues/10423 *) [ "-cc"; "clang++" ] - | Some "mingw" -> [ "-Wall"; "-Wextra" ] + | Some "windows" -> [ "-Wall"; "-Wextra" ] | _ -> default in From 2932d8aa24d2255b2551300a8f44de1d96735ec5 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 16:47:47 -0600 Subject: [PATCH 08/13] no flags --- test/config/ocamlopt_flags.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/config/ocamlopt_flags.ml b/test/config/ocamlopt_flags.ml index ba38a24b..df053bd9 100644 --- a/test/config/ocamlopt_flags.ml +++ b/test/config/ocamlopt_flags.ml @@ -9,8 +9,8 @@ let () = | Some "macosx" -> (* These flags preserve the original C++ error behavior. Ref https://github.com/ocaml/ocaml/issues/10423 *) [ "-cc"; "clang++" ] - | Some "windows" -> [ "-Wall"; "-Wextra" ] - | _ -> default + | Some _ -> default + | None -> default in C.Flags.write_sexp "ocamlopt_flags.sexp" ocamlopt_flags) From 2e26d909e3e91f6188dd4d3d8227933e48cd1db3 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 16:48:51 -0600 Subject: [PATCH 09/13] should work on newer ocaml --- .github/workflows/opam.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index ce99b79a..563e5db4 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - ocaml-compiler: [4.12.1, 4.13.1, 4.14.1] + ocaml-compiler: [4.13.1, 4.14.1, 4.14.2, 4.14.3, 5.3.1] steps: - name: Checkout project From a633c543860e61e2577936badbd83a9287ce2b57 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 17:15:52 -0600 Subject: [PATCH 10/13] check ocaml 5.3 --- .github/workflows/opam.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 563e5db4..e41b7bc3 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - ocaml-compiler: [4.13.1, 4.14.1, 4.14.2, 4.14.3, 5.3.1] + ocaml-compiler: [5.3.0] steps: - name: Checkout project From ed9bbd547e17c748699dcf413fd1369d1efdca28 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 18:02:24 -0600 Subject: [PATCH 11/13] old setup-ocaml --- .github/workflows/opam.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index e41b7bc3..0e999a2f 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - ocaml-compiler: [5.3.0] + ocaml-compiler: [4.12.1, 4.13.1, 4.14.1] steps: - name: Checkout project @@ -26,7 +26,7 @@ jobs: submodules: "recursive" - name: Setup OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10 + uses: ocaml/setup-ocaml@v2 if: ${{ startsWith(matrix.os, 'windows-') }} with: ocaml-compiler: ${{ matrix.ocaml-compiler }} @@ -35,7 +35,7 @@ jobs: default: https://github.com/ocaml/opam-repository.git - name: Setup OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10 + uses: ocaml/setup-ocaml@v2 if: ${{ !startsWith(matrix.os, 'windows-') }} with: ocaml-compiler: ${{ matrix.ocaml-compiler }} From a56529b265019a7b3dabff634be3bb2d58eb2f83 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 18:04:04 -0600 Subject: [PATCH 12/13] regular opam repository --- .github/workflows/opam.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 0e999a2f..6fc213d7 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -26,17 +26,7 @@ jobs: 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@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} From 89ec2032892a17dd117440f05761c3073b85d748 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 7 Mar 2025 18:21:55 -0600 Subject: [PATCH 13/13] restore --- .github/workflows/opam.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 6fc213d7..ce99b79a 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -27,6 +27,16 @@ jobs: - name: Setup OCaml ${{ matrix.ocaml-compiler }} uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10 + 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@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10 + if: ${{ !startsWith(matrix.os, 'windows-') }} with: ocaml-compiler: ${{ matrix.ocaml-compiler }}