From dc0b7e8b019e9ee156f1f072bf2369ebee640c74 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 9 Jan 2021 09:31:40 +0100 Subject: [PATCH 1/4] esy 0.6.7 --- .github/workflows/ci.yml | 2 +- docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fadea4b..28214c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v2 - name: Install esy - run: npm i -g esy@0.6.4 + run: npm i -g esy@0.6.7 - name: Restore esy install cache uses: actions/cache@v1 diff --git a/docker/Dockerfile b/docker/Dockerfile index 0f8c9aa..52ffd25 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,4 +4,4 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs npm git rsync m4 curl zip \ && rm -rf /var/lib/apt/lists/* -RUN npm i -g esy@0.6.4 +RUN npm i -g esy@0.6.7 From 9e30bbf5e3728ec00ea23bdded1647ffaaec86ca Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 9 Jan 2021 07:36:26 +0100 Subject: [PATCH 2/4] Revert to OCaml 4.06. --- esy.lock/index.json | 556 +++++++++++------- esy.lock/opam/{cppo.1.6.6 => cppo.1.6.7}/opam | 12 +- esy.lock/opam/csexp.1.3.2/opam | 58 ++ esy.lock/opam/dot-merlin-reader.3.4.2/opam | 28 + esy.lock/opam/{dune.2.5.1 => dune.2.7.1}/opam | 14 +- .../opam/{fix.20200131 => fix.20201120}/opam | 8 +- .../{menhir.20200211 => menhir.20201216}/opam | 8 +- .../opam | 10 +- .../opam | 10 +- .../opam | 7 +- .../opam/{merlin.3.3.4 => merlin.3.4.2}/opam | 15 +- .../opam/ocaml-migrate-parsetree.1.7.3/opam | 37 -- ...Don-t-build-manpages-for-stdlib-docs.patch | 24 + ...1-Fix-failure-to-install-tools-links.patch | 26 + .../files/fix-gcc10.patch | 34 ++ .../ocaml-secondary-compiler.4.08.1-1/opam | 51 ++ .../ocamlfind-secondary.1.8.1/files/META.in | 3 + .../files/ocaml-secondary-compiler.conf.in | 10 + esy.lock/opam/ocamlfind-secondary.1.8.1/opam | 32 + esy.lock/opam/seq.0.2.2/opam | 24 + esy.lock/opam/seq.base/files/META.seq | 4 - esy.lock/opam/seq.base/files/seq.install | 3 - esy.lock/opam/seq.base/opam | 15 - .../opam/{topkg.1.0.1 => topkg.1.0.3}/opam | 4 +- .../package.json | 6 + .../files/build.sh | 10 + .../package.json | 8 + .../package.json | 5 - .../files/clone-flexdll | 16 + .../files/configure-windows | 22 + .../files/esy-build | 24 + .../files/esy-configure | 29 + .../package.json | 28 + .../files/findlib-1.8.1.patch | 471 +++++++++++++++ .../files/gen-findlib-conf.sh | 14 + .../files/gen-meta.sh | 7 + .../package.json | 47 ++ lib/ExtractionIterator.re | 23 +- lib/Option.re | 13 + package.json | 2 +- 40 files changed, 1385 insertions(+), 333 deletions(-) rename esy.lock/opam/{cppo.1.6.6 => cppo.1.6.7}/opam (64%) create mode 100644 esy.lock/opam/csexp.1.3.2/opam create mode 100644 esy.lock/opam/dot-merlin-reader.3.4.2/opam rename esy.lock/opam/{dune.2.5.1 => dune.2.7.1}/opam (73%) rename esy.lock/opam/{fix.20200131 => fix.20201120}/opam (62%) rename esy.lock/opam/{menhir.20200211 => menhir.20201216}/opam (66%) rename esy.lock/opam/{menhirLib.20200211 => menhirLib.20201216}/opam (64%) rename esy.lock/opam/{menhirSdk.20200211 => menhirSdk.20201216}/opam (64%) rename esy.lock/opam/{merlin-extend.0.5 => merlin-extend.0.6}/opam (73%) rename esy.lock/opam/{merlin.3.3.4 => merlin.3.4.2}/opam (79%) delete mode 100644 esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam create mode 100644 esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch create mode 100644 esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch create mode 100644 esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch create mode 100644 esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam create mode 100644 esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in create mode 100644 esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in create mode 100644 esy.lock/opam/ocamlfind-secondary.1.8.1/opam create mode 100644 esy.lock/opam/seq.0.2.2/opam delete mode 100644 esy.lock/opam/seq.base/files/META.seq delete mode 100644 esy.lock/opam/seq.base/files/seq.install delete mode 100644 esy.lock/opam/seq.base/opam rename esy.lock/opam/{topkg.1.0.1 => topkg.1.0.3}/opam (97%) create mode 100644 esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json create mode 100644 esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh create mode 100644 esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json delete mode 100644 esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json create mode 100755 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll create mode 100755 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows create mode 100755 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build create mode 100755 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure create mode 100644 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json create mode 100644 esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch create mode 100644 esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh create mode 100644 esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-meta.sh create mode 100644 esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/package.json create mode 100644 lib/Option.re diff --git a/esy.lock/index.json b/esy.lock/index.json index 6d658fe..0c209c1 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,35 +1,51 @@ { - "checksum": "d3bbb474f89937e07709b4058df0f77f", + "checksum": "6394b56e11509c4d42263090a443bb05", "root": "bs-react-intl-extractor@link-dev:./package.json", "node": { - "refmterr@3.3.0@d41d8cd9": { - "id": "refmterr@3.3.0@d41d8cd9", + "refmterr@3.3.2@d41d8cd9": { + "id": "refmterr@3.3.2@d41d8cd9", "name": "refmterr", - "version": "3.3.0", + "version": "3.3.2", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.3.0.tgz#sha1:45adde80205093c201b491b3c37dd7740c9b036b" + "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.3.2.tgz#sha1:0536990e8a9f69684bdaa1e441904da6722fbb5a" ] }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", "@reason-native/console@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/atdgen@opam:2.2.1@d73fda11", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, - "ocaml@4.8.1000@d41d8cd9": { - "id": "ocaml@4.8.1000@d41d8cd9", + "ocaml@4.6.1003@d41d8cd9": { + "id": "ocaml@4.6.1003@d41d8cd9", "name": "ocaml", - "version": "4.8.1000", + "version": "4.6.1003", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.8.1000.tgz#sha1:abc435b5d4ddea2acba8b2df7efb81e2d1690db1" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.6.1003.tgz#sha1:6a391e80b4d1859bdb1943fd3ef6221c7f0a9a49" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9": { + "id": + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9", + "name": "esy-m4", + "version": + "github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7", + "source": { + "type": "install", + "source": [ + "github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7" ] }, "overrides": [], @@ -47,12 +63,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [ - "refmterr@3.3.0@d41d8cd9", "@reason-native/rely@3.2.1@d41d8cd9", - "@opam/merlin@opam:3.3.4@5fcabf21" + "refmterr@3.3.2@d41d8cd9", "@reason-native/rely@3.2.1@d41d8cd9", + "@opam/merlin@opam:3.4.2@9a4d1fd4" ] }, "@reason-native/rely@3.2.1@d41d8cd9": { @@ -67,11 +83,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", "@reason-native/file-context-printer@0.0.3@d41d8cd9", "@reason-native/cli@0.0.1-alpha@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.2@0b7bd730", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -87,8 +103,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -104,9 +120,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -122,8 +138,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -139,9 +155,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -163,14 +179,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.1@a0c1e658", "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.7@c28ac3ae", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.1@a0c1e658", "@opam/biniou@opam:1.2.1@d7570399" + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -191,14 +207,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.6.1003@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "@opam/topkg@opam:1.0.3@e4e10f1c", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + "ocaml@4.6.1003@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, "@opam/uchar@opam:0.0.2@c8218eea": { @@ -219,10 +235,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] }, "@opam/tyxml@opam:4.4.0@1dca5713": { "id": "@opam/tyxml@opam:4.4.0@1dca5713", @@ -242,60 +258,66 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/topkg@opam:1.0.1@a42c631e": { - "id": "@opam/topkg@opam:1.0.1@a42c631e", + "@opam/topkg@opam:1.0.3@e4e10f1c": { + "id": "@opam/topkg@opam:1.0.3@e4e10f1c", "name": "@opam/topkg", - "version": "opam:1.0.1", + "version": "opam:1.0.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/16/16b90e066d8972a5ef59655e7c28b3e9#md5:16b90e066d8972a5ef59655e7c28b3e9", - "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.1.tbz#md5:16b90e066d8972a5ef59655e7c28b3e9" + "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f", + "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f" ], "opam": { "name": "topkg", - "version": "1.0.1", - "path": "esy.lock/opam/topkg.1.0.1" + "version": "1.0.3", + "path": "esy.lock/opam/topkg.1.0.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, - "@opam/seq@opam:base@d8d7de1d": { - "id": "@opam/seq@opam:base@d8d7de1d", + "@opam/seq@opam:0.2.2@e9144e45": { + "id": "@opam/seq@opam:0.2.2@e9144e45", "name": "@opam/seq", - "version": "opam:base", + "version": "opam:0.2.2", "source": { "type": "install", - "source": [ "no-source:" ], + "source": [ + "archive:https://opam.ocaml.org/cache/md5/90/9033e02283aa3bde9f97f24e632902e3#md5:9033e02283aa3bde9f97f24e632902e3", + "archive:https://github.com/c-cube/seq/archive/0.2.2.tar.gz#md5:9033e02283aa3bde9f97f24e632902e3" + ], "opam": { "name": "seq", - "version": "base", - "path": "esy.lock/opam/seq.base" + "version": "0.2.2", + "path": "esy.lock/opam/seq.0.2.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] }, "@opam/result@opam:1.5@6b753c82": { "id": "@opam/result@opam:1.5@6b753c82", @@ -315,11 +337,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { @@ -340,12 +362,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/ptime@opam:0.8.5@0051d642": { @@ -366,14 +388,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82" + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -394,11 +416,44 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2": { + "id": "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "name": "@opam/ocamlfind-secondary", + "version": "opam:1.8.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/18/18ca650982c15536616dea0e422cbd8c#md5:18ca650982c15536616dea0e422cbd8c", + "archive:http://download2.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c", + "archive:http://download.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c" + ], + "opam": { + "name": "ocamlfind-secondary", + "version": "1.8.1", + "path": "esy.lock/opam/ocamlfind-secondary.1.8.1" + } + }, + "overrides": [ + { + "opamoverride": + "esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override" + } + ], + "dependencies": [ + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f" ] }, "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { @@ -425,10 +480,10 @@ } ], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", + "ocaml@4.6.1003@d41d8cd9", "@opam/conf-m4@opam:1@196bf219", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] }, "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -453,173 +508,168 @@ } ], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] }, - "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47": { - "id": "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "name": "@opam/ocaml-migrate-parsetree", - "version": "opam:1.7.3", + "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f": { + "id": "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", + "name": "@opam/ocaml-secondary-compiler", + "version": "opam:4.08.1-1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/6d/6d85717bcf476b87f290714872ed4fbde0233dc899c3158a27f439d70224fb55#sha256:6d85717bcf476b87f290714872ed4fbde0233dc899c3158a27f439d70224fb55", - "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.7.3/ocaml-migrate-parsetree-v1.7.3.tbz#sha256:6d85717bcf476b87f290714872ed4fbde0233dc899c3158a27f439d70224fb55" + "archive:https://opam.ocaml.org/cache/md5/72/723b6bfe8cf5abcbccc6911143f71055#md5:723b6bfe8cf5abcbccc6911143f71055", + "archive:https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz#md5:723b6bfe8cf5abcbccc6911143f71055" ], "opam": { - "name": "ocaml-migrate-parsetree", - "version": "1.7.3", - "path": "esy.lock/opam/ocaml-migrate-parsetree.1.7.3" + "name": "ocaml-secondary-compiler", + "version": "4.08.1-1", + "path": "esy.lock/opam/ocaml-secondary-compiler.4.08.1-1" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": + "esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override" + } + ], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.5.1@a0c1e658" - ] + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] }, - "@opam/merlin-extend@opam:0.5@a5dd7d4b": { - "id": "@opam/merlin-extend@opam:0.5@a5dd7d4b", + "@opam/merlin-extend@opam:0.6@404f814c": { + "id": "@opam/merlin-extend@opam:0.6@404f814c", "name": "@opam/merlin-extend", - "version": "opam:0.5", + "version": "opam:0.6", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/ca/ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227#sha256:ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227", - "archive:https://github.com/let-def/merlin-extend/releases/download/v0.5/merlin-extend-v0.5.tbz#sha256:ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227" + "archive:https://opam.ocaml.org/cache/sha256/c2/c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43", + "archive:https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" ], "opam": { "name": "merlin-extend", - "version": "0.5", - "path": "esy.lock/opam/merlin-extend.0.5" + "version": "0.6", + "path": "esy.lock/opam/merlin-extend.0.6" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", - "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/cppo@opam:1.6.7@c28ac3ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/merlin@opam:3.3.4@5fcabf21": { - "id": "@opam/merlin@opam:3.3.4@5fcabf21", + "@opam/merlin@opam:3.4.2@9a4d1fd4": { + "id": "@opam/merlin@opam:3.4.2@9a4d1fd4", "name": "@opam/merlin", - "version": "opam:3.3.4", + "version": "opam:3.4.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/ad/adcde0ebe3dce183bae0df1cc988e0aa5cd4e446b59bc081d5350f6b58cc9d8b#sha256:adcde0ebe3dce183bae0df1cc988e0aa5cd4e446b59bc081d5350f6b58cc9d8b", - "archive:https://github.com/ocaml/merlin/releases/download/v3.3.4/merlin-v3.3.4.tbz#sha256:adcde0ebe3dce183bae0df1cc988e0aa5cd4e446b59bc081d5350f6b58cc9d8b" + "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", + "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" ], "opam": { "name": "merlin", - "version": "3.3.4", - "path": "esy.lock/opam/merlin.3.3.4" + "version": "3.4.2", + "path": "esy.lock/opam/merlin.3.4.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/csexp@opam:1.3.2@5cea14af" ] }, - "@opam/menhirSdk@opam:20200211@b2a79ec0": { - "id": "@opam/menhirSdk@opam:20200211@b2a79ec0", + "@opam/menhirSdk@opam:20201216@5e08e674": { + "id": "@opam/menhirSdk@opam:20201216@5e08e674", "name": "@opam/menhirSdk", - "version": "opam:20200211", + "version": "opam:20201216", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/f2/f27f8f5dedd316eff4c02d9130fced49#md5:f27f8f5dedd316eff4c02d9130fced49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz#md5:f27f8f5dedd316eff4c02d9130fced49" ], "opam": { "name": "menhirSdk", - "version": "20200211", - "path": "esy.lock/opam/menhirSdk.20200211" + "version": "20201216", + "path": "esy.lock/opam/menhirSdk.20201216" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/menhirLib@opam:20200211@93d0f001": { - "id": "@opam/menhirLib@opam:20200211@93d0f001", + "@opam/menhirLib@opam:20201216@bb5a1851": { + "id": "@opam/menhirLib@opam:20201216@bb5a1851", "name": "@opam/menhirLib", - "version": "opam:20200211", + "version": "opam:20201216", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/f2/f27f8f5dedd316eff4c02d9130fced49#md5:f27f8f5dedd316eff4c02d9130fced49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz#md5:f27f8f5dedd316eff4c02d9130fced49" ], "opam": { "name": "menhirLib", - "version": "20200211", - "path": "esy.lock/opam/menhirLib.20200211" + "version": "20201216", + "path": "esy.lock/opam/menhirLib.20201216" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/menhir@opam:20200211@26571604": { - "id": "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20201216@1a09d886": { + "id": "@opam/menhir@opam:20201216@1a09d886", "name": "@opam/menhir", - "version": "opam:20200211", + "version": "opam:20201216", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/f2/f27f8f5dedd316eff4c02d9130fced49#md5:f27f8f5dedd316eff4c02d9130fced49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz#md5:f27f8f5dedd316eff4c02d9130fced49" ], "opam": { "name": "menhir", - "version": "20200211", - "path": "esy.lock/opam/menhir.20200211" + "version": "20201216", + "path": "esy.lock/opam/menhir.20201216" } }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.1@a0c1e658", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/menhirSdk@opam:20201216@5e08e674", + "@opam/menhirLib@opam:20201216@bb5a1851", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/menhirSdk@opam:20201216@5e08e674", + "@opam/menhirLib@opam:20201216@bb5a1851", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/junit@opam:2.0.2@0b7bd730": { @@ -641,36 +691,36 @@ "overrides": [], "dependencies": [ "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:2.5.1@a0c1e658" + "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/fix@opam:20200131@0ecd2f01": { - "id": "@opam/fix@opam:20200131@0ecd2f01", + "@opam/fix@opam:20201120@5c318621": { + "id": "@opam/fix@opam:20201120@5c318621", "name": "@opam/fix", - "version": "opam:20200131", + "version": "opam:20201120", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/99/991ff031666c662eaab638d2e0f4ac1d#md5:991ff031666c662eaab638d2e0f4ac1d", - "archive:https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz#md5:991ff031666c662eaab638d2e0f4ac1d" + "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3", + "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3" ], "opam": { "name": "fix", - "version": "20200131", - "path": "esy.lock/opam/fix.20200131" + "version": "20201120", + "path": "esy.lock/opam/fix.20201120" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -691,69 +741,135 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/dune@opam:2.5.1@a0c1e658": { - "id": "@opam/dune@opam:2.5.1@a0c1e658", + "@opam/dune@opam:2.7.1@f5f493bc": { + "id": "@opam/dune@opam:2.7.1@f5f493bc", "name": "@opam/dune", - "version": "opam:2.5.1", + "version": "opam:2.7.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/8f/8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b", - "archive:https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" + "archive:https://opam.ocaml.org/cache/sha256/c3/c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d", + "archive:https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" ], "opam": { "name": "dune", - "version": "2.5.1", - "path": "esy.lock/opam/dune.2.5.1" + "version": "2.7.1", + "path": "esy.lock/opam/dune.2.7.1" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": + "esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override" + } + ], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.6.1003@d41d8cd9", + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.6.1003@d41d8cd9", + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, - "@opam/cppo@opam:1.6.6@f4f83858": { - "id": "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0": { + "id": "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "name": "@opam/dot-merlin-reader", + "version": "opam:3.4.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", + "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + ], + "opam": { + "name": "dot-merlin-reader", + "version": "3.4.2", + "path": "esy.lock/opam/dot-merlin-reader.3.4.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af" + ] + }, + "@opam/csexp@opam:1.3.2@5cea14af": { + "id": "@opam/csexp@opam:1.3.2@5cea14af", + "name": "@opam/csexp", + "version": "opam:1.3.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + ], + "opam": { + "name": "csexp", + "version": "1.3.2", + "path": "esy.lock/opam/csexp.1.3.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/cppo@opam:1.6.7@c28ac3ae": { + "id": "@opam/cppo@opam:1.6.7@c28ac3ae", "name": "@opam/cppo", - "version": "opam:1.6.6", + "version": "opam:1.6.7", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e7/e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0#sha256:e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0", - "archive:https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz#sha256:e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0" + "archive:https://opam.ocaml.org/cache/sha256/db/db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d#sha256:db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d", + "archive:https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz#sha256:db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d" ], "opam": { "name": "cppo", - "version": "1.6.6", - "path": "esy.lock/opam/cppo.1.6.6" + "version": "1.6.7", + "path": "esy.lock/opam/cppo.1.6.7" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/conf-m4@opam:1@3b2b148a": { - "id": "@opam/conf-m4@opam:1@3b2b148a", + "@opam/conf-m4@opam:1@196bf219": { + "id": "@opam/conf-m4@opam:1@196bf219", "name": "@opam/conf-m4", "version": "opam:1", "source": { @@ -765,8 +881,16 @@ "path": "esy.lock/opam/conf-m4.1" } }, - "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "overrides": [ + { + "opamoverride": + "esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override" + } + ], + "dependencies": [ + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], "devDependencies": [] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -787,12 +911,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.1@a0c1e658" + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -847,14 +971,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399" ] }, @@ -876,14 +1000,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.5.1@a0c1e658", "@opam/biniou@opam:1.2.1@d7570399", + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "@opam/atd@opam:2.2.1@071ab6bd", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.5.1@a0c1e658", "@opam/biniou@opam:1.2.1@d7570399", + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "@opam/atd@opam:2.2.1@071ab6bd" ] @@ -906,16 +1030,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "ocaml@4.6.1003@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/menhir@opam:20201216@1a09d886", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "ocaml@4.6.1003@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/menhir@opam:20201216@1a09d886", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.1@a0c1e658" + "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { @@ -932,24 +1056,24 @@ "dependencies": [], "devDependencies": [] }, - "@esy-ocaml/reason@3.6.0@d41d8cd9": { - "id": "@esy-ocaml/reason@3.6.0@d41d8cd9", + "@esy-ocaml/reason@3.6.2@d41d8cd9": { + "id": "@esy-ocaml/reason@3.6.2@d41d8cd9", "name": "@esy-ocaml/reason", - "version": "3.6.0", + "version": "3.6.2", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#sha1:ae98f3335e9e03ff0e01376830a14cd1246b5278" + "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#sha1:49bd53c75dd241eb14f46277a85af353908f7e81" ] }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20200211@26571604", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.1@a0c1e658" + "@opam/merlin-extend@opam:0.6@404f814c", + "@opam/menhir@opam:20201216@1a09d886", + "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.7.1@f5f493bc" ], "devDependencies": [] } diff --git a/esy.lock/opam/cppo.1.6.6/opam b/esy.lock/opam/cppo.1.6.7/opam similarity index 64% rename from esy.lock/opam/cppo.1.6.6/opam rename to esy.lock/opam/cppo.1.6.7/opam index f683f8b..eddcc1e 100644 --- a/esy.lock/opam/cppo.1.6.6/opam +++ b/esy.lock/opam/cppo.1.6.7/opam @@ -2,11 +2,11 @@ opam-version: "2.0" maintainer: "martin@mjambon.com" authors: "Martin Jambon" license: "BSD-3-Clause" -homepage: "http://mjambon.com/cppo.html" +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.03"} + "ocaml" {>= "4.02.3"} "dune" {>= "1.0"} "base-unix" ] @@ -28,10 +28,12 @@ Cppo is: * reasonably fast * simple to install and to maintain """ +x-commit-hash: "7d217864a5fdc4551699e248137a2f8b719d2078" url { - src: "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz" + src: + "https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz" checksum: [ - "sha256=e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0" - "sha512=44ecf9d225d9e45490a2feac0bde04865ca398dba6c3579e3370fcd1ea255707b8883590852af8b2df87123801062b9f3acce2455c092deabf431f9c4fb8d8eb" + "sha256=db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d" + "sha512=9722b50fd23aaccf86816313333a3bf8fc7c6b4ef06b153e5e1e1aaf14670cf51a4aac52fb1b4a0e5531699c4047a1eff6c24c969f7e5063e78096c2195b5819" ] } diff --git a/esy.lock/opam/csexp.1.3.2/opam b/esy.lock/opam/csexp.1.3.2/opam new file mode 100644 index 0000000..1508d17 --- /dev/null +++ b/esy.lock/opam/csexp.1.3.2/opam @@ -0,0 +1,58 @@ +opam-version: "2.0" +synopsis: "Parsing and printing of S-expressions in Canonical form" +description: """ + +This library provides minimal support for Canonical S-expressions +[1]. Canonical S-expressions are a binary encoding of S-expressions +that is super simple and well suited for communication between +programs. + +This library only provides a few helpers for simple applications. If +you need more advanced support, such as parsing from more fancy input +sources, you should consider copying the code of this library given +how simple parsing S-expressions in canonical form is. + +To avoid a dependency on a particular S-expression library, the only +module of this library is parameterised by the type of S-expressions. + +[1] https://en.wikipedia.org/wiki/Canonical_S-expressions +""" +maintainer: ["Jeremie Dimino "] +authors: [ + "Quentin Hocquet " + "Jane Street Group, LLC " + "Jeremie Dimino " +] +license: "MIT" +homepage: "https://github.com/ocaml-dune/csexp" +doc: "https://ocaml-dune.github.io/csexp/" +bug-reports: "https://github.com/ocaml-dune/csexp/issues" +depends: [ + "dune" {>= "1.11"} + "ocaml" {>= "4.02.3"} + "result" {>= "1.5"} +] +dev-repo: "git+https://github.com/ocaml-dune/csexp.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" +# "@runtest" {with-test & ocaml:version >= "4.04"} + "@doc" {with-doc} + ] +] +x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b" +url { + src: + "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz" + checksum: [ + "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026" + ] +} diff --git a/esy.lock/opam/dot-merlin-reader.3.4.2/opam b/esy.lock/opam/dot-merlin-reader.3.4.2/opam new file mode 100644 index 0000000..e740ed7 --- /dev/null +++ b/esy.lock/opam/dot-merlin-reader.3.4.2/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +synopsis: "Reads config files for merlin" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.1" & < "4.12"} + "dune" {>= "1.8.0"} + "yojson" {>= "1.6.0"} + "ocamlfind" {>= "1.6.0"} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} +] +x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" +url { + src: + "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" + checksum: [ + "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" + ] +} diff --git a/esy.lock/opam/dune.2.5.1/opam b/esy.lock/opam/dune.2.7.1/opam similarity index 73% rename from esy.lock/opam/dune.2.5.1/opam rename to esy.lock/opam/dune.2.7.1/opam index dae256a..aaa13e6 100644 --- a/esy.lock/opam/dune.2.5.1/opam +++ b/esy.lock/opam/dune.2.7.1/opam @@ -29,6 +29,7 @@ conflicts: [ "dune-configurator" {< "2.3.0"} "odoc" {< "1.3.0"} "dune-release" {< "1.3.0"} + "js_of_ocaml-compiler" {< "3.6.0"} "jbuilder" {= "transition"} ] dev-repo: "git+https://github.com/ocaml/dune.git" @@ -39,16 +40,17 @@ build: [ ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] ] depends: [ - # Please keep the lower bound in sync with .travis.yml, dune-project - # and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + # Please keep the lower bound in sync with .github/workflows/workflow.yml, + # dune-project and min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] +x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c" url { - src: "https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz" checksum: [ - "sha256=8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" - "sha512=f209f12ced10c1abf8782bdb0143f4cec77795f7174d2cc75130afb1e01550b01f2f77b9e3ec4888efdad83d2f9878d179b39126f824f4e522f3ef4da34bf27e" + "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" + "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b" ] } diff --git a/esy.lock/opam/fix.20200131/opam b/esy.lock/opam/fix.20201120/opam similarity index 62% rename from esy.lock/opam/fix.20200131/opam rename to esy.lock/opam/fix.20201120/opam index 4babcba..31c8a64 100644 --- a/esy.lock/opam/fix.20200131/opam +++ b/esy.lock/opam/fix.20201120/opam @@ -11,14 +11,14 @@ build: [ ] depends: [ "ocaml" { >= "4.03" } - "dune" { >= "1.3" } + "dune" {>= "1.3" } ] synopsis: "Facilities for memoization and fixed points" url { src: - "https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz" checksum: [ - "md5=991ff031666c662eaab638d2e0f4ac1d" - "sha512=01c45a1d90b02ec0939e968b185a6a373ac6117e2287b9a26d3db9d71e9569d086cea50da60710fcab5c2ed9d3b4c72b76839c0651e436f1fb39c77dc7c04b5e" + "md5=7eb570b759635fe66f3556d2b1cc88e3" + "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4" ] } diff --git a/esy.lock/opam/menhir.20200211/opam b/esy.lock/opam/menhir.20201216/opam similarity index 66% rename from esy.lock/opam/menhir.20200211/opam rename to esy.lock/opam/menhir.20201216/opam index f1f18fc..c5067e7 100644 --- a/esy.lock/opam/menhir.20200211/opam +++ b/esy.lock/opam/menhir.20201216/opam @@ -12,16 +12,16 @@ build: [ ] depends: [ "ocaml" {>= "4.02.3"} - "dune" {>= "2.2.0"} + "dune" { >= "2.2.0"} "menhirLib" {= version} "menhirSdk" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=f27f8f5dedd316eff4c02d9130fced49" + "sha512=50f86fb2f55184f43c4be9c572ada4feb2208eb350ef64b2651351934a1b48a0b7e98c8c752c3c22e95676c5a0f38b0e638b3f845e53ecff1740dad95b50918c" ] } diff --git a/esy.lock/opam/menhirLib.20200211/opam b/esy.lock/opam/menhirLib.20201216/opam similarity index 64% rename from esy.lock/opam/menhirLib.20200211/opam rename to esy.lock/opam/menhirLib.20201216/opam index a65ef44..45d6ba8 100644 --- a/esy.lock/opam/menhirLib.20200211/opam +++ b/esy.lock/opam/menhirLib.20201216/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=f27f8f5dedd316eff4c02d9130fced49" + "sha512=50f86fb2f55184f43c4be9c572ada4feb2208eb350ef64b2651351934a1b48a0b7e98c8c752c3c22e95676c5a0f38b0e638b3f845e53ecff1740dad95b50918c" ] } diff --git a/esy.lock/opam/menhirSdk.20200211/opam b/esy.lock/opam/menhirSdk.20201216/opam similarity index 64% rename from esy.lock/opam/menhirSdk.20200211/opam rename to esy.lock/opam/menhirSdk.20201216/opam index d82cffe..be1a277 100644 --- a/esy.lock/opam/menhirSdk.20200211/opam +++ b/esy.lock/opam/menhirSdk.20201216/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=f27f8f5dedd316eff4c02d9130fced49" + "sha512=50f86fb2f55184f43c4be9c572ada4feb2208eb350ef64b2651351934a1b48a0b7e98c8c752c3c22e95676c5a0f38b0e638b3f845e53ecff1740dad95b50918c" ] } diff --git a/esy.lock/opam/merlin-extend.0.5/opam b/esy.lock/opam/merlin-extend.0.6/opam similarity index 73% rename from esy.lock/opam/merlin-extend.0.5/opam rename to esy.lock/opam/merlin-extend.0.6/opam index a3ae0d3..39b3375 100644 --- a/esy.lock/opam/merlin-extend.0.5/opam +++ b/esy.lock/opam/merlin-extend.0.6/opam @@ -19,11 +19,12 @@ description: """ This protocol allows to replace the OCaml frontend of Merlin. It extends what used to be done with the `-pp' flag to handle a few more cases.""" doc: "https://let-def.github.io/merlin-extend" +x-commit-hash: "640620568a5f5c7798239ecf7c707c813e3df3cf" url { src: - "https://github.com/let-def/merlin-extend/releases/download/v0.5/merlin-extend-v0.5.tbz" + "https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz" checksum: [ - "sha256=ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227" - "sha512=55c5a3637337abb8ca8db679128a81ca8ccce567bc214d55b2e6444dc0e905b74c64d629bdea2457d0fe4be5306414feefcdbc4d4761fdafd59aa107550936b6" + "sha256=c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" + "sha512=4c64a490e2ece04fc89aef679c1d9202175df4fe045b5fdc7a37cd7cebe861226fddd9648c1bf4f06175ecfcd2ed7686c96bd6a8cae003a5096f6134c240f857" ] } diff --git a/esy.lock/opam/merlin.3.3.4/opam b/esy.lock/opam/merlin.3.4.2/opam similarity index 79% rename from esy.lock/opam/merlin.3.3.4/opam rename to esy.lock/opam/merlin.3.4.2/opam index 025b8fd..3e22916 100644 --- a/esy.lock/opam/merlin.3.3.4/opam +++ b/esy.lock/opam/merlin.3.4.2/opam @@ -7,15 +7,17 @@ dev-repo: "git+https://github.com/ocaml/merlin.git" build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test & os != "macos" & ocaml:version >= "4.03"} + ["dune" "runtest" "-p" name "-j" "1"] {with-test & ocaml:version >= "4.03"} ] depends: [ - "ocaml" {>= "4.02.3"} + "ocaml" {>= "4.02.3" & < "4.12"} "dune" {>= "1.8.0"} - "ocamlfind" {>= "1.5.2"} + "dot-merlin-reader" {= version} "yojson" {>= "1.6.0"} "mdx" {with-test & >= "1.3.0"} "conf-jq" {with-test} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} ] synopsis: "Editor helper, provides completion, typing and source browsing in Vim and Emacs" @@ -61,11 +63,12 @@ See https://github.com/OCamlPro/opam-user-setup " {success & !user-setup:installed} ] +x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" url { src: - "https://github.com/ocaml/merlin/releases/download/v3.3.4/merlin-v3.3.4.tbz" + "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" checksum: [ - "sha256=adcde0ebe3dce183bae0df1cc988e0aa5cd4e446b59bc081d5350f6b58cc9d8b" - "sha512=5f4fb73b852f431e1fee7def63a1150de1b9ae931a74078c870ab7c420607ae0654195baf9e09bee5304aeefa92108e42fe963684e8e8511006a562ba15c4a83" + "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" ] } diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam b/esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam deleted file mode 100644 index 09ef0da..0000000 --- a/esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam +++ /dev/null @@ -1,37 +0,0 @@ -opam-version: "2.0" -maintainer: "frederic.bour@lakaban.net" -authors: [ - "Frédéric Bour " - "Jérémie Dimino " -] -license: "LGPL-2.1 with OCaml linking exception" -homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree" -bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues" -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git" -doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/" -tags: [ "syntax" "org:ocamllabs" ] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "result" - "ppx_derivers" - "dune" {>= "1.9.0"} - "ocaml" {>= "4.02.3" & < "4.12"} -] -synopsis: "Convert OCaml parsetrees between different versions" -description: """ -Convert OCaml parsetrees between different versions - -This library converts parsetrees, outcometree and ast mappers between -different OCaml versions. High-level functions help making PPX -rewriters independent of a compiler version. -""" -url { - src: - "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.7.3/ocaml-migrate-parsetree-v1.7.3.tbz" - checksum: [ - "sha256=6d85717bcf476b87f290714872ed4fbde0233dc899c3158a27f439d70224fb55" - "sha512=fe9c74a244d160d973d8ca62e356edad4c872fc46471ddc668f854456d3979576895d446d49da2aee61c65b441b72c573225b0b254ab2eac4a0fb4debdbce9d4" - ] -} diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch new file mode 100644 index 0000000..cda19dd --- /dev/null +++ b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch @@ -0,0 +1,24 @@ +From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 +From: David Allsopp +Date: Fri, 26 Jul 2019 12:12:19 +0100 +Subject: [PATCH] Don't build manpages for stdlib docs +--- + ocamldoc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile +index b109815071..e31e441f61 100644 +--- a/ocamldoc/Makefile ++++ b/ocamldoc/Makefile +@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) + + + .PHONY: all +-all: lib exe generators manpages ++all: lib exe generators + + manpages: generators + +-- +2.20.1 + diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch new file mode 100644 index 0000000..41f5f77 --- /dev/null +++ b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch @@ -0,0 +1,26 @@ +From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 +From: David Allsopp +Date: Tue, 6 Aug 2019 09:23:06 +0100 +Subject: [PATCH] Fix failure to install tools links + +In --disable-installing-bytecode-programs mode, the .opt version of the +tools is installed, but the symlink for the tool itself is not created. +--- + tools/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/Makefile b/tools/Makefile +index 530dd37f34..1b3014a3ab 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -197,6 +197,7 @@ else + do \ + if test -f "$$i".opt; then \ + $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ ++ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ + fi; \ + done + endif +-- +2.20.1 + diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch new file mode 100644 index 0000000..e37b5e8 --- /dev/null +++ b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch @@ -0,0 +1,34 @@ +commit 3f10a16153308f967149917585d2bc0b9c06492c +Author: Anil Madhavapeddy +Date: Sun Jun 21 18:40:27 2020 +0100 + + Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build + + Signed-off-by: Anil Madhavapeddy + +diff --git a/configure b/configure +index 9a78a4554..0c54b560b 100755 +--- a/configure ++++ b/configure +@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; + -fno-builtin-memcmp"; + internal_cflags="$gcc_warnings" ;; #( + gcc-*) : +- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; ++ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; + internal_cflags="$gcc_warnings" ;; #( + msvc-*) : + common_cflags="-nologo -O2 -Gy- -MD" +diff --git a/configure.ac b/configure.ac +index f5d8a2687..775e0e2db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -540,7 +540,7 @@ AS_CASE([$host], + -fno-builtin-memcmp"; + internal_cflags="$gcc_warnings"], + [gcc-*], +- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; ++ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; + internal_cflags="$gcc_warnings"], + [msvc-*], + [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam new file mode 100644 index 0000000..905f9b3 --- /dev/null +++ b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam @@ -0,0 +1,51 @@ +opam-version: "2.0" +synopsis: "OCaml 4.08.1 Secondary Switch Compiler" +maintainer: "platform@lists.ocaml.org" +authors: "Xavier Leroy and many contributors" +homepage: "https://ocaml.org" +bug-reports: "https://github.com/ocaml/ocaml/issues" +dev-repo: "git://github.com/ocaml/ocaml" +depends: "ocaml" {< "4.08.0" | >= "4.09~"} +build: [ + [ + "./configure" + "--prefix=%{_:share}%" + "--libdir=%{_:share}%/lib" + "--disable-debugger" + "--disable-installing-bytecode-programs" + "--disable-debug-runtime" + "--disable-instrumented-runtime" + "--disable-graph-lib" + "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} + "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} + ] + [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] +] +install: [make "install"] +url { + src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" + checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" +} +extra-files: [ + ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] + ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] + ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] +] +patches: [ + "0001-Don-t-build-manpages-for-stdlib-docs.patch" + "0001-Fix-failure-to-install-tools-links.patch" + "fix-gcc10.patch" +] + +post-messages: [ + "A failure in the middle of the build may be caused by build parallelism + (enabled by default). + Please file a bug report at https://github.com/ocaml/ocaml/issues" + {failure & jobs > 1 & os != "cygwin"} + "You can try installing again including --jobs=1 + to force a sequential build instead." + {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} +] +description: "Installs an additional compiler to the opam switch in +%{_:share}%/ocaml-secondary-compiler which can be accessed using +`ocamlfind -toolchain secondary`." diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in new file mode 100644 index 0000000..12e3ee6 --- /dev/null +++ b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in @@ -0,0 +1,3 @@ +description = "OCaml Secondary Compiler" +version = "%{ocaml-secondary-compiler:version}%" +directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in new file mode 100644 index 0000000..d13023c --- /dev/null +++ b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in @@ -0,0 +1,10 @@ +path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" +ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" +ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" +ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" +ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" +ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" +ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/esy.lock/opam/ocamlfind-secondary.1.8.1/opam new file mode 100644 index 0000000..acdb576 --- /dev/null +++ b/esy.lock/opam/ocamlfind-secondary.1.8.1/opam @@ -0,0 +1,32 @@ +opam-version: "2.0" +maintainer: "David Allsopp " +homepage: "https://github.com/ocaml/opam-repository" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] +install: [ + [make "install-meta"] + ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] + ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] + ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] + ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] +] +depends: [ + "ocaml-secondary-compiler" + "ocamlfind" {= "1.8.1"} +] +synopsis: "ocamlfind support for ocaml-secondary-compiler" +description: """ +Exposes the compiler built by the ocaml-secondary-compielr package via +-toolchain secondary. A virtual package called ocaml is also installed to +locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" +authors: ["Gerd Stolpmann " "David Allsopp "] +substs: ["META" "ocaml-secondary-compiler.conf"] +extra-files: [ + ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] + ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] +] +url { + src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" + checksum: "md5=18ca650982c15536616dea0e422cbd8c" + mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" +} diff --git a/esy.lock/opam/seq.0.2.2/opam b/esy.lock/opam/seq.0.2.2/opam new file mode 100644 index 0000000..5ed5165 --- /dev/null +++ b/esy.lock/opam/seq.0.2.2/opam @@ -0,0 +1,24 @@ +opam-version: "2.0" +synopsis: + "Compatibility package for OCaml's standard iterator type starting from 4.07" +maintainer: "simon.cruanes.2007@m4x.org" +license: "LGPL2.1" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "dune" {>= "1.1.0"} + "ocaml" +] +tags: [ "iterator" "seq" "pure" "list" "compatibility" "cascade" ] +homepage: "https://github.com/c-cube/seq/" +bug-reports: "https://github.com/c-cube/seq/issues" +dev-repo: "git+https://github.com/c-cube/seq.git" +authors: "Simon Cruanes" +url { + src: "https://github.com/c-cube/seq/archive/0.2.2.tar.gz" + checksum: [ + "md5=9033e02283aa3bde9f97f24e632902e3" + "sha512=cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c" + ] +} 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 06b95ef..0000000 --- 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 c4d7020..0000000 --- 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 deleted file mode 100644 index b33d8c7..0000000 --- a/esy.lock/opam/seq.base/opam +++ /dev/null @@ -1,15 +0,0 @@ -opam-version: "2.0" -maintainer: " " -authors: " " -homepage: " " -depends: [ - "ocaml" {>= "4.07.0"} -] -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"] -] diff --git a/esy.lock/opam/topkg.1.0.1/opam b/esy.lock/opam/topkg.1.0.3/opam similarity index 97% rename from esy.lock/opam/topkg.1.0.1/opam rename to esy.lock/opam/topkg.1.0.3/opam index 77ae1f4..6e073a1 100644 --- a/esy.lock/opam/topkg.1.0.1/opam +++ b/esy.lock/opam/topkg.1.0.3/opam @@ -43,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on [webbrowser]: http://erratique.ch/software/webbrowser """ url { -archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.1.tbz" -checksum: "16b90e066d8972a5ef59655e7c28b3e9" +archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz" +checksum: "e285f7a296d77ee7d831ba9a6bfb396f" } diff --git a/esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json b/esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json new file mode 100644 index 0000000..ca6a373 --- /dev/null +++ b/esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json @@ -0,0 +1,6 @@ +{ + "build": "true", + "dependencies": { + "esy-m4": "esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7" + } +} diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh new file mode 100644 index 0000000..b2a94f7 --- /dev/null +++ b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +SECONDARY_CONF="$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf" + +if test -f $SECONDARY_CONF; then + export OCAMLFIND_CONF=$SECONDARY_CONF; +fi + +env -u OCAMLLIB ocaml bootstrap.ml +./dune.exe build -p dune --profile dune-bootstrap diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json new file mode 100644 index 0000000..c7d77ab --- /dev/null +++ b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json @@ -0,0 +1,8 @@ +{ + "buildsInSource": true, + "build": "bash build.sh", + "install": "esy-installer dune.install", + "buildEnv": { + "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" + } +} diff --git a/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json deleted file mode 100644 index 6882a38..0000000 --- a/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@opam/fix": "*" - } -} diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll new file mode 100755 index 0000000..26301dd --- /dev/null +++ b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll @@ -0,0 +1,16 @@ +#! /bin/sh + +# clone-flexdll +# +# Brings in flexdll, if necessary + +if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then + echo "[Flexdll] Already present, no need to clone." +else + echo "[Flexdll] Cloning..." + git clone https://github.com/esy-ocaml/flexdll.git + cd flexdll + git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff + cd .. + echo "[Flexdll] Clone successful!" +fi \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows new file mode 100755 index 0000000..4040b49 --- /dev/null +++ b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows @@ -0,0 +1,22 @@ +#! /bin/sh + +# configure-windows +# +# Creates a native Windows MingW build, based on: +# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc + + +export prefix=C:/ocamlmgw64 +while : ; do + case "$1" in + "") break;; + -prefix|--prefix) + prefix=$2; shift;; + esac + shift +done + +echo "[configure-windows] Setting up flexdll" +./clone-flexdll +./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix +make flexdll diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build new file mode 100755 index 0000000..b95356a --- /dev/null +++ b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build @@ -0,0 +1,24 @@ +#! /usr/bin/env bash + +# esy-build +# +# Wrapper to execute appropriate build strategy, based on platform + +set -u +set -e +set -o pipefail + +case "$(uname -s)" in + CYGWIN*|MINGW32*|MSYS*) + echo "[esy-build] Detected windows environment..." + make -j4 world.opt + make flexlink.opt + ;; + *) + echo "[esy-build] Detected OSX / Linux environment" + make -j4 world.opt + ;; +esac + +# Common build steps +make install \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure new file mode 100755 index 0000000..fd196c5 --- /dev/null +++ b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure @@ -0,0 +1,29 @@ +#! /usr/bin/env bash + +# esy-configure +# +# Wrapper to delegate to configuration to the +# appropriate `configure` strategy based on the active platform. +# +# Today, OCaml has separate build strategies: +# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc +# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc +# +# We want `esy` to work cross-platform, so this is a shim script that will delegate to the +# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` +# that the `mingw` (native executable) strategy is desired. + +set -u +set -e +set -o pipefail + +case "$(uname -s)" in + CYGWIN*|MINGW32*|MSYS*) + echo "[esy-configure] Detected windows environment..." + ./configure-windows "$@" + ;; + *) + echo "[esy-configure] Detected OSX / Linux environment" + ./configure "$@" + ;; +esac \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json new file mode 100644 index 0000000..948455c --- /dev/null +++ b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json @@ -0,0 +1,28 @@ +{ + "buildEnv": { + "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" + }, + "build": [ + [ + "env", + "-u", + "OCAMLLIB", + "bash", "./esy-configure", + "--disable-cfi", + "--prefix", "$cur__install/share/ocaml-secondary-compiler", + "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", + "--disable-debugger", + "--disable-installing-bytecode-programs", + "--disable-debug-runtime", + "--disable-instrumented-runtime", + "--disable-graph-lib" + ], + [ + "env", + "-u", + "OCAMLLIB", + "bash", "./esy-build" + ] + ], + "buildsInSource": true +} diff --git a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch new file mode 100644 index 0000000..3e3ee5a --- /dev/null +++ b/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.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_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh new file mode 100644 index 0000000..c923ef4 --- /dev/null +++ b/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh @@ -0,0 +1,14 @@ +OCAML_SECONDARY_COMPILER=$1 + +cat >ocaml-secondary-compiler.conf <META < items |> List.exists(item => switch (item) { - | {pstr_desc: Pstr_attribute({attr_name: {txt: "intl.messages"}})} => true + | {pstr_desc: Pstr_attribute(({txt: "intl.messages"}, _))} => true | _ => false } ); @@ -76,16 +76,15 @@ let extractMessagesFromValueBindings = (callback, valueBindings: list(value_bind pvb_expr: { pexp_desc: Pexp_record(fields, None), pexp_attributes: [ - { - attr_name: {txt: "intl.description"}, - attr_payload: - PStr([ - { - pstr_desc: Pstr_eval({pexp_desc: Pexp_constant(Pconst_string(description, _))}, _), - pstr_loc: _, - }, - ]), - }, + ( + {txt: "intl.description"}, + PStr([ + { + pstr_desc: Pstr_eval({pexp_desc: Pexp_constant(Pconst_string(description, _))}, _), + pstr_loc: _, + }, + ]), + ), ], }, } => @@ -167,7 +166,7 @@ let getIterator = callback => { {txt: "bs.obj"}, PStr([{pstr_desc: Pstr_eval({pexp_desc: Pexp_record(fields, _)}, _), pstr_loc: _}]), )), - pexp_attributes: [{attr_name: {txt: "intl.messages"}}], + pexp_attributes: [({txt: "intl.messages"}, _)], } => extractMessagesFromRecords(callback, fields) diff --git a/lib/Option.re b/lib/Option.re new file mode 100644 index 0000000..8cabd87 --- /dev/null +++ b/lib/Option.re @@ -0,0 +1,13 @@ +type t('a) = option('a); + +let iter = (f, o) => + switch (o) { + | None => () + | Some(v) => f(v) + }; + +let is_none = o => + switch (o) { + | Some(_) => false + | None => true + }; diff --git a/package.json b/package.json index 6bb89ff..12a7e35 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@esy-ocaml/reason": "^3.6.0", "@opam/dune": "^2.5.1", "@opam/yojson": "^1.7.0", - "ocaml": "~4.08.1" + "ocaml": "~4.06.1" }, "devDependencies": { "@opam/merlin": "*", From 3e9ec29bc253b1b3079fda9d90c5e06d70e38eef Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 9 Jan 2021 08:16:39 +0100 Subject: [PATCH 3/4] Add ReScript support --- .github/workflows/ci.yml | 6 +- .gitmodules | 3 + lib/Extractor.re | 19 ++++- lib/dune | 2 +- rescript_parser/dune | 8 +++ rescript_parser/syntax | 1 + .../ReScript.18d405ea.0.snapshot | 31 +++++++++ test/lib/Tests.re | 7 ++ testData/test4/Test_4_1.res | 69 +++++++++++++++++++ testData/test4/Test_4_3.res | 5 ++ testData/test4/subdir/Test_4_2.res | 30 ++++++++ 11 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 100644 rescript_parser/dune create mode 160000 rescript_parser/syntax create mode 100644 test/__snapshots__/ReScript.18d405ea.0.snapshot create mode 100644 testData/test4/Test_4_1.res create mode 100644 testData/test4/Test_4_3.res create mode 100644 testData/test4/subdir/Test_4_2.res diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28214c8..770010d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,13 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} - - name: Checkout + + - name: Checkout repository uses: actions/checkout@v2 + - name: Checkout submodules + run: git submodule update --init --recursive + - name: Install esy run: npm i -g esy@0.6.7 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..619c7c8 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "rescript_parser/syntax"] + path = rescript_parser/syntax + url = https://github.com/rescript-lang/syntax.git diff --git a/lib/Extractor.re b/lib/Extractor.re index 654260b..0d72d6a 100644 --- a/lib/Extractor.re +++ b/lib/Extractor.re @@ -33,6 +33,17 @@ let extract = (~duplicatesAllowed=false, paths) => { extractMessages(ast); }; + let processReScriptFile = path => { + let channel = open_in_bin(path); + let src = really_input_string(channel, in_channel_length(channel)); + close_in(channel); + + let parser = Res_parser.(make(~mode=Default, src, path)); + let ast = Res_core.parseImplementation(parser); + + extractMessages(ast); + }; + let rec processPath = path => { if (!Sys.file_exists(path)) { raise(PathNotFound(path)); @@ -40,8 +51,12 @@ let extract = (~duplicatesAllowed=false, paths) => { if (Sys.is_directory(path)) { Sys.readdir(path) |> Array.iter(filename => processPath(Filename.concat(path, filename))); - } else if (Filename.extension(path) == ".re") { - processReasonFile(path); + } else { + switch (Filename.extension(path)) { + | ".re" => processReasonFile(path) + | ".res" => processReScriptFile(path) + | _ => () + }; }; }; diff --git a/lib/dune b/lib/dune index f8afb34..fede423 100644 --- a/lib/dune +++ b/lib/dune @@ -1,4 +1,4 @@ (library (name lib) - (libraries reason yojson unix) + (libraries reason yojson unix rescript_parser) ) diff --git a/rescript_parser/dune b/rescript_parser/dune new file mode 100644 index 0000000..09cd373 --- /dev/null +++ b/rescript_parser/dune @@ -0,0 +1,8 @@ +(copy_files ./syntax/src/*.ml) +(copy_files ./syntax/src/*.mli) + +(library + (name rescript_parser) + (wrapped false) + (libraries compiler-libs) +) diff --git a/rescript_parser/syntax b/rescript_parser/syntax new file mode 160000 index 0000000..7cc70c9 --- /dev/null +++ b/rescript_parser/syntax @@ -0,0 +1 @@ +Subproject commit 7cc70c947c35357f71e24920c0e0c4cb58493125 diff --git a/test/__snapshots__/ReScript.18d405ea.0.snapshot b/test/__snapshots__/ReScript.18d405ea.0.snapshot new file mode 100644 index 0000000..19a51f7 --- /dev/null +++ b/test/__snapshots__/ReScript.18d405ea.0.snapshot @@ -0,0 +1,31 @@ +ReScript › full +[ + { \"id\": \"test4.msg1.1\", \"defaultMessage\": \"This is message 1.1\" }, + { \"id\": \"test4.msg1.2\", \"defaultMessage\": \"This is message 1.2\" }, + { + \"id\": \"test4.msg1.3\", + \"defaultMessage\": \"This is message 1.3\", + \"description\": \"Description for message 1.3\" + }, + { \"id\": \"test4.msg1.4\", \"defaultMessage\": \"This is message 1.4\" }, + { \"id\": \"test4.msg1.5\", \"defaultMessage\": \"This is message 1.5\" }, + { \"id\": \"test4.msg1.6\", \"defaultMessage\": \"This is message 1.6\" }, + { + \"id\": \"test4.msg1.7\", + \"defaultMessage\": \"This is message 1.7\", + \"description\": \"Description for message 1.7\" + }, + { \"id\": \"test4.msg1.8\", \"defaultMessage\": \"This is message 1.8\" }, + { + \"id\": \"test4.msg1.9\", + \"defaultMessage\": \"This is message 1.9\", + \"description\": \"Description for message 1.9\" + }, + { \"id\": \"test4.msg2.1\", \"defaultMessage\": \"This is message 2.1\" }, + { + \"id\": \"test4.msg2.2\", + \"defaultMessage\": \"This is message 2.2\", + \"description\": \"Description for message 2.2\" + }, + { \"id\": \"test4.msg3.1\", \"defaultMessage\": \"This is message 3.1\" } +] diff --git a/test/lib/Tests.re b/test/lib/Tests.re index 7a29101..b2dc944 100644 --- a/test/lib/Tests.re +++ b/test/lib/Tests.re @@ -53,3 +53,10 @@ describe("Path not found", ({test}) => { expect.fn(extract).toThrowException(Extractor.PathNotFound("testData/test1/SomeFile.re")); }); }); + +describe("ReScript", ({test}) => { + test("full", ({expect}) => { + let json = extractAndGetJson(["testData/test4"]); + expect.string(json).toMatchSnapshot(); + }) +}); diff --git a/testData/test4/Test_4_1.res b/testData/test4/Test_4_1.res new file mode 100644 index 0000000..bcab62b --- /dev/null +++ b/testData/test4/Test_4_1.res @@ -0,0 +1,69 @@ +let renderMessages1 = () => + + +let renderMessages2 = () => +
+ + +
+ +let renderMessages3 = () => +
+ + +
+ +let theseShouldBeIgnored = () => +
+ + +
+ +let _ = ReactIntl.defineMessages({ + "test4.msg1.6": { + "id": "test4.msg1.6", + "defaultMessage": "This is message 1.6", + }, + "ignored1.3": { + "idd": "test4.msg1.8" /* This will not be extracted. */, + "defaultMessage": "This is message 1.8", + }, +}) + +let _ = defineMessages({ + "test4.msg1.7": { + "id": "test4.msg1.7", + "defaultMessage": "This is message 1.7", + "description": "Description for message 1.7", + }, +}) + +module Msg = { + open ReactIntl + + @@intl.messages + + let msg18 = {id: "test4.msg1.8", defaultMessage: "This is message 1.8"} + + let ignored1 = {idd: "test4.ignored1.1", defaultMessage: "This message is ignored"} +} + +module Msg2 = { + open ReactIntl + + let ignored2 = {id: "test4.ignored1.2", defaultMessage: "This message is ignored"} +} + +module Msg3 = { + open ReactIntl + + @@intl.messages + + let msg19 = + @intl.description("Description for message 1.9") + {id: "test4.msg1.9", defaultMessage: "This is message 1.9"} +} diff --git a/testData/test4/Test_4_3.res b/testData/test4/Test_4_3.res new file mode 100644 index 0000000..f3abd81 --- /dev/null +++ b/testData/test4/Test_4_3.res @@ -0,0 +1,5 @@ +open ReactIntl + +@@intl.messages + +let msg3_1 = {id: "test4.msg3.1", defaultMessage: "This is message 3.1"} diff --git a/testData/test4/subdir/Test_4_2.res b/testData/test4/subdir/Test_4_2.res new file mode 100644 index 0000000..ddd875e --- /dev/null +++ b/testData/test4/subdir/Test_4_2.res @@ -0,0 +1,30 @@ +let _ = + @intl.messages + { + "test4.msg2.1": { + "id": "test4.msg2.1", + "defaultMessage": "This is message 2.1", + }, + "test4.msg2.2": { + "id": "test4.msg2.2", + "defaultMessage": "This is message 2.2", + "description": "Description for message 2.2", + }, + "test4.ignored2.1": { + "idd": "ignored2.1" /* This will not be extracted. */, + "defaultMessage": "This is message 13", + }, + } + +let _ = + @intl + { + "ignored2.2": { + "id": "ignored2.2", + "defaultMessage": "This message is ignored", + }, + "ignored2.3": { + "id": "ignored2.3", + "defaultMessage": "This message is ignored, too", + }, + } From 18211b7b1aa14965ab696af170ab49d54611323d Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 9 Jan 2021 14:17:29 +0100 Subject: [PATCH 4/4] Set version to 0.10.0 and include ReScript commit hash in version string. --- bin/Version.re | 4 +++- package.json | 2 +- scripts/setVersion.js | 22 ++++++++++++++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/bin/Version.re b/bin/Version.re index b3ed4a2..64c40c9 100644 --- a/bin/Version.re +++ b/bin/Version.re @@ -1 +1,3 @@ -let version = "0.9.1"; +// *** GENERATED BY "yarn setVersion" *** + +let version = "0.10.0 (ReScript 7cc70c9)"; diff --git a/package.json b/package.json index 12a7e35..b4ba524 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bs-react-intl-extractor", - "version": "0.9.1", + "version": "0.10.0", "description": "Message extractor for bs-react-intl", "author": "Christoph Knittel ", "license": "MIT", diff --git a/scripts/setVersion.js b/scripts/setVersion.js index 4713a3e..6e32f96 100644 --- a/scripts/setVersion.js +++ b/scripts/setVersion.js @@ -1,6 +1,24 @@ const fs = require("fs"); -const { version } = require("../package.json"); +const child_process = require("child_process"); -fs.writeFileSync("bin/Version.re", `let version = "${version}";\n`); +const packageJson = fs.readFileSync("package.json"); +const packageVersion = JSON.parse(packageJson).version; + +const reScriptVersion = child_process + .execSync("git submodule") + .toString() + .trim() + .split(" ")[0] + .substr(0, 7); + +const version = `${packageVersion} (ReScript ${reScriptVersion})`; + +fs.writeFileSync( + "bin/Version.re", + `// *** GENERATED BY "yarn setVersion" *** + +let version = "${version}"; +` +); console.log(`Version set to ${version}`);