From 8e81c146759f6875ce307c047542395d3057cb2b Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 2 Apr 2021 18:21:31 -0700 Subject: [PATCH 1/2] update dependencies --- esy.json | 16 +- esy.lock/.gitattributes | 2 +- esy.lock/index.json | 666 +++++++++--------- esy.lock/opam/atd.2.0.0/opam | 34 - esy.lock/opam/atdgen-runtime.2.0.0/opam | 29 - esy.lock/opam/atdgen.2.0.0/opam | 44 -- esy.lock/opam/conf-m4.1/opam | 22 - esy.lock/opam/{cppo.1.6.6 => cppo.1.6.7}/opam | 12 +- esy.lock/opam/csexp.1.5.1/opam | 60 ++ esy.lock/opam/dot-merlin-reader.4.1/opam | 30 + .../opam/{dune.1.11.4 => dune.2.8.5}/opam | 39 +- esy.lock/opam/fix.20201120/opam | 24 + esy.lock/opam/jbuilder.transition/opam | 18 - esy.lock/opam/menhir.20190924/opam | 29 - esy.lock/opam/menhir.20210310/opam | 27 + esy.lock/opam/menhirLib.20210310/opam | 28 + esy.lock/opam/menhirSdk.20210310/opam | 28 + .../opam | 7 +- .../{merlin.3.3.3 => merlin.4.1-412}/opam | 23 +- .../opam/ocaml-compiler-libs.v0.12.3/opam | 29 + .../opam | 13 +- esy.lock/opam/ocamlbuild.0.14.0/opam | 36 - .../opam/ocamlfind.1.8.1/files/ocaml-stub | 4 - .../ocamlfind.1.8.1/files/ocamlfind.install | 6 - .../{ocamlfind.1.8.1 => ocamlfind.1.9.1}/opam | 44 +- esy.lock/opam/ppxlib.0.22.0/opam | 59 ++ esy.lock/opam/re.1.9.0/opam | 42 -- esy.lock/opam/reason.3.7.0/opam | 31 + esy.lock/opam/{result.1.4 => result.1.5}/opam | 4 +- esy.lock/opam/seq.0.2.2/opam | 24 - esy.lock/opam/sexplib0.v0.14.0/opam | 26 + esy.lock/opam/stdlib-shims.0.3.0/opam | 31 + .../files/ocamlbuild-0.14.0.patch | 463 ------------ .../package.json | 27 - .../files/findlib-1.9.1.patch} | 0 .../package.json | 2 +- 36 files changed, 787 insertions(+), 1192 deletions(-) delete mode 100644 esy.lock/opam/atd.2.0.0/opam delete mode 100644 esy.lock/opam/atdgen-runtime.2.0.0/opam delete mode 100644 esy.lock/opam/atdgen.2.0.0/opam delete mode 100644 esy.lock/opam/conf-m4.1/opam rename esy.lock/opam/{cppo.1.6.6 => cppo.1.6.7}/opam (64%) create mode 100644 esy.lock/opam/csexp.1.5.1/opam create mode 100644 esy.lock/opam/dot-merlin-reader.4.1/opam rename esy.lock/opam/{dune.1.11.4 => dune.2.8.5}/opam (52%) create mode 100644 esy.lock/opam/fix.20201120/opam delete mode 100644 esy.lock/opam/jbuilder.transition/opam delete mode 100644 esy.lock/opam/menhir.20190924/opam create mode 100644 esy.lock/opam/menhir.20210310/opam create mode 100644 esy.lock/opam/menhirLib.20210310/opam create mode 100644 esy.lock/opam/menhirSdk.20210310/opam rename esy.lock/opam/{merlin-extend.0.5 => merlin-extend.0.6}/opam (73%) rename esy.lock/opam/{merlin.3.3.3 => merlin.4.1-412}/opam (73%) create mode 100644 esy.lock/opam/ocaml-compiler-libs.v0.12.3/opam rename esy.lock/opam/{ocaml-migrate-parsetree.1.5.0 => ocaml-migrate-parsetree.2.1.0}/opam (71%) delete mode 100644 esy.lock/opam/ocamlbuild.0.14.0/opam delete mode 100644 esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub delete mode 100644 esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install rename esy.lock/opam/{ocamlfind.1.8.1 => ocamlfind.1.9.1}/opam (61%) create mode 100644 esy.lock/opam/ppxlib.0.22.0/opam delete mode 100644 esy.lock/opam/re.1.9.0/opam create mode 100644 esy.lock/opam/reason.3.7.0/opam rename esy.lock/opam/{result.1.4 => result.1.5}/opam (83%) delete mode 100644 esy.lock/opam/seq.0.2.2/opam create mode 100644 esy.lock/opam/sexplib0.v0.14.0/opam create mode 100644 esy.lock/opam/stdlib-shims.0.3.0/opam delete mode 100644 esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch delete mode 100644 esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json rename esy.lock/overrides/{opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch => opam__s__ocamlfind_opam__c__1.9.1_opam_override/files/findlib-1.9.1.patch} (100%) rename esy.lock/overrides/{opam__s__ocamlfind_opam__c__1.8.1_opam_override => opam__s__ocamlfind_opam__c__1.9.1_opam_override}/package.json (92%) diff --git a/esy.json b/esy.json index 53e813e..8d3c74b 100644 --- a/esy.json +++ b/esy.json @@ -1,15 +1,17 @@ { "name": "let_anything_ppx", - "devDependencies": { + "dependencies": { + "ocaml": "4.12.x", "@opam/dune": "*", - "@opam/merlin": "3.3.3", - "@opam/ocaml-migrate-parsetree": "1.5.0", - "ocaml": "4.06.1000", - "refmterr": "3.3.0", - "@esy-ocaml/reason": "~3.5.0" + "@opam/reason": "~3.7.0", + "@opam/ppxlib": ">= 0.22.0" + }, + "devDependencies": { + "@opam/merlin": "*" }, "esy": { - "build": [["dune", "build", "-p", "#{self.name}"]], + "buildDev": "dune build", + "build": "dune build -p #{self.name}", "buildsInSource": "_build" } } diff --git a/esy.lock/.gitattributes b/esy.lock/.gitattributes index 25366ae..e0b4e26 100644 --- a/esy.lock/.gitattributes +++ b/esy.lock/.gitattributes @@ -1,3 +1,3 @@ # Set eol to LF so files aren't converted to CRLF-eol on Windows. -* text eol=lf +* text eol=lf linguist-generated diff --git a/esy.lock/index.json b/esy.lock/index.json index a7d3b81..6432649 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,35 +1,15 @@ { - "checksum": "a4e6d53d0fe75957e5a762da5eb64354", + "checksum": "4525294a37379a10676d3fc3f74ec0d7", "root": "let_anything_ppx@link-dev:./esy.json", "node": { - "refmterr@3.3.0@d41d8cd9": { - "id": "refmterr@3.3.0@d41d8cd9", - "name": "refmterr", - "version": "3.3.0", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.3.0.tgz#sha1:45adde80205093c201b491b3c37dd7740c9b036b" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@reason-native/pastel@0.2.3@d41d8cd9", - "@reason-native/console@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@opam/atdgen@opam:2.0.0@46af0360", - "@esy-ocaml/reason@3.5.2@d41d8cd9" - ], - "devDependencies": [] - }, - "ocaml@4.6.1000@d41d8cd9": { - "id": "ocaml@4.6.1000@d41d8cd9", + "ocaml@4.12.0@d41d8cd9": { + "id": "ocaml@4.12.0@d41d8cd9", "name": "ocaml", - "version": "4.6.1000", + "version": "4.12.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.6.1000.tgz#sha1:99525ef559353481396454f9a072dedc96b52f44" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.12.0.tgz#sha1:2a979f37535faaded8aa3fdf82b6f16f2c71e284" ] }, "overrides": [], @@ -42,150 +22,181 @@ "version": "link-dev:./esy.json", "source": { "type": "link-dev", "path": ".", "manifest": "esy.json" }, "overrides": [], - "dependencies": [], - "devDependencies": [ - "refmterr@3.3.0@d41d8cd9", "ocaml@4.6.1000@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "@opam/merlin@opam:3.3.3@d653b06a", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/reason@3.5.2@d41d8cd9" - ] + "dependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/reason@opam:3.7.0@191be014", + "@opam/ppxlib@opam:0.22.0@d2d2223a", "@opam/dune@opam:2.8.5@83fb0224" + ], + "devDependencies": [ "@opam/merlin@opam:4.1-412@a9da5f4b" ] }, - "@reason-native/pastel@0.2.3@d41d8cd9": { - "id": "@reason-native/pastel@0.2.3@d41d8cd9", - "name": "@reason-native/pastel", - "version": "0.2.3", + "@opam/yojson@opam:1.7.0@7056d985": { + "id": "@opam/yojson@opam:1.7.0@7056d985", + "name": "@opam/yojson", + "version": "opam:1.7.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.2.3.tgz#sha1:5c5d420c09874584ce15a38695c5dfd0f0ff5dfa" - ] + "archive:https://opam.ocaml.org/cache/md5/b8/b89d39ca3f8c532abe5f547ad3b8f84d#md5:b89d39ca3f8c532abe5f547ad3b8f84d", + "archive:https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz#md5:b89d39ca3f8c532abe5f547ad3b8f84d" + ], + "opam": { + "name": "yojson", + "version": "1.7.0", + "path": "esy.lock/opam/yojson.1.7.0" + } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/reason@3.5.2@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.8.5@83fb0224", "@opam/cppo@opam:1.6.7@c28ac3ae", + "@opam/biniou@opam:1.2.1@d7570399", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.8.5@83fb0224", "@opam/biniou@opam:1.2.1@d7570399" + ] }, - "@reason-native/console@0.1.0@d41d8cd9": { - "id": "@reason-native/console@0.1.0@d41d8cd9", - "name": "@reason-native/console", - "version": "0.1.0", + "@opam/stdlib-shims@opam:0.3.0@0d088929": { + "id": "@opam/stdlib-shims@opam:0.3.0@0d088929", + "name": "@opam/stdlib-shims", + "version": "opam:0.3.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/console/-/console-0.1.0.tgz#sha1:3b56f0e9e1be8464329793df29020aa90e71c22c" - ] + "archive:https://opam.ocaml.org/cache/sha256/ba/babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a#sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a", + "archive:https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz#sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a" + ], + "opam": { + "name": "stdlib-shims", + "version": "0.3.0", + "path": "esy.lock/opam/stdlib-shims.0.3.0" + } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@esy-ocaml/reason@3.5.2@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" + ] }, - "@opam/yojson@opam:1.7.0@7056d985": { - "id": "@opam/yojson@opam:1.7.0@7056d985", - "name": "@opam/yojson", - "version": "opam:1.7.0", + "@opam/sexplib0@opam:v0.14.0@ddeb6438": { + "id": "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "name": "@opam/sexplib0", + "version": "opam:v0.14.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/b8/b89d39ca3f8c532abe5f547ad3b8f84d#md5:b89d39ca3f8c532abe5f547ad3b8f84d", - "archive:https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz#md5:b89d39ca3f8c532abe5f547ad3b8f84d" + "archive:https://opam.ocaml.org/cache/md5/37/37aff0af8f8f6f759249475684aebdc4#md5:37aff0af8f8f6f759249475684aebdc4", + "archive:https://ocaml.janestreet.com/ocaml-core/v0.14/files/sexplib0-v0.14.0.tar.gz#md5:37aff0af8f8f6f759249475684aebdc4" ], "opam": { - "name": "yojson", - "version": "1.7.0", - "path": "esy.lock/opam/yojson.1.7.0" + "name": "sexplib0", + "version": "v0.14.0", + "path": "esy.lock/opam/sexplib0.v0.14.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/cppo@opam:1.6.6@f4f83858", - "@opam/biniou@opam:1.2.1@d7570399", + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/biniou@opam:1.2.1@d7570399" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" ] }, - "@opam/seq@opam:0.2.2@e9144e45": { - "id": "@opam/seq@opam:0.2.2@e9144e45", - "name": "@opam/seq", - "version": "opam:0.2.2", + "@opam/result@opam:1.5@6b753c82": { + "id": "@opam/result@opam:1.5@6b753c82", + "name": "@opam/result", + "version": "opam:1.5", "source": { "type": "install", "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" + "archive:https://opam.ocaml.org/cache/md5/1b/1b82dec78849680b49ae9a8a365b831b#md5:1b82dec78849680b49ae9a8a365b831b", + "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#md5:1b82dec78849680b49ae9a8a365b831b" ], "opam": { - "name": "seq", - "version": "0.2.2", - "path": "esy.lock/opam/seq.0.2.2" + "name": "result", + "version": "1.5", + "path": "esy.lock/opam/result.1.5" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" ] }, - "@opam/result@opam:1.4@dc720aef": { - "id": "@opam/result@opam:1.4@dc720aef", - "name": "@opam/result", - "version": "opam:1.4", + "@opam/reason@opam:3.7.0@191be014": { + "id": "@opam/reason@opam:3.7.0@191be014", + "name": "@opam/reason", + "version": "opam:3.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/d3/d3162dbc501a2af65c8c71e0866541da#md5:d3162dbc501a2af65c8c71e0866541da", - "archive:https://github.com/janestreet/result/archive/1.4.tar.gz#md5:d3162dbc501a2af65c8c71e0866541da" + "archive:https://opam.ocaml.org/cache/md5/7e/7eb8cbbff8565b93ebfabf4eca7254d4#md5:7eb8cbbff8565b93ebfabf4eca7254d4", + "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.7.0.tgz#md5:7eb8cbbff8565b93ebfabf4eca7254d4" ], "opam": { - "name": "result", - "version": "1.4", - "path": "esy.lock/opam/result.1.4" + "name": "reason", + "version": "3.7.0", + "path": "esy.lock/opam/reason.3.7.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.12.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocamlfind@opam:1.9.1@b748edf6", + "@opam/merlin-extend@opam:0.6@404f814c", + "@opam/menhir@opam:20210310@50de9216", + "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/merlin-extend@opam:0.6@404f814c", + "@opam/menhir@opam:20210310@50de9216", + "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.8.5@83fb0224" ] }, - "@opam/re@opam:1.9.0@d4d5e13d": { - "id": "@opam/re@opam:1.9.0@d4d5e13d", - "name": "@opam/re", - "version": "opam:1.9.0", + "@opam/ppxlib@opam:0.22.0@d2d2223a": { + "id": "@opam/ppxlib@opam:0.22.0@d2d2223a", + "name": "@opam/ppxlib", + "version": "opam:0.22.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/bd/bddaed4f386a22cace7850c9c7dac296#md5:bddaed4f386a22cace7850c9c7dac296", - "archive:https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz#md5:bddaed4f386a22cace7850c9c7dac296" + "archive:https://opam.ocaml.org/cache/sha256/3e/3eeb91e03966662284a3222e612dee7f4fa2b7637c53d9572d2a74134bb96d7a#sha256:3eeb91e03966662284a3222e612dee7f4fa2b7637c53d9572d2a74134bb96d7a", + "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.22.0/ppxlib-0.22.0.tbz#sha256:3eeb91e03966662284a3222e612dee7f4fa2b7637c53d9572d2a74134bb96d7a" ], "opam": { - "name": "re", - "version": "1.9.0", - "path": "esy.lock/opam/re.1.9.0" + "name": "ppxlib", + "version": "0.22.0", + "path": "esy.lock/opam/ppxlib.0.22.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@0d088929", + "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocaml-migrate-parsetree@opam:2.1.0@a3b6747d", + "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd", + "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@0d088929", + "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocaml-migrate-parsetree@opam:2.1.0@a3b6747d", + "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd", + "@opam/dune@opam:2.8.5@83fb0224" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -206,194 +217,246 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" ] }, - "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { - "id": "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.9.1@b748edf6": { + "id": "@opam/ocamlfind@opam:1.9.1@b748edf6", "name": "@opam/ocamlfind", - "version": "opam:1.8.1", + "version": "opam:1.9.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" + "archive:https://opam.ocaml.org/cache/md5/65/65e6dc9b305ccbed1267275fe180f538#md5:65e6dc9b305ccbed1267275fe180f538", + "archive:http://download.camlcity.org/download/findlib-1.9.1.tar.gz#md5:65e6dc9b305ccbed1267275fe180f538" ], "opam": { "name": "ocamlfind", - "version": "1.8.1", - "path": "esy.lock/opam/ocamlfind.1.8.1" + "version": "1.9.1", + "path": "esy.lock/opam/ocamlfind.1.9.1" } }, "overrides": [ { "opamoverride": - "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override" + "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override" } ], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] }, - "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { - "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "name": "@opam/ocamlbuild", - "version": "opam:0.14.0", + "@opam/ocaml-migrate-parsetree@opam:2.1.0@a3b6747d": { + "id": "@opam/ocaml-migrate-parsetree@opam:2.1.0@a3b6747d", + "name": "@opam/ocaml-migrate-parsetree", + "version": "opam:2.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/87/87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78#sha256:87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78", - "archive:https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz#sha256:87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78" + "archive:https://opam.ocaml.org/cache/sha256/38/387b788ee4c0537f1fe02c25e05f0335af424828fc6fe940acc0db5948a5a71f#sha256:387b788ee4c0537f1fe02c25e05f0335af424828fc6fe940acc0db5948a5a71f", + "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v2.1.0/ocaml-migrate-parsetree-v2.1.0.tbz#sha256:387b788ee4c0537f1fe02c25e05f0335af424828fc6fe940acc0db5948a5a71f" ], "opam": { - "name": "ocamlbuild", - "version": "0.14.0", - "path": "esy.lock/opam/ocamlbuild.0.14.0" + "name": "ocaml-migrate-parsetree", + "version": "2.1.0", + "path": "esy.lock/opam/ocaml-migrate-parsetree.2.1.0" } }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] + "devDependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" + ] }, - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc": { - "id": "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "name": "@opam/ocaml-migrate-parsetree", - "version": "opam:1.5.0", + "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd": { + "id": "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd", + "name": "@opam/ocaml-compiler-libs", + "version": "opam:v0.12.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/7f/7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0#sha256:7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0", - "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz#sha256:7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0" + "archive:https://opam.ocaml.org/cache/sha256/a8/a8403531439c14bbda2d504ef93610fd29a8e9520fc700f21889d893a513e3c9#sha256:a8403531439c14bbda2d504ef93610fd29a8e9520fc700f21889d893a513e3c9", + "archive:https://github.com/janestreet/ocaml-compiler-libs/releases/download/v0.12.3/ocaml-compiler-libs-v0.12.3.tbz#sha256:a8403531439c14bbda2d504ef93610fd29a8e9520fc700f21889d893a513e3c9" ], "opam": { - "name": "ocaml-migrate-parsetree", - "version": "1.5.0", - "path": "esy.lock/opam/ocaml-migrate-parsetree.1.5.0" + "name": "ocaml-compiler-libs", + "version": "v0.12.3", + "path": "esy.lock/opam/ocaml-compiler-libs.v0.12.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" ] }, - "@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.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@opam/cppo@opam:1.6.7@c28ac3ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" ] }, - "@opam/merlin@opam:3.3.3@d653b06a": { - "id": "@opam/merlin@opam:3.3.3@d653b06a", + "@opam/merlin@opam:4.1-412@a9da5f4b": { + "id": "@opam/merlin@opam:4.1-412@a9da5f4b", "name": "@opam/merlin", - "version": "opam:3.3.3", + "version": "opam:4.1-412", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/72/72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15#sha256:72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15", - "archive:https://github.com/ocaml/merlin/releases/download/v3.3.3/merlin-v3.3.3.tbz#sha256:72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15" + "archive:https://opam.ocaml.org/cache/sha256/fb/fb4caede73bdb8393bd60e31792af74b901ae2d319ac2f2a2252c694d2069d8d#sha256:fb4caede73bdb8393bd60e31792af74b901ae2d319ac2f2a2252c694d2069d8d", + "archive:https://github.com/ocaml/merlin/releases/download/v4.1-412/merlin-v4.1-412.tbz#sha256:fb4caede73bdb8393bd60e31792af74b901ae2d319ac2f2a2252c694d2069d8d" ], "opam": { "name": "merlin", - "version": "3.3.3", - "path": "esy.lock/opam/merlin.3.3.3" + "version": "4.1-412", + "path": "esy.lock/opam/merlin.4.1-412" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.8.5@83fb0224", + "@opam/dot-merlin-reader@opam:4.1@120afa42", + "@opam/csexp@opam:1.5.1@f2f16ef6", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.8.5@83fb0224", + "@opam/dot-merlin-reader@opam:4.1@120afa42", + "@opam/csexp@opam:1.5.1@f2f16ef6" + ] + }, + "@opam/menhirSdk@opam:20210310@5abaafca": { + "id": "@opam/menhirSdk@opam:20210310@5abaafca", + "name": "@opam/menhirSdk", + "version": "opam:20210310", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/1c/1cbc71c0bc1f3ddc3e71d5c1f919fd1a#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a" + ], + "opam": { + "name": "menhirSdk", + "version": "20210310", + "path": "esy.lock/opam/menhirSdk.20210310" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" + ] + }, + "@opam/menhirLib@opam:20210310@f9315713": { + "id": "@opam/menhirLib@opam:20210310@f9315713", + "name": "@opam/menhirLib", + "version": "opam:20210310", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/1c/1cbc71c0bc1f3ddc3e71d5c1f919fd1a#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a" + ], + "opam": { + "name": "menhirLib", + "version": "20210310", + "path": "esy.lock/opam/menhirLib.20210310" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" ] }, - "@opam/menhir@opam:20190924@004407ff": { - "id": "@opam/menhir@opam:20190924@004407ff", + "@opam/menhir@opam:20210310@50de9216": { + "id": "@opam/menhir@opam:20210310@50de9216", "name": "@opam/menhir", - "version": "opam:20190924", + "version": "opam:20210310", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/67/677f1997fb73177d5a00fa1b8d61c3ef#md5:677f1997fb73177d5a00fa1b8d61c3ef", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz#md5:677f1997fb73177d5a00fa1b8d61c3ef" + "archive:https://opam.ocaml.org/cache/md5/1c/1cbc71c0bc1f3ddc3e71d5c1f919fd1a#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a" ], "opam": { "name": "menhir", - "version": "20190924", - "path": "esy.lock/opam/menhir.20190924" + "version": "20210310", + "path": "esy.lock/opam/menhir.20210310" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/menhirSdk@opam:20210310@5abaafca", + "@opam/menhirLib@opam:20210310@f9315713", + "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] + "devDependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/menhirSdk@opam:20210310@5abaafca", + "@opam/menhirLib@opam:20210310@f9315713", + "@opam/dune@opam:2.8.5@83fb0224" + ] }, - "@opam/jbuilder@opam:transition@20522f05": { - "id": "@opam/jbuilder@opam:transition@20522f05", - "name": "@opam/jbuilder", - "version": "opam:transition", + "@opam/fix@opam:20201120@5c318621": { + "id": "@opam/fix@opam:20201120@5c318621", + "name": "@opam/fix", + "version": "opam:20201120", "source": { "type": "install", - "source": [ "no-source:" ], + "source": [ + "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": "jbuilder", - "version": "transition", - "path": "esy.lock/opam/jbuilder.transition" + "name": "fix", + "version": "20201120", + "path": "esy.lock/opam/fix.20201120" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -414,83 +477,122 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" ] }, - "@opam/dune@opam:1.11.4@a7ccb7ae": { - "id": "@opam/dune@opam:1.11.4@a7ccb7ae", + "@opam/dune@opam:2.8.5@83fb0224": { + "id": "@opam/dune@opam:2.8.5@83fb0224", "name": "@opam/dune", - "version": "opam:1.11.4", + "version": "opam:2.8.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/77/77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6#sha256:77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6", - "archive:https://github.com/ocaml/dune/releases/download/1.11.4/dune-build-info-1.11.4.tbz#sha256:77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6" + "archive:https://opam.ocaml.org/cache/sha256/79/79011283fb74c7a27eb17ad752efbcc39b39633cbacc8d7be97e8ea869443629#sha256:79011283fb74c7a27eb17ad752efbcc39b39633cbacc8d7be97e8ea869443629", + "archive:https://github.com/ocaml/dune/releases/download/2.8.5/dune-2.8.5.tbz#sha256:79011283fb74c7a27eb17ad752efbcc39b39633cbacc8d7be97e8ea869443629" ], "opam": { "name": "dune", - "version": "1.11.4", - "path": "esy.lock/opam/dune.1.11.4" + "version": "2.8.5", + "path": "esy.lock/opam/dune.2.8.5" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.12.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.12.0@d41d8cd9", "@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", - "name": "@opam/cppo", - "version": "opam:1.6.6", + "@opam/dot-merlin-reader@opam:4.1@120afa42": { + "id": "@opam/dot-merlin-reader@opam:4.1@120afa42", + "name": "@opam/dot-merlin-reader", + "version": "opam:4.1", "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/14/14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd#sha256:14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd", + "archive:https://github.com/ocaml/merlin/releases/download/v4.1/dot-merlin-reader-v4.1.tbz#sha256:14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd" ], "opam": { - "name": "cppo", - "version": "1.6.6", - "path": "esy.lock/opam/cppo.1.6.6" + "name": "dot-merlin-reader", + "version": "4.1", + "path": "esy.lock/opam/dot-merlin-reader.4.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.9.1@b748edf6", + "@opam/dune@opam:2.8.5@83fb0224", "@opam/csexp@opam:1.5.1@f2f16ef6", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", - "@opam/base-unix@opam:base@87d0b2eb" + "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.9.1@b748edf6", + "@opam/dune@opam:2.8.5@83fb0224", "@opam/csexp@opam:1.5.1@f2f16ef6" ] }, - "@opam/conf-m4@opam:1@3b2b148a": { - "id": "@opam/conf-m4@opam:1@3b2b148a", - "name": "@opam/conf-m4", - "version": "opam:1", + "@opam/csexp@opam:1.5.1@f2f16ef6": { + "id": "@opam/csexp@opam:1.5.1@f2f16ef6", + "name": "@opam/csexp", + "version": "opam:1.5.1", "source": { "type": "install", - "source": [ "no-source:" ], + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/d6/d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02#sha256:d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz#sha256:d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02" + ], "opam": { - "name": "conf-m4", - "version": "1", - "path": "esy.lock/opam/conf-m4.1" + "name": "csexp", + "version": "1.5.1", + "path": "esy.lock/opam/csexp.1.5.1" } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [] + "dependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224" + ] + }, + "@opam/cppo@opam:1.6.7@c28ac3ae": { + "id": "@opam/cppo@opam:1.6.7@c28ac3ae", + "name": "@opam/cppo", + "version": "opam:1.6.7", + "source": { + "type": "install", + "source": [ + "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.7", + "path": "esy.lock/opam/cppo.1.6.7" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@opam/base-unix@opam:base@87d0b2eb", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.5@83fb0224", + "@opam/base-unix@opam:base@87d0b2eb" + ] }, "@opam/biniou@opam:1.2.1@d7570399": { "id": "@opam/biniou@opam:1.2.1@d7570399", @@ -510,12 +612,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.12.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.8.5@83fb0224", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.4@a7ccb7ae" + "ocaml@4.12.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.8.5@83fb0224" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -552,95 +654,6 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/atdgen-runtime@opam:2.0.0@60f6faab": { - "id": "@opam/atdgen-runtime@opam:2.0.0@60f6faab", - "name": "@opam/atdgen-runtime", - "version": "opam:2.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" - ], - "opam": { - "name": "atdgen-runtime", - "version": "2.0.0", - "path": "esy.lock/opam/atdgen-runtime.2.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399" - ] - }, - "@opam/atdgen@opam:2.0.0@46af0360": { - "id": "@opam/atdgen@opam:2.0.0@46af0360", - "name": "@opam/atdgen", - "version": "opam:2.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" - ], - "opam": { - "name": "atdgen", - "version": "2.0.0", - "path": "esy.lock/opam/atdgen.2.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399", - "@opam/atdgen-runtime@opam:2.0.0@60f6faab", - "@opam/atd@opam:2.0.0@e0ddd12f", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399", - "@opam/atdgen-runtime@opam:2.0.0@60f6faab", - "@opam/atd@opam:2.0.0@e0ddd12f" - ] - }, - "@opam/atd@opam:2.0.0@e0ddd12f": { - "id": "@opam/atd@opam:2.0.0@e0ddd12f", - "name": "@opam/atd", - "version": "opam:2.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" - ], - "opam": { - "name": "atd", - "version": "2.0.0", - "path": "esy.lock/opam/atd.2.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/menhir@opam:20190924@004407ff", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/easy-format@opam:1.3.2@0484b3c4", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/jbuilder@opam:transition@20522f05", - "@opam/easy-format@opam:1.3.2@0484b3c4" - ] - }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { "id": "@esy-ocaml/substs@0.0.1@d41d8cd9", "name": "@esy-ocaml/substs", @@ -654,27 +667,6 @@ "overrides": [], "dependencies": [], "devDependencies": [] - }, - "@esy-ocaml/reason@3.5.2@d41d8cd9": { - "id": "@esy-ocaml/reason@3.5.2@d41d8cd9", - "name": "@esy-ocaml/reason", - "version": "3.5.2", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.5.2.tgz#sha1:ac48b63fd66fbbc1d77ab6a2b7e3a1ba21a8f40b" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20190924@004407ff", - "@opam/dune@opam:1.11.4@a7ccb7ae" - ], - "devDependencies": [] } } } \ No newline at end of file diff --git a/esy.lock/opam/atd.2.0.0/opam b/esy.lock/opam/atd.2.0.0/opam deleted file mode 100644 index 2808354..0000000 --- a/esy.lock/opam/atd.2.0.0/opam +++ /dev/null @@ -1,34 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.03.0"} - "jbuilder" - "menhir" {build} - "easy-format" -] -synopsis: "Parser for the ATD data format description language" -description: """ -ATD is the OCaml library providing a parser for the ATD language and -various utilities. ATD stands for Adjustable Type Definitions in -reference to its main property of supporting annotations that allow a -good fit with a variety of data formats.""" -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/atdgen-runtime.2.0.0/opam b/esy.lock/opam/atdgen-runtime.2.0.0/opam deleted file mode 100644 index 7236d93..0000000 --- a/esy.lock/opam/atdgen-runtime.2.0.0/opam +++ /dev/null @@ -1,29 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.02.3"} - "jbuilder" - "biniou" {>= "1.0.6"} - "yojson" {>= "1.2.1"} -] -synopsis: "Runtime library for code generated by atdgen." -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/atdgen.2.0.0/opam b/esy.lock/opam/atdgen.2.0.0/opam deleted file mode 100644 index d71d304..0000000 --- a/esy.lock/opam/atdgen.2.0.0/opam +++ /dev/null @@ -1,44 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.03.0"} - "jbuilder" - "atd" {>= "2.0.0"} - "atdgen-runtime" {>= "2.0.0"} - "biniou" {>= "1.0.6"} - "yojson" {>= "1.2.1"} -] -synopsis: - "Generates efficient JSON serializers, deserializers and validators" -description: """ -Atdgen is a command-line program that takes as input type definitions in the -ATD syntax and produces OCaml code suitable for data serialization and -deserialization. - -Two data formats are currently supported, these are biniou and JSON. -Atdgen-biniou and Atdgen-json will refer to Atdgen used in one context or the -other. - -Atdgen was designed with efficiency and durability in mind. Software authors -are encouraged to use Atdgen directly and to write tools that may reuse part of -Atdgen’s source code.""" -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/conf-m4.1/opam b/esy.lock/opam/conf-m4.1/opam deleted file mode 100644 index c6feb2a..0000000 --- a/esy.lock/opam/conf-m4.1/opam +++ /dev/null @@ -1,22 +0,0 @@ -opam-version: "2.0" -maintainer: "tim@gfxmonk.net" -homepage: "http://www.gnu.org/software/m4/m4.html" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -authors: "GNU Project" -license: "GPL-3.0-only" -build: [["sh" "-exc" "echo | m4"]] -depexts: [ - ["m4"] {os-family = "debian"} - ["m4"] {os-distribution = "fedora"} - ["m4"] {os-distribution = "rhel"} - ["m4"] {os-distribution = "centos"} - ["m4"] {os-distribution = "alpine"} - ["m4"] {os-distribution = "nixos"} - ["m4"] {os-family = "suse"} - ["m4"] {os-distribution = "ol"} - ["m4"] {os-distribution = "arch"} -] -synopsis: "Virtual package relying on m4" -description: - "This package can only install if the m4 binary is installed on the system." -flags: conf 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.5.1/opam b/esy.lock/opam/csexp.1.5.1/opam new file mode 100644 index 0000000..251fba6 --- /dev/null +++ b/esy.lock/opam/csexp.1.5.1/opam @@ -0,0 +1,60 @@ +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.03.0"} +# "ppx_expect" {with-test & >= "v0.14"} + "odoc" {with-doc} +] +dev-repo: "git+https://github.com/ocaml-dune/csexp.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" +# Tests disabled because of a cyclic dependency with csexp, dune-configurator and ppx_expect +# "@runtest" {with-test} + "@doc" {with-doc} + ] +] +x-commit-hash: "7eeb86206819d2b1782d6cde1be9d6cf8b5fc851" +url { + src: + "https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz" + checksum: [ + "sha256=d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02" + "sha512=d785bbabaff9f6bf601399149ef0a42e5e99647b54e27f97ef1625907793dda22a45bf83e0e8a1eba2c63634c5484b54739ff0904ef556f5fc592efa38af7505" + ] +} diff --git a/esy.lock/opam/dot-merlin-reader.4.1/opam b/esy.lock/opam/dot-merlin-reader.4.1/opam new file mode 100644 index 0000000..d84045d --- /dev/null +++ b/esy.lock/opam/dot-merlin-reader.4.1/opam @@ -0,0 +1,30 @@ +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.06.1" } + "dune" {>= "2.7.0"} + "yojson" {>= "1.6.0"} + "ocamlfind" {>= "1.6.0"} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} +] +description: + "Helper process: reads .merlin files and gives the normalized content to merlin" +x-commit-hash: "ab02f60994c81166820791b5f465f467d752b8dc" +url { + src: + "https://github.com/ocaml/merlin/releases/download/v4.1/dot-merlin-reader-v4.1.tbz" + checksum: [ + "sha256=14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd" + "sha512=65fd4ab08904c05651a7ef8971802ffaa428daa920765dbcf162e3c56e8047e4c9e4356daa45efccce7c73a586635c8f6cf8118fd3059789de9aff68579bd436" + ] +} diff --git a/esy.lock/opam/dune.1.11.4/opam b/esy.lock/opam/dune.2.8.5/opam similarity index 52% rename from esy.lock/opam/dune.1.11.4/opam rename to esy.lock/opam/dune.2.8.5/opam index 19e2511..621f7fb 100644 --- a/esy.lock/opam/dune.1.11.4/opam +++ b/esy.lock/opam/dune.2.8.5/opam @@ -1,14 +1,14 @@ opam-version: "2.0" -synopsis: "Fast, portable and opinionated build system" +synopsis: "Fast, portable, and opinionated build system" description: """ dune is a build system that was designed to simplify the release of Jane Street packages. It reads metadata from "dune" files following a very simple s-expression syntax. -dune is fast, it has very low-overhead and support parallel builds on -all platforms. It has no system dependencies, all you need to build -dune and packages using dune is OCaml. You don't need or make or bash +dune is fast, has very low-overhead, and supports parallel builds on +all platforms. It has no system dependencies; all you need to build +dune or packages using dune is OCaml. You don't need make or bash as long as the packages themselves don't use bash explicitly. dune supports multi-package development by simply dropping multiple @@ -25,29 +25,34 @@ license: "MIT" homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "ocaml" {>= "4.02"} - "base-unix" - "base-threads" -] conflicts: [ - "jbuilder" {!= "transition"} + "merlin" {< "3.4.0"} + "ocaml-lsp-server" {< "1.3.0"} + "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" build: [ # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} - ["ocaml" "bootstrap.ml"] - ["./boot.exe" "--release" "--subst"] {pinned} - ["./boot.exe" "--release" "-j" jobs] + ["ocaml" "bootstrap.ml" "-j" jobs] + ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] +] +depends: [ + # 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: "e84ba5230f6afacb12f022937138a752f1c301b6" url { - src: - "https://github.com/ocaml/dune/releases/download/1.11.4/dune-build-info-1.11.4.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.8.5/dune-2.8.5.tbz" checksum: [ - "sha256=77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6" - "sha512=02f00fd872aa49b832fc8c1e928409f23c79ddf84a53009a58875f222cca36fbb92c905e12c539caec9cbad723f195a8aa24218382dca35a903b3f52b11f06f2" + "sha256=79011283fb74c7a27eb17ad752efbcc39b39633cbacc8d7be97e8ea869443629" + "sha512=4ef6cdea0768a29de0108cb61b04ef471cb494762c865265f20d7d15ed65a39557f7e34f2dbd466352a6567cce29d7ba21be6569afafbcfc2871720b9466dcae" ] } diff --git a/esy.lock/opam/fix.20201120/opam b/esy.lock/opam/fix.20201120/opam new file mode 100644 index 0000000..31c8a64 --- /dev/null +++ b/esy.lock/opam/fix.20201120/opam @@ -0,0 +1,24 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " +] +homepage: "https://gitlab.inria.fr/fpottier/fix" +dev-repo: "git+https://gitlab.inria.fr/fpottier/fix.git" +bug-reports: "francois.pottier@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.03" } + "dune" {>= "1.3" } +] +synopsis: "Facilities for memoization and fixed points" +url { + src: + "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz" + checksum: [ + "md5=7eb570b759635fe66f3556d2b1cc88e3" + "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4" + ] +} diff --git a/esy.lock/opam/jbuilder.transition/opam b/esy.lock/opam/jbuilder.transition/opam deleted file mode 100644 index 9280c3f..0000000 --- a/esy.lock/opam/jbuilder.transition/opam +++ /dev/null @@ -1,18 +0,0 @@ -opam-version: "2.0" -maintainer: "opensource@janestreet.com" -authors: ["Jane Street Group, LLC "] -homepage: "https://github.com/ocaml/dune" -bug-reports: "https://github.com/ocaml/dune/issues" -dev-repo: "git+https://github.com/ocaml/dune.git" -license: "MIT" -depends: [ - "ocaml" - "dune" {< "2.0"} -] -post-messages: [ - "Jbuilder has been renamed and the jbuilder package is now a transition \ - package. Use the dune package instead." -] -synopsis: - "This is a transition package, jbuilder is now named dune. Use the dune" -description: "package instead." diff --git a/esy.lock/opam/menhir.20190924/opam b/esy.lock/opam/menhir.20190924/opam deleted file mode 100644 index 348967a..0000000 --- a/esy.lock/opam/menhir.20190924/opam +++ /dev/null @@ -1,29 +0,0 @@ -opam-version: "2.0" -maintainer: "francois.pottier@inria.fr" -authors: [ - "François Pottier " - "Yann Régis-Gianas " -] -homepage: "http://gitlab.inria.fr/fpottier/menhir" -dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" -bug-reports: "menhir@inria.fr" -build: [ - [make "-f" "Makefile" "PREFIX=%{prefix}%" "USE_OCAMLFIND=true" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] -] -install: [ - [make "-f" "Makefile" "install" "PREFIX=%{prefix}%" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] -] -depends: [ - "ocaml" {>= "4.02"} - "ocamlfind" {build} - "ocamlbuild" {build} -] -synopsis: "An LR(1) parser generator" -url { - src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz" - checksum: [ - "md5=677f1997fb73177d5a00fa1b8d61c3ef" - "sha512=ea8a9a6d773529cf6ac05e4c6c4532770fbb8e574c9b646efcefe90d9f24544741e3e8cfd94c8afea0447e34059a8c79c2829b46764ce3a3d6dcb3e7f75980fc" - ] -} diff --git a/esy.lock/opam/menhir.20210310/opam b/esy.lock/opam/menhir.20210310/opam new file mode 100644 index 0000000..d795865 --- /dev/null +++ b/esy.lock/opam/menhir.20210310/opam @@ -0,0 +1,27 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" { >= "2.2.0"} + "menhirLib" {= version} + "menhirSdk" {= version} +] +synopsis: "An LR(1) parser generator" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz" + checksum: [ + "md5=1cbc71c0bc1f3ddc3e71d5c1f919fd1a" + "sha512=3c309fa2cc4ad7c6fba85107bd946a542894882fa39741496b150307e93455b717418f19e94b5dad06ab269f5c55e8dc25705c96c0a5092e623fa38f1ce43c7f" + ] +} diff --git a/esy.lock/opam/menhirLib.20210310/opam b/esy.lock/opam/menhirLib.20210310/opam new file mode 100644 index 0000000..3dc8fb9 --- /dev/null +++ b/esy.lock/opam/menhirLib.20210310/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Runtime support library for parsers generated by Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz" + checksum: [ + "md5=1cbc71c0bc1f3ddc3e71d5c1f919fd1a" + "sha512=3c309fa2cc4ad7c6fba85107bd946a542894882fa39741496b150307e93455b717418f19e94b5dad06ab269f5c55e8dc25705c96c0a5092e623fa38f1ce43c7f" + ] +} diff --git a/esy.lock/opam/menhirSdk.20210310/opam b/esy.lock/opam/menhirSdk.20210310/opam new file mode 100644 index 0000000..02a480f --- /dev/null +++ b/esy.lock/opam/menhirSdk.20210310/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Compile-time library for auxiliary tools related to Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz" + checksum: [ + "md5=1cbc71c0bc1f3ddc3e71d5c1f919fd1a" + "sha512=3c309fa2cc4ad7c6fba85107bd946a542894882fa39741496b150307e93455b717418f19e94b5dad06ab269f5c55e8dc25705c96c0a5092e623fa38f1ce43c7f" + ] +} 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.3/opam b/esy.lock/opam/merlin.4.1-412/opam similarity index 73% rename from esy.lock/opam/merlin.3.3.3/opam rename to esy.lock/opam/merlin.4.1-412/opam index f0db8e9..8bde3d3 100644 --- a/esy.lock/opam/merlin.3.3.3/opam +++ b/esy.lock/opam/merlin.4.1-412/opam @@ -7,15 +7,19 @@ 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} + ["dune" "runtest" "-p" "merlin,dot-merlin-reader" "-j" "1"] {with-test} ] depends: [ - "ocaml" {>= "4.02.1" & < "4.10"} - "dune" {>= "1.8.0"} - "ocamlfind" {>= "1.5.2"} + "ocaml" {>= "4.12" & < "4.13"} + "dune" {>= "2.7.0"} + "dot-merlin-reader" {>= "4.0"} "yojson" {>= "1.6.0"} - "mdx" {with-test & >= "1.3.0"} "conf-jq" {with-test} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} + "menhir" {dev} + "menhirLib" {dev} + "menhirSdk" {dev} ] synopsis: "Editor helper, provides completion, typing and source browsing in Vim and Emacs" @@ -27,7 +31,7 @@ post-messages: [ Quick setup for VIM ------------------- Append this to your .vimrc to add merlin to vim's runtime-path: - let g:opamshare = substitute(system('opam config var share'),'\\n$','','''') + let g:opamshare = substitute(system('opam var share'),'\\n$','','''') execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\" Also run the following line in vim to index the documentation: @@ -61,11 +65,12 @@ See https://github.com/OCamlPro/opam-user-setup " {success & !user-setup:installed} ] +x-commit-hash: "35c3ad0fb4a1de53f6afb028961800e63b9363bd" url { src: - "https://github.com/ocaml/merlin/releases/download/v3.3.3/merlin-v3.3.3.tbz" + "https://github.com/ocaml/merlin/releases/download/v4.1-412/merlin-v4.1-412.tbz" checksum: [ - "sha256=72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15" - "sha512=2a5f39d966be56c1322982effc05bc98fd5f66cd12f1f76953f8daa9eca74a58c92a186854f4e601e2f0bb038720691446e7591b4613982accded3e579fedb23" + "sha256=fb4caede73bdb8393bd60e31792af74b901ae2d319ac2f2a2252c694d2069d8d" + "sha512=ec301e0f97e11c1c331478030372d373d381a0ddbb7f72c83f7baa4c2c6d4f26094c3398f56bcf3d40c1242044391369fd06e8cd2ccfe1f5d78467eb3e9d33be" ] } diff --git a/esy.lock/opam/ocaml-compiler-libs.v0.12.3/opam b/esy.lock/opam/ocaml-compiler-libs.v0.12.3/opam new file mode 100644 index 0000000..b96702f --- /dev/null +++ b/esy.lock/opam/ocaml-compiler-libs.v0.12.3/opam @@ -0,0 +1,29 @@ +opam-version: "2.0" +maintainer: "opensource@janestreet.com" +authors: ["Jane Street Group, LLC "] +homepage: "https://github.com/janestreet/ocaml-compiler-libs" +bug-reports: "https://github.com/janestreet/ocaml-compiler-libs/issues" +dev-repo: "git+https://github.com/janestreet/ocaml-compiler-libs.git" +license: "MIT" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.04.1"} + "dune" {>= "1.5.1"} +] +synopsis: """OCaml compiler libraries repackaged""" +description: """ + +This packages exposes the OCaml compiler libraries repackages under +the toplevel names Ocaml_common, Ocaml_bytecomp, Ocaml_optcomp, ... +""" +x-commit-hash: "7f5d1d2931b96fb3ee6dd569a469b51f621a6dd4" +url { + src: + "https://github.com/janestreet/ocaml-compiler-libs/releases/download/v0.12.3/ocaml-compiler-libs-v0.12.3.tbz" + checksum: [ + "sha256=a8403531439c14bbda2d504ef93610fd29a8e9520fc700f21889d893a513e3c9" + "sha512=0bb03b38e93bab3274a8ade38d017808110bc02f2181a594d8775c68fdd465733393f0451dbbf8860e6b50b56c45671d2182637c0840d1d6574803ec18673972" + ] +} diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam b/esy.lock/opam/ocaml-migrate-parsetree.2.1.0/opam similarity index 71% rename from esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam rename to esy.lock/opam/ocaml-migrate-parsetree.2.1.0/opam index aa41104..298f172 100644 --- a/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam +++ b/esy.lock/opam/ocaml-migrate-parsetree.2.1.0/opam @@ -14,10 +14,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "result" - "ppx_derivers" - "dune" {>= "1.9.0"} - "ocaml" {>= "4.02.3"} + "dune" {>= "1.11"} + "ocaml" {>= "4.02.3" & < "4.13"} ] synopsis: "Convert OCaml parsetrees between different versions" description: """ @@ -27,11 +25,12 @@ This library converts parsetrees, outcometree and ast mappers between different OCaml versions. High-level functions help making PPX rewriters independent of a compiler version. """ +x-commit-hash: "4a05cf7a00d84e5f827cc9ae9c75e5dc85126085" url { src: - "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz" + "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v2.1.0/ocaml-migrate-parsetree-v2.1.0.tbz" checksum: [ - "sha256=7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0" - "sha512=87fdccafae83b0437f1ccd4f3cfbc49e699bc0804596480e0df88510ba33410f31d48c7f677fe72800ed3f442a3a586d82d86aee1d12a964f79892833847b16a" + "sha256=387b788ee4c0537f1fe02c25e05f0335af424828fc6fe940acc0db5948a5a71f" + "sha512=6ac80face6b77531c8d89a77d7a246bd5d43da435c355f62c03c8b8e360e1d7e339c904709fd3dbc9aa340c86ada9a69d5ebcf97cbdb7bd51bec97f831741b99" ] } diff --git a/esy.lock/opam/ocamlbuild.0.14.0/opam b/esy.lock/opam/ocamlbuild.0.14.0/opam deleted file mode 100644 index 8deabee..0000000 --- a/esy.lock/opam/ocamlbuild.0.14.0/opam +++ /dev/null @@ -1,36 +0,0 @@ -opam-version: "2.0" -maintainer: "Gabriel Scherer " -authors: ["Nicolas Pouillard" "Berke Durak"] -homepage: "https://github.com/ocaml/ocamlbuild/" -bug-reports: "https://github.com/ocaml/ocamlbuild/issues" -license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" -doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc" -dev-repo: "git+https://github.com/ocaml/ocamlbuild.git" -build: [ - [ - make - "-f" - "configure.make" - "all" - "OCAMLBUILD_PREFIX=%{prefix}%" - "OCAMLBUILD_BINDIR=%{bin}%" - "OCAMLBUILD_LIBDIR=%{lib}%" - "OCAMLBUILD_MANDIR=%{man}%" - "OCAML_NATIVE=%{ocaml:native}%" - "OCAML_NATIVE_TOOLS=%{ocaml:native}%" - ] - [make "check-if-preinstalled" "all" "opam-install"] -] -conflicts: [ - "base-ocamlbuild" - "ocamlfind" {< "1.6.2"} -] -synopsis: - "OCamlbuild is a build system with builtin rules to easily build most OCaml projects." -depends: [ - "ocaml" {>= "4.03"} -] -url { - src: "https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz" - checksum: "sha256=87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78" -} diff --git a/esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub b/esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub deleted file mode 100644 index e5ad990..0000000 --- a/esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -BINDIR=$(dirname "$(command -v ocamlc)") -"$BINDIR/ocaml" -I "$OCAML_TOPLEVEL_PATH" "$@" diff --git a/esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install b/esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install deleted file mode 100644 index 295c625..0000000 --- a/esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install +++ /dev/null @@ -1,6 +0,0 @@ -bin: [ - "src/findlib/ocamlfind" {"ocamlfind"} - "?src/findlib/ocamlfind_opt" {"ocamlfind"} - "?tools/safe_camlp4" -] -toplevel: ["src/findlib/topfind"] diff --git a/esy.lock/opam/ocamlfind.1.8.1/opam b/esy.lock/opam/ocamlfind.1.9.1/opam similarity index 61% rename from esy.lock/opam/ocamlfind.1.8.1/opam rename to esy.lock/opam/ocamlfind.1.9.1/opam index d757d66..4b6e5c6 100644 --- a/esy.lock/opam/ocamlfind.1.8.1/opam +++ b/esy.lock/opam/ocamlfind.1.9.1/opam @@ -1,10 +1,5 @@ opam-version: "2.0" synopsis: "A library manager for OCaml" -maintainer: "Thomas Gazagnaire " -authors: "Gerd Stolpmann " -homepage: "http://projects.camlcity.org/projects/findlib.html" -bug-reports: "https://gitlab.camlcity.org/gerd/lib-findlib/issues" -dev-repo: "git+https://gitlab.camlcity.org/gerd/lib-findlib.git" description: """ Findlib is a library manager for OCaml. It provides a convention how to store libraries, and a file format ("META") to describe the @@ -12,17 +7,22 @@ properties of libraries. There is also a tool (ocamlfind) for interpreting the META files, so that it is very easy to use libraries in programs and scripts. """ +license: "MIT" +maintainer: "Thomas Gazagnaire " +authors: "Gerd Stolpmann " +homepage: "http://projects.camlcity.org/projects/findlib.html" +bug-reports: "https://github.com/ocaml/ocamlfind/issues" +depends: [ + "ocaml" {>= "4.00.0"} +] +depopts: ["graphics"] build: [ [ "./configure" - "-bindir" - bin - "-sitelib" - lib - "-mandir" - man - "-config" - "%{lib}%/findlib.conf" + "-bindir" bin + "-sitelib" lib + "-mandir" man + "-config" "%{lib}%/findlib.conf" "-no-custom" "-no-camlp4" {!ocaml:preinstalled & ocaml:version >= "4.02.0"} "-no-topfind" {ocaml:preinstalled} @@ -34,17 +34,11 @@ install: [ [make "install"] ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} ] -depends: [ - "ocaml" {>= "4.00.0"} - "conf-m4" {build} -] -extra-files: [ - ["ocamlfind.install" "md5=06f2c282ab52d93aa6adeeadd82a2543"] - ["ocaml-stub" "md5=181f259c9e0bad9ef523e7d4abfdf87a"] -] +dev-repo: "git+https://github.com/ocaml/ocamlfind.git" 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" + src: "http://download.camlcity.org/download/findlib-1.9.1.tar.gz" + checksum: [ + "md5=65e6dc9b305ccbed1267275fe180f538" + "sha512=83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84" + ] } -depopts: ["graphics"] diff --git a/esy.lock/opam/ppxlib.0.22.0/opam b/esy.lock/opam/ppxlib.0.22.0/opam new file mode 100644 index 0000000..049d3d3 --- /dev/null +++ b/esy.lock/opam/ppxlib.0.22.0/opam @@ -0,0 +1,59 @@ +opam-version: "2.0" +synopsis: "Standard library for ppx rewriters" +description: """ +Ppxlib is the standard library for ppx rewriters and other programs +that manipulate the in-memory reprensation of OCaml programs, a.k.a +the "Parsetree". + +It also comes bundled with two ppx rewriters that are commonly used to +write tools that manipulate and/or generate Parsetree values; +`ppxlib.metaquot` which allows to construct Parsetree values using the +OCaml syntax directly and `ppxlib.traverse` which provides various +ways of automatically traversing values of a given type, in particular +allowing to inject a complex structured value into generated code. +""" +maintainer: ["opensource@janestreet.com"] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml-ppx/ppxlib" +doc: "https://ocaml-ppx.github.io/ppxlib/" +bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues" +depends: [ + "dune" {>= "2.7"} + "ocaml" {>= "4.04.1" & < "4.13"} + "ocaml-compiler-libs" {>= "v0.11.0"} + "ocaml-migrate-parsetree" {>= "2.1.0"} + "ppx_derivers" {>= "1.0"} + "sexplib0" + "stdlib-shims" + "ocamlfind" {with-test} + "re" {with-test & >= "1.9.0"} + "cinaps" {with-test & >= "v0.12.1"} + "base" {with-test} + "stdio" {with-test} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git" +x-commit-hash: "06a2c9bdad8c1d3361a3d9430e9bf58476b08590" +url { + src: + "https://github.com/ocaml-ppx/ppxlib/releases/download/0.22.0/ppxlib-0.22.0.tbz" + checksum: [ + "sha256=3eeb91e03966662284a3222e612dee7f4fa2b7637c53d9572d2a74134bb96d7a" + "sha512=425051dff9df53579a6edd17369d66c10f87a78daeddf1691e50997990ed643e874fcc6a30112a4dacbfd2d0097a19445354e04cd920d9522f76c51cdbc7f1db" + ] +} diff --git a/esy.lock/opam/re.1.9.0/opam b/esy.lock/opam/re.1.9.0/opam deleted file mode 100644 index f798754..0000000 --- a/esy.lock/opam/re.1.9.0/opam +++ /dev/null @@ -1,42 +0,0 @@ -opam-version: "2.0" - -maintainer: "rudi.grinberg@gmail.com" -authors: [ - "Jerome Vouillon" - "Thomas Gazagnaire" - "Anil Madhavapeddy" - "Rudi Grinberg" - "Gabriel Radanne" -] -license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" -homepage: "https://github.com/ocaml/ocaml-re" -bug-reports: "https://github.com/ocaml/ocaml-re/issues" -dev-repo: "git+https://github.com/ocaml/ocaml-re.git" - -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] - -depends: [ - "ocaml" {>= "4.02"} - "dune" - "ounit" {with-test} - "seq" -] - -synopsis: "RE is a regular expression library for OCaml" -description: """ -Pure OCaml regular expressions with: -* Perl-style regular expressions (module Re.Perl) -* Posix extended regular expressions (module Re.Posix) -* Emacs-style regular expressions (module Re.Emacs) -* Shell-style file globbing (module Re.Glob) -* Compatibility layer for OCaml's built-in Str module (module Re.Str) -""" -url { - src: - "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz" - checksum: "md5=bddaed4f386a22cace7850c9c7dac296" -} diff --git a/esy.lock/opam/reason.3.7.0/opam b/esy.lock/opam/reason.3.7.0/opam new file mode 100644 index 0000000..1ad963a --- /dev/null +++ b/esy.lock/opam/reason.3.7.0/opam @@ -0,0 +1,31 @@ +opam-version: "2.0" +maintainer: "Jordan Walke " +authors: [ "Jordan Walke " ] +license: "MIT" +homepage: "https://github.com/facebook/reason" +doc: "http://reasonml.github.io/" +bug-reports: "https://github.com/facebook/reason/issues" +dev-repo: "git://github.com/facebook/reason.git" +tags: [ "syntax" ] +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.03" & < "4.13"} + "dune" {>= "1.4"} + "ocamlfind" {build} + "menhir" {>= "20170418"} + "merlin-extend" {>= "0.6"} + "ppx_derivers" {< "2.0"} + "fix" + "result" +] +synopsis: "Reason: Syntax & Toolchain for OCaml" +description: """ +Reason gives OCaml a new syntax that is remniscient of languages like +JavaScript. It's also the umbrella project for a set of tools for the OCaml & +JavaScript ecosystem.""" +url { + src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.7.0.tgz" + checksum: "md5=7eb8cbbff8565b93ebfabf4eca7254d4" +} diff --git a/esy.lock/opam/result.1.4/opam b/esy.lock/opam/result.1.5/opam similarity index 83% rename from esy.lock/opam/result.1.4/opam rename to esy.lock/opam/result.1.5/opam index b44aeea..671af04 100644 --- a/esy.lock/opam/result.1.4/opam +++ b/esy.lock/opam/result.1.5/opam @@ -17,6 +17,6 @@ while staying compatible with older version of OCaml should use the Result module defined in this library.""" url { src: - "https://github.com/janestreet/result/archive/1.4.tar.gz" - checksum: "md5=d3162dbc501a2af65c8c71e0866541da" + "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz" + checksum: "md5=1b82dec78849680b49ae9a8a365b831b" } diff --git a/esy.lock/opam/seq.0.2.2/opam b/esy.lock/opam/seq.0.2.2/opam deleted file mode 100644 index 5ed5165..0000000 --- a/esy.lock/opam/seq.0.2.2/opam +++ /dev/null @@ -1,24 +0,0 @@ -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/sexplib0.v0.14.0/opam b/esy.lock/opam/sexplib0.v0.14.0/opam new file mode 100644 index 0000000..f7afcef --- /dev/null +++ b/esy.lock/opam/sexplib0.v0.14.0/opam @@ -0,0 +1,26 @@ +opam-version: "2.0" +maintainer: "opensource@janestreet.com" +authors: ["Jane Street Group, LLC "] +homepage: "https://github.com/janestreet/sexplib0" +bug-reports: "https://github.com/janestreet/sexplib0/issues" +dev-repo: "git+https://github.com/janestreet/sexplib0.git" +doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/sexplib0/index.html" +license: "MIT" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.04.2"} + "dune" {>= "2.0.0"} +] +synopsis: "Library containing the definition of S-expressions and some base converters" +description: " +Part of Jane Street's Core library +The Core suite of libraries is an industrial strength alternative to +OCaml's standard library that was developed by Jane Street, the +largest industrial user of OCaml. +" +url { + src: "https://ocaml.janestreet.com/ocaml-core/v0.14/files/sexplib0-v0.14.0.tar.gz" + checksum: "md5=37aff0af8f8f6f759249475684aebdc4" +} diff --git a/esy.lock/opam/stdlib-shims.0.3.0/opam b/esy.lock/opam/stdlib-shims.0.3.0/opam new file mode 100644 index 0000000..d657e04 --- /dev/null +++ b/esy.lock/opam/stdlib-shims.0.3.0/opam @@ -0,0 +1,31 @@ +opam-version: "2.0" +maintainer: "The stdlib-shims programmers" +authors: "The stdlib-shims programmers" +homepage: "https://github.com/ocaml/stdlib-shims" +doc: "https://ocaml.github.io/stdlib-shims/" +dev-repo: "git+https://github.com/ocaml/stdlib-shims.git" +bug-reports: "https://github.com/ocaml/stdlib-shims/issues" +tags: ["stdlib" "compatibility" "org:ocaml"] +license: ["typeof OCaml system"] +depends: [ + "dune" + "ocaml" {>= "4.02.3"} +] +build: [ "dune" "build" "-p" name "-j" jobs ] +synopsis: "Backport some of the new stdlib features to older compiler" +description: """ +Backport some of the new stdlib features to older compiler, +such as the Stdlib module. + +This allows projects that require compatibility with older compiler to +use these new features in their code. +""" +x-commit-hash: "fb6815e5d745f07fd567c11671149de6ef2e74c8" +url { + src: + "https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz" + checksum: [ + "sha256=babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a" + "sha512=1151d7edc8923516e9a36995a3f8938d323aaade759ad349ed15d6d8501db61ffbe63277e97c4d86149cf371306ac23df0f581ec7e02611f58335126e1870980" + ] +} diff --git a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch b/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch deleted file mode 100644 index 4d5bea0..0000000 --- a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch +++ /dev/null @@ -1,463 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -213,7 +213,7 @@ - rm -f man/ocamlbuild.1 - - man/options_man.byte: src/ocamlbuild_pack.cmo -- $(OCAMLC) $^ -I src man/options_man.ml -o man/options_man.byte -+ $(OCAMLC) -I +unix unix.cma $^ -I src man/options_man.ml -o man/options_man.byte - - clean:: - rm -f man/options_man.cm* ---- ./src/command.ml -+++ ./src/command.ml -@@ -148,9 +148,10 @@ - let self = string_of_command_spec_with_calls call_with_tags call_with_target resolve_virtuals in - let b = Buffer.create 256 in - (* The best way to prevent bash from switching to its windows-style -- * quote-handling is to prepend an empty string before the command name. *) -+ * quote-handling is to prepend an empty string before the command name. -+ * space seems to work, too - and the ouput is nicer *) - if Sys.os_type = "Win32" then -- Buffer.add_string b "''"; -+ Buffer.add_char b ' '; - let first = ref true in - let put_space () = - if !first then -@@ -260,7 +261,7 @@ - - let execute_many ?(quiet=false) ?(pretend=false) cmds = - add_parallel_stat (List.length cmds); -- let degraded = !*My_unix.is_degraded || Sys.os_type = "Win32" in -+ let degraded = !*My_unix.is_degraded in - let jobs = !jobs in - if jobs < 0 then invalid_arg "jobs < 0"; - let max_jobs = if jobs = 0 then None else Some jobs in ---- ./src/findlib.ml -+++ ./src/findlib.ml -@@ -66,9 +66,6 @@ - (fun command -> lexer & Lexing.from_string & run_and_read command) - command - --let run_and_read command = -- Printf.ksprintf run_and_read command -- - let rec query name = - try - Hashtbl.find packages name -@@ -135,7 +132,8 @@ - with Not_found -> s - - let list () = -- List.map before_space (split_nl & run_and_read "%s list" ocamlfind) -+ let cmd = Shell.quote_filename_if_needed ocamlfind ^ " list" in -+ List.map before_space (split_nl & run_and_read cmd) - - (* The closure algorithm is easy because the dependencies are already closed - and sorted for each package. We only have to make the union. We could also ---- ./src/main.ml -+++ ./src/main.ml -@@ -162,6 +162,9 @@ - Tags.mem "traverse" tags - || List.exists (Pathname.is_prefix path_name) !Options.include_dirs - || List.exists (Pathname.is_prefix path_name) target_dirs) -+ && ((* beware: !Options.build_dir is an absolute directory *) -+ Pathname.normalize !Options.build_dir -+ <> Pathname.normalize (Pathname.pwd/path_name)) - end - end - end ---- ./src/my_std.ml -+++ ./src/my_std.ml -@@ -271,13 +271,107 @@ - try Array.iter (fun x -> if x = basename then raise Exit) a; false - with Exit -> true - -+let command_plain = function -+| [| |] -> 0 -+| margv -> -+ let rec waitpid a b = -+ match Unix.waitpid a b with -+ | exception (Unix.Unix_error(Unix.EINTR,_,_)) -> waitpid a b -+ | x -> x -+ in -+ let pid = Unix.(create_process margv.(0) margv stdin stdout stderr) in -+ let pid', process_status = waitpid [] pid in -+ assert (pid = pid'); -+ match process_status with -+ | Unix.WEXITED n -> n -+ | Unix.WSIGNALED _ -> 2 (* like OCaml's uncaught exceptions *) -+ | Unix.WSTOPPED _ -> 127 -+ -+(* can't use Lexers because of circular dependency *) -+let split_path_win str = -+ let rec aux pos = -+ try -+ let i = String.index_from str pos ';' in -+ let len = i - pos in -+ if len = 0 then -+ aux (succ i) -+ else -+ String.sub str pos (i - pos) :: aux (succ i) -+ with Not_found | Invalid_argument _ -> -+ let len = String.length str - pos in -+ if len = 0 then [] else [String.sub str pos len] -+ in -+ aux 0 -+ -+let windows_shell = lazy begin -+ let rec iter = function -+ | [] -> [| "bash.exe" ; "--norc" ; "--noprofile" |] -+ | hd::tl -> -+ let dash = Filename.concat hd "dash.exe" in -+ if Sys.file_exists dash then [|dash|] else -+ let bash = Filename.concat hd "bash.exe" in -+ if Sys.file_exists bash = false then iter tl else -+ (* if sh.exe and bash.exe exist in the same dir, choose sh.exe *) -+ let sh = Filename.concat hd "sh.exe" in -+ if Sys.file_exists sh then [|sh|] else [|bash ; "--norc" ; "--noprofile"|] -+ in -+ split_path_win (try Sys.getenv "PATH" with Not_found -> "") |> iter -+end -+ -+let prep_windows_cmd cmd = -+ (* workaround known ocaml bug, remove later *) -+ if String.contains cmd '\t' && String.contains cmd ' ' = false then -+ " " ^ cmd -+ else -+ cmd -+ -+let run_with_shell = function -+| "" -> 0 -+| cmd -> -+ let cmd = prep_windows_cmd cmd in -+ let shell = Lazy.force windows_shell in -+ let qlen = Filename.quote cmd |> String.length in -+ (* old versions of dash had problems with bs *) -+ try -+ if qlen < 7_900 then -+ command_plain (Array.append shell [| "-ec" ; cmd |]) -+ else begin -+ (* it can still work, if the called command is a cygwin tool *) -+ let ch_closed = ref false in -+ let file_deleted = ref false in -+ let fln,ch = -+ Filename.open_temp_file -+ ~mode:[Open_binary] -+ "ocamlbuildtmp" -+ ".sh" -+ in -+ try -+ let f_slash = String.map ( fun x -> if x = '\\' then '/' else x ) fln in -+ output_string ch cmd; -+ ch_closed:= true; -+ close_out ch; -+ let ret = command_plain (Array.append shell [| "-e" ; f_slash |]) in -+ file_deleted:= true; -+ Sys.remove fln; -+ ret -+ with -+ | x -> -+ if !ch_closed = false then -+ close_out_noerr ch; -+ if !file_deleted = false then -+ (try Sys.remove fln with _ -> ()); -+ raise x -+ end -+ with -+ | (Unix.Unix_error _) as x -> -+ (* Sys.command doesn't raise an exception, so run_with_shell also won't -+ raise *) -+ Printexc.to_string x ^ ":" ^ cmd |> prerr_endline; -+ 1 -+ - let sys_command = -- match Sys.os_type with -- | "Win32" -> fun cmd -> -- if cmd = "" then 0 else -- let cmd = "bash --norc -c " ^ Filename.quote cmd in -- Sys.command cmd -- | _ -> fun cmd -> if cmd = "" then 0 else Sys.command cmd -+ if Sys.win32 then run_with_shell -+ else fun cmd -> if cmd = "" then 0 else Sys.command cmd - - (* FIXME warning fix and use Filename.concat *) - let filename_concat x y = ---- ./src/my_std.mli -+++ ./src/my_std.mli -@@ -69,3 +69,6 @@ - - val split_ocaml_version : (int * int * int * string) option - (** (major, minor, patchlevel, rest) *) -+ -+val windows_shell : string array Lazy.t -+val prep_windows_cmd : string -> string ---- ./src/ocamlbuild_executor.ml -+++ ./src/ocamlbuild_executor.ml -@@ -34,6 +34,8 @@ - job_stdin : out_channel; - job_stderr : in_channel; - job_buffer : Buffer.t; -+ job_pid : int; -+ job_tmp_file: string option; - mutable job_dying : bool; - };; - -@@ -76,6 +78,61 @@ - in - loop 0 - ;; -+ -+let open_process_full_win cmd env = -+ let (in_read, in_write) = Unix.pipe () in -+ let (out_read, out_write) = Unix.pipe () in -+ let (err_read, err_write) = Unix.pipe () in -+ Unix.set_close_on_exec in_read; -+ Unix.set_close_on_exec out_write; -+ Unix.set_close_on_exec err_read; -+ let inchan = Unix.in_channel_of_descr in_read in -+ let outchan = Unix.out_channel_of_descr out_write in -+ let errchan = Unix.in_channel_of_descr err_read in -+ let shell = Lazy.force Ocamlbuild_pack.My_std.windows_shell in -+ let test_cmd = -+ String.concat " " (List.map Filename.quote (Array.to_list shell)) ^ -+ "-ec " ^ -+ Filename.quote (Ocamlbuild_pack.My_std.prep_windows_cmd cmd) in -+ let argv,tmp_file = -+ if String.length test_cmd < 7_900 then -+ Array.append -+ shell -+ [| "-ec" ; Ocamlbuild_pack.My_std.prep_windows_cmd cmd |],None -+ else -+ let fln,ch = Filename.open_temp_file ~mode:[Open_binary] "ocamlbuild" ".sh" in -+ output_string ch (Ocamlbuild_pack.My_std.prep_windows_cmd cmd); -+ close_out ch; -+ let fln' = String.map (function '\\' -> '/' | c -> c) fln in -+ Array.append -+ shell -+ [| "-c" ; fln' |], Some fln in -+ let pid = -+ Unix.create_process_env argv.(0) argv env out_read in_write err_write in -+ Unix.close out_read; -+ Unix.close in_write; -+ Unix.close err_write; -+ (pid, inchan, outchan, errchan,tmp_file) -+ -+let close_process_full_win (pid,inchan, outchan, errchan, tmp_file) = -+ let delete tmp_file = -+ match tmp_file with -+ | None -> () -+ | Some x -> try Sys.remove x with Sys_error _ -> () in -+ let tmp_file_deleted = ref false in -+ try -+ close_in inchan; -+ close_out outchan; -+ close_in errchan; -+ let res = snd(Unix.waitpid [] pid) in -+ tmp_file_deleted := true; -+ delete tmp_file; -+ res -+ with -+ | x when tmp_file <> None && !tmp_file_deleted = false -> -+ delete tmp_file; -+ raise x -+ - (* ***) - (*** execute *) - (* XXX: Add test for non reentrancy *) -@@ -130,10 +187,16 @@ - (*** add_job *) - let add_job cmd rest result id = - (*display begin fun oc -> fp oc "Job %a is %s\n%!" print_job_id id cmd; end;*) -- let (stdout', stdin', stderr') = open_process_full cmd env in -+ let (pid,stdout', stdin', stderr', tmp_file) = -+ if Sys.win32 then open_process_full_win cmd env else -+ let a,b,c = open_process_full cmd env in -+ -1,a,b,c,None -+ in - incr jobs_active; -- set_nonblock (doi stdout'); -- set_nonblock (doi stderr'); -+ if not Sys.win32 then ( -+ set_nonblock (doi stdout'); -+ set_nonblock (doi stderr'); -+ ); - let job = - { job_id = id; - job_command = cmd; -@@ -143,7 +206,9 @@ - job_stdin = stdin'; - job_stderr = stderr'; - job_buffer = Buffer.create 1024; -- job_dying = false } -+ job_dying = false; -+ job_tmp_file = tmp_file; -+ job_pid = pid } - in - outputs := FDM.add (doi stdout') job (FDM.add (doi stderr') job !outputs); - jobs := JS.add job !jobs; -@@ -199,6 +264,7 @@ - try - read fd u 0 (Bytes.length u) - with -+ | Unix.Unix_error(Unix.EPIPE,_,_) when Sys.win32 -> 0 - | Unix.Unix_error(e,_,_) -> - let msg = error_message e in - display (fun oc -> fp oc -@@ -241,14 +307,19 @@ - decr jobs_active; - - (* PR#5371: we would get EAGAIN below otherwise *) -- clear_nonblock (doi job.job_stdout); -- clear_nonblock (doi job.job_stderr); -- -+ if not Sys.win32 then ( -+ clear_nonblock (doi job.job_stdout); -+ clear_nonblock (doi job.job_stderr); -+ ); - do_read ~loop:true (doi job.job_stdout) job; - do_read ~loop:true (doi job.job_stderr) job; - outputs := FDM.remove (doi job.job_stdout) (FDM.remove (doi job.job_stderr) !outputs); - jobs := JS.remove job !jobs; -- let status = close_process_full (job.job_stdout, job.job_stdin, job.job_stderr) in -+ let status = -+ if Sys.win32 then -+ close_process_full_win (job.job_pid, job.job_stdout, job.job_stdin, job.job_stderr, job.job_tmp_file) -+ else -+ close_process_full (job.job_stdout, job.job_stdin, job.job_stderr) in - - let shown = ref false in - ---- ./src/ocamlbuild_unix_plugin.ml -+++ ./src/ocamlbuild_unix_plugin.ml -@@ -48,12 +48,22 @@ - end - - let run_and_open s kont = -+ let s_orig = s in -+ let s = -+ (* Be consistent! My_unix.run_and_open uses My_std.sys_command and -+ sys_command uses bash. *) -+ if Sys.win32 = false then s else -+ let l = match Lazy.force My_std.windows_shell |> Array.to_list with -+ | hd::tl -> (Filename.quote hd)::tl -+ | _ -> assert false in -+ "\"" ^ (String.concat " " l) ^ " -ec " ^ Filename.quote (" " ^ s) ^ "\"" -+ in - let ic = Unix.open_process_in s in - let close () = - match Unix.close_process_in ic with - | Unix.WEXITED 0 -> () - | Unix.WEXITED _ | Unix.WSIGNALED _ | Unix.WSTOPPED _ -> -- failwith (Printf.sprintf "Error while running: %s" s) in -+ failwith (Printf.sprintf "Error while running: %s" s_orig) in - let res = try - kont ic - with e -> (close (); raise e) ---- ./src/options.ml -+++ ./src/options.ml -@@ -174,11 +174,24 @@ - build_dir := Filename.concat (Sys.getcwd ()) s - else - build_dir := s -+ -+let slashify = -+ if Sys.win32 then fun p -> String.map (function '\\' -> '/' | x -> x) p -+ else fun p ->p -+ -+let sb () = -+ match Sys.os_type with -+ | "Win32" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ | _ -> () -+ -+ - let spec = ref ( - let print_version () = -+ sb (); - Printf.printf "ocamlbuild %s\n%!" Ocamlbuild_config.version; raise Exit_OK - in -- let print_vnum () = print_endline Ocamlbuild_config.version; raise Exit_OK in -+ let print_vnum () = sb (); print_endline Ocamlbuild_config.version; raise Exit_OK in - Arg.align - [ - "-version", Unit print_version , " Display the version"; -@@ -257,8 +270,8 @@ - "-build-dir", String set_build_dir, " Set build directory (implies no-links)"; - "-install-lib-dir", Set_string Ocamlbuild_where.libdir, " Set the install library directory"; - "-install-bin-dir", Set_string Ocamlbuild_where.bindir, " Set the install binary directory"; -- "-where", Unit (fun () -> print_endline !Ocamlbuild_where.libdir; raise Exit_OK), " Display the install library directory"; -- "-which", String (fun cmd -> print_endline (find_tool cmd); raise Exit_OK), " Display path to the tool command"; -+ "-where", Unit (fun () -> sb (); print_endline (slashify !Ocamlbuild_where.libdir); raise Exit_OK), " Display the install library directory"; -+ "-which", String (fun cmd -> sb (); print_endline (slashify (find_tool cmd)); raise Exit_OK), " Display path to the tool command"; - "-ocamlc", set_cmd ocamlc, " Set the OCaml bytecode compiler"; - "-plugin-ocamlc", set_cmd plugin_ocamlc, " Set the OCaml bytecode compiler \ - used when building myocamlbuild.ml (only)"; ---- ./src/pathname.ml -+++ ./src/pathname.ml -@@ -84,6 +84,26 @@ - | x :: xs -> x :: normalize_list xs - - let normalize x = -+ let x = -+ if Sys.win32 = false then -+ x -+ else -+ let len = String.length x in -+ let b = Bytes.create len in -+ for i = 0 to pred len do -+ match x.[i] with -+ | '\\' -> Bytes.set b i '/' -+ | c -> Bytes.set b i c -+ done; -+ if len > 1 then ( -+ let c1 = Bytes.get b 0 in -+ let c2 = Bytes.get b 1 in -+ if c2 = ':' && c1 >= 'a' && c1 <= 'z' && -+ ( len = 2 || Bytes.get b 2 = '/') then -+ Bytes.set b 0 (Char.uppercase_ascii c1) -+ ); -+ Bytes.unsafe_to_string b -+ in - if Glob.eval not_normal_form_re x then - let root, paths = split x in - join root (normalize_list paths) ---- ./src/shell.ml -+++ ./src/shell.ml -@@ -24,12 +24,26 @@ - | 'a'..'z' | 'A'..'Z' | '0'..'9' | '.' | '-' | '/' | '_' | ':' | '@' | '+' | ',' -> loop (pos + 1) - | _ -> false in - loop 0 -+ -+let generic_quote quotequote s = -+ let l = String.length s in -+ let b = Buffer.create (l + 20) in -+ Buffer.add_char b '\''; -+ for i = 0 to l - 1 do -+ if s.[i] = '\'' -+ then Buffer.add_string b quotequote -+ else Buffer.add_char b s.[i] -+ done; -+ Buffer.add_char b '\''; -+ Buffer.contents b -+let unix_quote = generic_quote "'\\''" -+ - let quote_filename_if_needed s = - if is_simple_filename s then s - (* We should probably be using [Filename.unix_quote] except that function - * isn't exported. Users on Windows will have to live with not being able to - * install OCaml into c:\o'caml. Too bad. *) -- else if Sys.os_type = "Win32" then Printf.sprintf "'%s'" s -+ else if Sys.os_type = "Win32" then unix_quote s - else Filename.quote s - let chdir dir = - reset_filesys_cache (); -@@ -37,7 +51,7 @@ - let run args target = - reset_readdir_cache (); - let cmd = String.concat " " (List.map quote_filename_if_needed args) in -- if !*My_unix.is_degraded || Sys.os_type = "Win32" then -+ if !*My_unix.is_degraded then - begin - Log.event cmd target Tags.empty; - let st = sys_command cmd in diff --git a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json deleted file mode 100644 index b24be7b..0000000 --- a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "build": [ - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < ocamlbuild-0.14.0.patch' : 'true'}" - ], - [ - "make", - "-f", - "configure.make", - "all", - "OCAMLBUILD_PREFIX=#{self.install}", - "OCAMLBUILD_BINDIR=#{self.bin}", - "OCAMLBUILD_LIBDIR=#{self.lib}", - "OCAMLBUILD_MANDIR=#{self.man}", - "OCAMLBUILD_NATIVE=true", - "OCAMLBUILD_NATIVE_TOOLS=true" - ], - [ - "make", - "check-if-preinstalled", - "all", - "#{os == 'windows' ? 'install' : 'opam-install'}" - ] - ] -} diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/files/findlib-1.9.1.patch similarity index 100% rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/files/findlib-1.9.1.patch diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/package.json similarity index 92% rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/package.json index 9314f87..741211a 100644 --- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json +++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/package.json @@ -3,7 +3,7 @@ [ "bash", "-c", - "#{os == 'windows' ? 'patch -p1 < findlib-1.8.1.patch' : 'true'}" + "#{os == 'windows' ? 'patch -p1 < findlib-1.9.1.patch' : 'true'}" ], [ "./configure", From 1a553622e72a42302565b2733f6c9d6ae2552179 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 2 Apr 2021 18:21:39 -0700 Subject: [PATCH 2/2] Convert to ppxlib --- bin/Bin.re | 5 ++-- src/Let_anything.re | 62 +++++++++++++++++++++++++++------------------ src/dune | 3 ++- 3 files changed, 41 insertions(+), 29 deletions(-) diff --git a/bin/Bin.re b/bin/Bin.re index 1a69661..69767a5 100644 --- a/bin/Bin.re +++ b/bin/Bin.re @@ -1,4 +1,3 @@ -open Migrate_parsetree; -open Let_anything_lib; +open Ppxlib; -let _ = Driver.run_as_ppx_rewriter(); +let _ = Driver.standalone(); diff --git a/src/Let_anything.re b/src/Let_anything.re index 6ff43c5..91d2fdd 100644 --- a/src/Let_anything.re +++ b/src/Let_anything.re @@ -4,14 +4,23 @@ RANDLE, JOSH ROBERTSON, OR OTHER MEMEBERS OF THE BLOOM BUILT TEAM. */ -open Migrate_parsetree; -open Ast_406; +open Ppxlib; /* * https://ocsigen.org/lwt/dev/api/Ppx_lwt * https://github.com/zepalmer/ocaml-monadic */ -let fail = (loc, txt) => raise(Location.Error(Location.error(~loc, txt))); +let fail = (loc, txt) => Location.raise_errorf(~loc, txt); + +let mkloc = (txt, loc) => { + {Location.txt, loc}; +}; + +let lid_last = fun + | Lident(s) => s + | Ldot(_, s) => s + | Lapply(_, _) => failwith("lid_last on functor application") + let rec process_bindings = (bindings, ident) => Parsetree.( @@ -29,7 +38,7 @@ let rec process_bindings = (bindings, ident) => ~loc=binding.pvb_loc, Ast_helper.Exp.ident( ~loc=binding.pvb_loc, - Location.mkloc(Longident.Ldot(ident, "and_"), binding.pvb_loc), + mkloc(Longident.Ldot(ident, "and_"), binding.pvb_loc), ), [(Nolabel, binding.pvb_expr), (Nolabel, expr)], ), @@ -50,10 +59,12 @@ let parseLongident = txt => { loop(None, parts); }; -let mapper = (_config, _cookies) => { - ...Ast_mapper.default_mapper, - /* TODO throw error on structure items */ - expr: (mapper, expr) => +class mapper = { + as _; + inherit class Ast_traverse.map as super; + + pub! expression = expr => { + /* TODO throw error on structure items */ switch (expr.pexp_desc) { | Pexp_extension(( {txt, loc}, @@ -63,15 +74,15 @@ let mapper = (_config, _cookies) => { Pstr_eval( {pexp_loc, pexp_desc: Pexp_try(value, handlers), _}, _attributes, - ), + ), _ }, ]), )) => let ident = parseLongident(txt); - let last = Longident.last(ident); + let last = lid_last(ident); if (last != String.capitalize_ascii(last)) { - Ast_mapper.default_mapper.expr(mapper, expr); + super#expression(expr); } else { let handlerLocStart = List.hd(handlers).pc_lhs.ppat_loc; let handlerLocEnd = @@ -80,13 +91,13 @@ let mapper = (_config, _cookies) => { let try_ = Ast_helper.Exp.ident( ~loc=pexp_loc, - Location.mkloc(Longident.Ldot(ident, "try_"), loc), + mkloc(Longident.Ldot(ident, "try_"), loc), ); Ast_helper.Exp.apply( ~loc, try_, [ - (Nolabel, mapper.expr(mapper, value)), + (Nolabel, super#expression(value)), (Nolabel, Ast_helper.Exp.function_(~loc=handlerLoc, handlers)), ], ); @@ -105,21 +116,21 @@ let mapper = (_config, _cookies) => { ]), )) => let ident = parseLongident(txt); - let last = Longident.last(ident); + let last = lid_last(ident); if (last != String.capitalize_ascii(last)) { - Ast_mapper.default_mapper.expr(mapper, expr); + super#expression(expr); } else { let (pat, expr) = process_bindings(bindings, ident); let let_ = Ast_helper.Exp.ident( ~loc, - Location.mkloc(Longident.Ldot(ident, "let_"), loc), + mkloc(Longident.Ldot(ident, "let_"), loc), ); Ast_helper.Exp.apply( ~loc, let_, [ - (Nolabel, mapper.expr(mapper, expr)), + (Nolabel, super#expression(expr)), ( Nolabel, Ast_helper.Exp.fun_( @@ -127,20 +138,21 @@ let mapper = (_config, _cookies) => { Nolabel, None, pat, - mapper.expr(mapper, continuation), + super#expression(continuation), ), ), ], ); }; - | _ => Ast_mapper.default_mapper.expr(mapper, expr) - }, + | _ => super#expression(expr) + }; + }; }; +let structure_mapper = s => (new mapper)#structure(s); + let () = - Migrate_parsetree.Driver.register( - ~name="let-anything", - ~args=[], - Migrate_parsetree.Versions.ocaml_406, - mapper, + Ppxlib.Driver.register_transformation( + ~preprocess_impl=structure_mapper, + "let-anything", ); diff --git a/src/dune b/src/dune index d5c40fc..c37ec6d 100644 --- a/src/dune +++ b/src/dune @@ -1,3 +1,4 @@ (library (name let_anything_lib) - (libraries ocaml-migrate-parsetree str)) + (libraries ppxlib str) + (preprocess (pps ppxlib.metaquot)))