From 0b920431372119d92b0077f51b91ca745fbfde87 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Mon, 8 Mar 2021 22:40:44 -0500 Subject: [PATCH] fix: Module.optimize on macOS (#77) --- binaryen.opam | 1 + esy.lock/index.json | 602 +++++++++--------- .../opam/{base.v0.14.0 => base.v0.14.1}/opam | 6 +- esy.lock/opam/{cppo.1.6.6 => cppo.1.6.7}/opam | 12 +- .../opam/{csexp.1.3.2 => csexp.1.4.0}/opam | 8 +- esy.lock/opam/dot-merlin-reader.3.4.2/opam | 28 - esy.lock/opam/dot-merlin-reader.4.1/opam | 30 + .../opam | 10 +- .../opam | 10 +- esy.lock/opam/{dune.2.7.1 => dune.2.8.2}/opam | 10 +- .../opam/{fix.20200131 => fix.20201120}/opam | 8 +- .../opam | 10 +- .../opam | 8 +- .../opam | 10 +- .../{menhir.20200624 => menhir.20201216}/opam | 6 +- .../opam | 6 +- .../opam | 6 +- .../opam | 13 +- esy.lock/opam/ocamlfind.1.8.1/opam | 16 +- esy.lock/opam/ocamlformat.0.15.1/opam | 2 +- esy.lock/opam/odoc.1.5.2/opam | 4 +- .../{ppxlib.0.20.0 => ppxlib.0.21.0}/opam | 13 +- .../opam | 11 +- .../files/build.sh | 10 - .../package.json | 8 - package.json | 3 +- src/config/dune | 8 + src/config/library_flags.ml | 17 + src/dune | 2 + test/test.expected | 20 + test/test.ml | 6 + 31 files changed, 481 insertions(+), 423 deletions(-) rename esy.lock/opam/{base.v0.14.0 => base.v0.14.1}/opam (86%) rename esy.lock/opam/{cppo.1.6.6 => cppo.1.6.7}/opam (64%) rename esy.lock/opam/{csexp.1.3.2 => csexp.1.4.0}/opam (80%) delete mode 100644 esy.lock/opam/dot-merlin-reader.3.4.2/opam create mode 100644 esy.lock/opam/dot-merlin-reader.4.1/opam rename esy.lock/opam/{dune-build-info.2.7.1 => dune-build-info.2.8.2}/opam (72%) rename esy.lock/opam/{dune-configurator.2.7.1 => dune-configurator.2.8.2}/opam (73%) rename esy.lock/opam/{dune.2.7.1 => dune.2.8.2}/opam (82%) rename esy.lock/opam/{fix.20200131 => fix.20201120}/opam (62%) rename esy.lock/opam/{js_of_ocaml-compiler.3.8.0 => js_of_ocaml-compiler.3.9.1}/opam (73%) rename esy.lock/opam/{js_of_ocaml-ppx.3.8.0 => js_of_ocaml-ppx.3.9.0}/opam (71%) rename esy.lock/opam/{js_of_ocaml.3.8.0 => js_of_ocaml.3.9.0}/opam (67%) rename esy.lock/opam/{menhir.20200624 => menhir.20201216}/opam (69%) rename esy.lock/opam/{menhirLib.20200624 => menhirLib.20201216}/opam (70%) rename esy.lock/opam/{menhirSdk.20200624 => menhirSdk.20201216}/opam (70%) rename esy.lock/opam/{ocaml-lsp-server.1.2.0 => ocaml-lsp-server.1.4.0}/opam (69%) rename esy.lock/opam/{ppxlib.0.20.0 => ppxlib.0.21.0}/opam (74%) rename esy.lock/opam/{stdlib-shims.0.1.0 => stdlib-shims.0.3.0}/opam (67%) delete mode 100644 esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh delete mode 100644 esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json create mode 100644 src/config/dune create mode 100644 src/config/library_flags.ml diff --git a/binaryen.opam b/binaryen.opam index 77389ba8..ab297aa1 100644 --- a/binaryen.opam +++ b/binaryen.opam @@ -14,6 +14,7 @@ build: [ depends: [ "ocaml" {>= "4.09"} "dune" {>= "2.7.1"} + "dune-configurator" {>= "2.7.1"} "js_of_ocaml" {>= "3.6.0"} "js_of_ocaml-ppx" {>= "3.6.0"} "js_of_ocaml-compiler" {>= "3.6.0"} diff --git a/esy.lock/index.json b/esy.lock/index.json index 894cfa31..301deb40 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,15 +1,15 @@ { - "checksum": "3b0f77da6026c615c6e76750400012d9", + "checksum": "fb3af8b2e76b4fd41f8d05a5c27aae38", "root": "@grain/binaryen.ml@link-dev:./package.json", "node": { - "ocaml@4.11.1000@d41d8cd9": { - "id": "ocaml@4.11.1000@d41d8cd9", + "ocaml@4.11.2000@d41d8cd9": { + "id": "ocaml@4.11.2000@d41d8cd9", "name": "ocaml", - "version": "4.11.1000", + "version": "4.11.2000", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.11.1000.tgz#sha1:a46c81076f3ed073de0d90351addc8a0bb87825f" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.11.2000.tgz#sha1:ca152b7819a4dc9c00e2a9f788f8e62ddddef51d" ] }, "overrides": [], @@ -50,14 +50,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.11.2000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/cppo@opam:1.6.7@c28ac3ae", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399" + "ocaml@4.11.2000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -78,15 +78,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "ocaml@4.11.2000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.4@93208aac", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + "ocaml@4.11.2000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, "@opam/uuseg@opam:13.0.0@f60712a7": { @@ -107,15 +107,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.2000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.4@93208aac", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uucp@opam:13.0.0@e9b515e0" + "ocaml@4.11.2000@d41d8cd9", "@opam/uucp@opam:13.0.0@e9b515e0" ] }, "@opam/uucp@opam:13.0.0@e9b515e0": { @@ -136,14 +136,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.2000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.4@93208aac", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.2000@d41d8cd9" ] }, "@opam/uchar@opam:0.0.2@c8218eea": { "id": "@opam/uchar@opam:0.0.2@c8218eea", @@ -163,10 +163,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.11.2000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.2000@d41d8cd9" ] }, "@opam/tyxml@opam:4.4.0@1dca5713": { "id": "@opam/tyxml@opam:4.4.0@1dca5713", @@ -186,14 +186,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.2000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.2000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.7.1@f5f493bc" + "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/topkg@opam:1.0.3@e4e10f1c": { @@ -214,37 +214,37 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.11.2000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + "ocaml@4.11.2000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, - "@opam/stdlib-shims@opam:0.1.0@148f22ac": { - "id": "@opam/stdlib-shims@opam:0.1.0@148f22ac", + "@opam/stdlib-shims@opam:0.3.0@0d088929": { + "id": "@opam/stdlib-shims@opam:0.3.0@0d088929", "name": "@opam/stdlib-shims", - "version": "opam:0.1.0", + "version": "opam:0.3.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/12/12b5704eed70c6bff5ac39a16db1425d#md5:12b5704eed70c6bff5ac39a16db1425d", - "archive:https://github.com/ocaml/stdlib-shims/releases/download/0.1.0/stdlib-shims-0.1.0.tbz#md5:12b5704eed70c6bff5ac39a16db1425d" + "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.1.0", - "path": "esy.lock/opam/stdlib-shims.0.1.0" + "version": "0.3.0", + "path": "esy.lock/opam/stdlib-shims.0.3.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/stdio@opam:v0.14.0@a624e254": { @@ -265,13 +265,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", - "@opam/base@opam:v0.14.0@8bc55fce", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", + "@opam/base@opam:v0.14.1@d14008e2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", - "@opam/base@opam:v0.14.0@8bc55fce" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", + "@opam/base@opam:v0.14.1@d14008e2" ] }, "@opam/sexplib0@opam:v0.14.0@ddeb6438": { @@ -292,11 +292,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -314,9 +314,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.2000@d41d8cd9" ] }, "@opam/result@opam:1.5@6b753c82": { "id": "@opam/result@opam:1.5@6b753c82", @@ -336,11 +336,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { @@ -361,46 +361,46 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/ppxlib@opam:0.20.0@72354e44": { - "id": "@opam/ppxlib@opam:0.20.0@72354e44", + "@opam/ppxlib@opam:0.21.0@9baf1fb0": { + "id": "@opam/ppxlib@opam:0.21.0@9baf1fb0", "name": "@opam/ppxlib", - "version": "opam:0.20.0", + "version": "opam:0.21.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/1c/1cb5903ef257de9c93e154cbb53df5979d4ad0f041d01967ea5984dd6d2cad37#sha256:1cb5903ef257de9c93e154cbb53df5979d4ad0f041d01967ea5984dd6d2cad37", - "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.20.0/ppxlib-0.20.0.tbz#sha256:1cb5903ef257de9c93e154cbb53df5979d4ad0f041d01967ea5984dd6d2cad37" + "archive:https://opam.ocaml.org/cache/sha256/8e/8ea7af348d24bf52f359afaab1e8f2aa75824934c97eff76ed84f2613f4e3a3e#sha256:8ea7af348d24bf52f359afaab1e8f2aa75824934c97eff76ed84f2613f4e3a3e", + "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.21.0/ppxlib-0.21.0.tbz#sha256:8ea7af348d24bf52f359afaab1e8f2aa75824934c97eff76ed84f2613f4e3a3e" ], "opam": { "name": "ppxlib", - "version": "0.20.0", - "path": "esy.lock/opam/ppxlib.0.20.0" + "version": "0.21.0", + "path": "esy.lock/opam/ppxlib.0.21.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac", + "ocaml@4.11.2000@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.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac", + "ocaml@4.11.2000@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.7.1@f5f493bc" + "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": { @@ -421,12 +421,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -447,15 +447,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/odoc@opam:1.5.2@236518eb": { - "id": "@opam/odoc@opam:1.5.2@236518eb", + "@opam/odoc@opam:1.5.2@94f47c8b": { + "id": "@opam/odoc@opam:1.5.2@94f47c8b", "name": "@opam/odoc", "version": "opam:1.5.2", "source": { @@ -472,23 +472,23 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713", + "ocaml@4.11.2000@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/cppo@opam:1.6.7@c28ac3ae", "@opam/cmdliner@opam:1.0.4@93208aac", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713", + "ocaml@4.11.2000@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/cmdliner@opam:1.0.4@93208aac", "@opam/astring@opam:0.8.5@1300cee8" ] }, - "@opam/ocamlformat@opam:0.15.1@cbc67b21": { - "id": "@opam/ocamlformat@opam:0.15.1@cbc67b21", + "@opam/ocamlformat@opam:0.15.1@512a140b": { + "id": "@opam/ocamlformat@opam:0.15.1@512a140b", "name": "@opam/ocamlformat", "version": "opam:0.15.1", "source": { @@ -505,35 +505,35 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.2000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uuseg@opam:13.0.0@f60712a7", "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/ppxlib@opam:0.20.0@72354e44", - "@opam/odoc@opam:1.5.2@236518eb", - "@opam/menhir@opam:20200624@8629ff13", + "@opam/ppxlib@opam:0.21.0@9baf1fb0", + "@opam/odoc@opam:1.5.2@94f47c8b", + "@opam/menhir@opam:20201216@1a09d886", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.8.2@3d714e5f", "@opam/cmdliner@opam:1.0.4@93208aac", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/base@opam:v0.14.0@8bc55fce", + "@opam/base@opam:v0.14.1@d14008e2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.2000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uuseg@opam:13.0.0@f60712a7", "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/ppxlib@opam:0.20.0@72354e44", - "@opam/odoc@opam:1.5.2@236518eb", - "@opam/menhir@opam:20200624@8629ff13", + "@opam/ppxlib@opam:0.21.0@9baf1fb0", + "@opam/odoc@opam:1.5.2@94f47c8b", + "@opam/menhir@opam:20201216@1a09d886", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.8.2@3d714e5f", "@opam/cmdliner@opam:1.0.4@93208aac", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/base@opam:v0.14.0@8bc55fce" + "@opam/base@opam:v0.14.1@d14008e2" ] }, - "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { - "id": "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072": { + "id": "@opam/ocamlfind@opam:1.8.1@b7dc3072", "name": "@opam/ocamlfind", "version": "opam:1.8.1", "source": { @@ -556,10 +556,10 @@ } ], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/conf-m4@opam:1@196bf219", + "ocaml@4.11.2000@d41d8cd9", "@opam/conf-m4@opam:1@196bf219", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.2000@d41d8cd9" ] }, "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -584,9 +584,9 @@ } ], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.2000@d41d8cd9" ] }, "@opam/ocaml-migrate-parsetree@opam:2.1.0@a3b6747d": { "id": "@opam/ocaml-migrate-parsetree@opam:2.1.0@a3b6747d", @@ -606,51 +606,51 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/ocaml-lsp-server@opam:1.2.0@581525b2": { - "id": "@opam/ocaml-lsp-server@opam:1.2.0@581525b2", + "@opam/ocaml-lsp-server@opam:1.4.0@c9583433": { + "id": "@opam/ocaml-lsp-server@opam:1.4.0@c9583433", "name": "@opam/ocaml-lsp-server", - "version": "opam:1.2.0", + "version": "opam:1.4.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e4/e4e56590b9af02160e5af7733763897d7cfe3f9b876692af4d4184ab0fce4bcb#sha256:e4e56590b9af02160e5af7733763897d7cfe3f9b876692af4d4184ab0fce4bcb", - "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.2.0/jsonrpc-1.2.0.tbz#sha256:e4e56590b9af02160e5af7733763897d7cfe3f9b876692af4d4184ab0fce4bcb" + "archive:https://opam.ocaml.org/cache/sha256/fd/fd138e6c4fcff32c6d15eb66cc9391b7e1183717a6d1a47c688c7f6d320a159f#sha256:fd138e6c4fcff32c6d15eb66cc9391b7e1183717a6d1a47c688c7f6d320a159f", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.4.0/jsonrpc-1.4.0.tbz#sha256:fd138e6c4fcff32c6d15eb66cc9391b7e1183717a6d1a47c688c7f6d320a159f" ], "opam": { "name": "ocaml-lsp-server", - "version": "1.2.0", - "path": "esy.lock/opam/ocaml-lsp-server.1.2.0" + "version": "1.4.0", + "path": "esy.lock/opam/ocaml-lsp-server.1.4.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/stdlib-shims@opam:0.1.0@148f22ac", + "ocaml@4.11.2000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/stdlib-shims@opam:0.3.0@0d088929", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune-build-info@opam:2.7.1@da03d61d", - "@opam/dune@opam:2.7.1@f5f493bc", - "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", - "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ocamlfind@opam:1.8.1@b7dc3072", + "@opam/dune-build-info@opam:2.8.2@0ec81e5b", + "@opam/dune@opam:2.8.2@3d714e5f", + "@opam/dot-merlin-reader@opam:4.1@120afa42", + "@opam/csexp@opam:1.4.0@bd1cb034", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/stdlib-shims@opam:0.1.0@148f22ac", + "ocaml@4.11.2000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/stdlib-shims@opam:0.3.0@0d088929", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune-build-info@opam:2.7.1@da03d61d", - "@opam/dune@opam:2.7.1@f5f493bc", - "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", - "@opam/csexp@opam:1.3.2@5cea14af" + "@opam/ocamlfind@opam:1.8.1@b7dc3072", + "@opam/dune-build-info@opam:2.8.2@0ec81e5b", + "@opam/dune@opam:2.8.2@3d714e5f", + "@opam/dot-merlin-reader@opam:4.1@120afa42", + "@opam/csexp@opam:1.4.0@bd1cb034" ] }, "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd": { @@ -671,181 +671,181 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/menhirSdk@opam:20200624@2a05b5a7": { - "id": "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirSdk@opam:20201216@5e08e674": { + "id": "@opam/menhirSdk@opam:20201216@5e08e674", "name": "@opam/menhirSdk", - "version": "opam:20200624", + "version": "opam:20201216", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" + "archive:https://opam.ocaml.org/cache/md5/f2/f27f8f5dedd316eff4c02d9130fced49#md5:f27f8f5dedd316eff4c02d9130fced49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz#md5:f27f8f5dedd316eff4c02d9130fced49" ], "opam": { "name": "menhirSdk", - "version": "20200624", - "path": "esy.lock/opam/menhirSdk.20200624" + "version": "20201216", + "path": "esy.lock/opam/menhirSdk.20201216" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/menhirLib@opam:20200624@8bdd2b0e": { - "id": "@opam/menhirLib@opam:20200624@8bdd2b0e", + "@opam/menhirLib@opam:20201216@bb5a1851": { + "id": "@opam/menhirLib@opam:20201216@bb5a1851", "name": "@opam/menhirLib", - "version": "opam:20200624", + "version": "opam:20201216", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" + "archive:https://opam.ocaml.org/cache/md5/f2/f27f8f5dedd316eff4c02d9130fced49#md5:f27f8f5dedd316eff4c02d9130fced49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz#md5:f27f8f5dedd316eff4c02d9130fced49" ], "opam": { "name": "menhirLib", - "version": "20200624", - "path": "esy.lock/opam/menhirLib.20200624" + "version": "20201216", + "path": "esy.lock/opam/menhirLib.20201216" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/menhir@opam:20200624@8629ff13": { - "id": "@opam/menhir@opam:20200624@8629ff13", + "@opam/menhir@opam:20201216@1a09d886": { + "id": "@opam/menhir@opam:20201216@1a09d886", "name": "@opam/menhir", - "version": "opam:20200624", + "version": "opam:20201216", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" + "archive:https://opam.ocaml.org/cache/md5/f2/f27f8f5dedd316eff4c02d9130fced49#md5:f27f8f5dedd316eff4c02d9130fced49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz#md5:f27f8f5dedd316eff4c02d9130fced49" ], "opam": { "name": "menhir", - "version": "20200624", - "path": "esy.lock/opam/menhir.20200624" + "version": "20201216", + "path": "esy.lock/opam/menhir.20201216" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", - "@opam/menhirLib@opam:20200624@8bdd2b0e", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@opam/menhirSdk@opam:20201216@5e08e674", + "@opam/menhirLib@opam:20201216@bb5a1851", + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", - "@opam/menhirLib@opam:20200624@8bdd2b0e", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/menhirSdk@opam:20201216@5e08e674", + "@opam/menhirLib@opam:20201216@bb5a1851", + "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/js_of_ocaml-ppx@opam:3.8.0@aad62e50": { - "id": "@opam/js_of_ocaml-ppx@opam:3.8.0@aad62e50", + "@opam/js_of_ocaml-ppx@opam:3.9.0@8454b2f9": { + "id": "@opam/js_of_ocaml-ppx@opam:3.9.0@8454b2f9", "name": "@opam/js_of_ocaml-ppx", - "version": "opam:3.8.0", + "version": "opam:3.9.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/9e/9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219#sha256:9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219", - "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/3.8.0/js_of_ocaml-3.8.0.tbz#sha256:9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219" + "archive:https://opam.ocaml.org/cache/sha256/74/74d3b17b089af04cde29173c9e7a1154b9a784ba415aeef5026440aeb907cb54#sha256:74d3b17b089af04cde29173c9e7a1154b9a784ba415aeef5026440aeb907cb54", + "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/3.9.0/js_of_ocaml-3.9.0.tbz#sha256:74d3b17b089af04cde29173c9e7a1154b9a784ba415aeef5026440aeb907cb54" ], "opam": { "name": "js_of_ocaml-ppx", - "version": "3.8.0", - "path": "esy.lock/opam/js_of_ocaml-ppx.3.8.0" + "version": "3.9.0", + "path": "esy.lock/opam/js_of_ocaml-ppx.3.9.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/ppxlib@opam:0.20.0@72354e44", - "@opam/js_of_ocaml@opam:3.8.0@c897ffea", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@opam/ppxlib@opam:0.21.0@9baf1fb0", + "@opam/js_of_ocaml@opam:3.9.0@db27df96", + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/ppxlib@opam:0.20.0@72354e44", - "@opam/js_of_ocaml@opam:3.8.0@c897ffea", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/ppxlib@opam:0.21.0@9baf1fb0", + "@opam/js_of_ocaml@opam:3.9.0@db27df96", + "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/js_of_ocaml-compiler@opam:3.8.0@0b5efb6b": { - "id": "@opam/js_of_ocaml-compiler@opam:3.8.0@0b5efb6b", + "@opam/js_of_ocaml-compiler@opam:3.9.1@19f5797f": { + "id": "@opam/js_of_ocaml-compiler@opam:3.9.1@19f5797f", "name": "@opam/js_of_ocaml-compiler", - "version": "opam:3.8.0", + "version": "opam:3.9.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/9e/9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219#sha256:9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219", - "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/3.8.0/js_of_ocaml-3.8.0.tbz#sha256:9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219" + "archive:https://opam.ocaml.org/cache/sha256/a6/a6de57f502676890191b966d2317a2bef7835786664c37f24e974aed66286545#sha256:a6de57f502676890191b966d2317a2bef7835786664c37f24e974aed66286545", + "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/3.9.1/js_of_ocaml-3.9.1.tbz#sha256:a6de57f502676890191b966d2317a2bef7835786664c37f24e974aed66286545" ], "opam": { "name": "js_of_ocaml-compiler", - "version": "3.8.0", - "path": "esy.lock/opam/js_of_ocaml-compiler.3.8.0" + "version": "3.9.1", + "path": "esy.lock/opam/js_of_ocaml-compiler.3.9.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ppxlib@opam:0.20.0@72354e44", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200624@8629ff13", - "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/ppxlib@opam:0.21.0@9baf1fb0", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", + "@opam/menhir@opam:20201216@1a09d886", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/cmdliner@opam:1.0.4@93208aac", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ppxlib@opam:0.20.0@72354e44", - "@opam/menhir@opam:20200624@8629ff13", - "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/ppxlib@opam:0.21.0@9baf1fb0", + "@opam/menhir@opam:20201216@1a09d886", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/cmdliner@opam:1.0.4@93208aac" ] }, - "@opam/js_of_ocaml@opam:3.8.0@c897ffea": { - "id": "@opam/js_of_ocaml@opam:3.8.0@c897ffea", + "@opam/js_of_ocaml@opam:3.9.0@db27df96": { + "id": "@opam/js_of_ocaml@opam:3.9.0@db27df96", "name": "@opam/js_of_ocaml", - "version": "opam:3.8.0", + "version": "opam:3.9.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/9e/9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219#sha256:9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219", - "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/3.8.0/js_of_ocaml-3.8.0.tbz#sha256:9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219" + "archive:https://opam.ocaml.org/cache/sha256/74/74d3b17b089af04cde29173c9e7a1154b9a784ba415aeef5026440aeb907cb54#sha256:74d3b17b089af04cde29173c9e7a1154b9a784ba415aeef5026440aeb907cb54", + "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/3.9.0/js_of_ocaml-3.9.0.tbz#sha256:74d3b17b089af04cde29173c9e7a1154b9a784ba415aeef5026440aeb907cb54" ], "opam": { "name": "js_of_ocaml", - "version": "3.8.0", - "path": "esy.lock/opam/js_of_ocaml.3.8.0" + "version": "3.9.0", + "path": "esy.lock/opam/js_of_ocaml.3.9.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/ppxlib@opam:0.20.0@72354e44", - "@opam/js_of_ocaml-compiler@opam:3.8.0@0b5efb6b", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "@opam/ppxlib@opam:0.21.0@9baf1fb0", + "@opam/js_of_ocaml-compiler@opam:3.9.1@19f5797f", + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/ppxlib@opam:0.20.0@72354e44", - "@opam/js_of_ocaml-compiler@opam:3.8.0@0b5efb6b", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "@opam/ppxlib@opam:0.21.0@9baf1fb0", + "@opam/js_of_ocaml-compiler@opam:3.9.1@19f5797f", + "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/fpath@opam:0.7.3@674d8125": { @@ -866,39 +866,39 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.11.2000@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/astring@opam:0.8.5@1300cee8" + "ocaml@4.11.2000@d41d8cd9", "@opam/astring@opam:0.8.5@1300cee8" ] }, - "@opam/fix@opam:20200131@0ecd2f01": { - "id": "@opam/fix@opam:20200131@0ecd2f01", + "@opam/fix@opam:20201120@5c318621": { + "id": "@opam/fix@opam:20201120@5c318621", "name": "@opam/fix", - "version": "opam:20200131", + "version": "opam:20201120", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/99/991ff031666c662eaab638d2e0f4ac1d#md5:991ff031666c662eaab638d2e0f4ac1d", - "archive:https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz#md5:991ff031666c662eaab638d2e0f4ac1d" + "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3", + "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3" ], "opam": { "name": "fix", - "version": "20200131", - "path": "esy.lock/opam/fix.20200131" + "version": "20201120", + "path": "esy.lock/opam/fix.20201120" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -919,175 +919,170 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/dune-configurator@opam:2.7.1@96307faa": { - "id": "@opam/dune-configurator@opam:2.7.1@96307faa", + "@opam/dune-configurator@opam:2.8.2@c90ff40b": { + "id": "@opam/dune-configurator@opam:2.8.2@c90ff40b", "name": "@opam/dune-configurator", - "version": "opam:2.7.1", + "version": "opam:2.8.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c3/c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d", - "archive:https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" + "archive:https://opam.ocaml.org/cache/sha256/e2/e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e#sha256:e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e", + "archive:https://github.com/ocaml/dune/releases/download/2.8.2/dune-2.8.2.tbz#sha256:e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e" ], "opam": { "name": "dune-configurator", - "version": "2.7.1", - "path": "esy.lock/opam/dune-configurator.2.7.1" + "version": "2.8.2", + "path": "esy.lock/opam/dune-configurator.2.8.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af", + "ocaml@4.11.2000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/csexp@opam:1.4.0@bd1cb034", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af" + "ocaml@4.11.2000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/csexp@opam:1.4.0@bd1cb034" ] }, - "@opam/dune-build-info@opam:2.7.1@da03d61d": { - "id": "@opam/dune-build-info@opam:2.7.1@da03d61d", + "@opam/dune-build-info@opam:2.8.2@0ec81e5b": { + "id": "@opam/dune-build-info@opam:2.8.2@0ec81e5b", "name": "@opam/dune-build-info", - "version": "opam:2.7.1", + "version": "opam:2.8.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c3/c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d", - "archive:https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" + "archive:https://opam.ocaml.org/cache/sha256/e2/e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e#sha256:e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e", + "archive:https://github.com/ocaml/dune/releases/download/2.8.2/dune-2.8.2.tbz#sha256:e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e" ], "opam": { "name": "dune-build-info", - "version": "2.7.1", - "path": "esy.lock/opam/dune-build-info.2.7.1" + "version": "2.8.2", + "path": "esy.lock/opam/dune-build-info.2.8.2" } }, "overrides": [], "dependencies": [ - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:2.7.1@f5f493bc" ] + "devDependencies": [ "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/dune@opam:2.7.1@f5f493bc": { - "id": "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dune@opam:2.8.2@3d714e5f": { + "id": "@opam/dune@opam:2.8.2@3d714e5f", "name": "@opam/dune", - "version": "opam:2.7.1", + "version": "opam:2.8.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c3/c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d", - "archive:https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" + "archive:https://opam.ocaml.org/cache/sha256/e2/e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e#sha256:e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e", + "archive:https://github.com/ocaml/dune/releases/download/2.8.2/dune-2.8.2.tbz#sha256:e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e" ], "opam": { "name": "dune", - "version": "2.7.1", - "path": "esy.lock/opam/dune.2.7.1" + "version": "2.8.2", + "path": "esy.lock/opam/dune.2.8.2" } }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.11.2000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.11.2000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, - "@opam/dot-merlin-reader@opam:3.4.2@55baebb0": { - "id": "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/dot-merlin-reader@opam:4.1@120afa42": { + "id": "@opam/dot-merlin-reader@opam:4.1@120afa42", "name": "@opam/dot-merlin-reader", - "version": "opam:3.4.2", + "version": "opam:4.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", - "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "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": "dot-merlin-reader", - "version": "3.4.2", - "path": "esy.lock/opam/dot-merlin-reader.3.4.2" + "version": "4.1", + "path": "esy.lock/opam/dot-merlin-reader.4.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.11.2000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/result@opam:1.5@6b753c82", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/csexp@opam:1.4.0@bd1cb034", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.11.2000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/result@opam:1.5@6b753c82", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af" + "@opam/ocamlfind@opam:1.8.1@b7dc3072", + "@opam/dune@opam:2.8.2@3d714e5f", "@opam/csexp@opam:1.4.0@bd1cb034" ] }, - "@opam/csexp@opam:1.3.2@5cea14af": { - "id": "@opam/csexp@opam:1.3.2@5cea14af", + "@opam/csexp@opam:1.4.0@bd1cb034": { + "id": "@opam/csexp@opam:1.4.0@bd1cb034", "name": "@opam/csexp", - "version": "opam:1.3.2", + "version": "opam:1.4.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a", - "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + "archive:https://opam.ocaml.org/cache/sha256/8e/8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e" ], "opam": { "name": "csexp", - "version": "1.3.2", - "path": "esy.lock/opam/csexp.1.3.2" + "version": "1.4.0", + "path": "esy.lock/opam/csexp.1.4.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.8.2@3d714e5f" ] }, - "@opam/cppo@opam:1.6.6@f4f83858": { - "id": "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/cppo@opam:1.6.7@c28ac3ae": { + "id": "@opam/cppo@opam:1.6.7@c28ac3ae", "name": "@opam/cppo", - "version": "opam:1.6.6", + "version": "opam:1.6.7", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e7/e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0#sha256:e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0", - "archive:https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz#sha256:e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0" + "archive:https://opam.ocaml.org/cache/sha256/db/db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d#sha256:db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d", + "archive:https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz#sha256:db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d" ], "opam": { "name": "cppo", - "version": "1.6.6", - "path": "esy.lock/opam/cppo.1.6.6" + "version": "1.6.7", + "path": "esy.lock/opam/cppo.1.6.7" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.11.2000@d41d8cd9", "@opam/dune@opam:2.8.2@3d714e5f", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -1134,9 +1129,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.2000@d41d8cd9" ] }, "@opam/biniou@opam:1.2.1@d7570399": { "id": "@opam/biniou@opam:1.2.1@d7570399", @@ -1156,12 +1151,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -1198,32 +1193,32 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/base@opam:v0.14.0@8bc55fce": { - "id": "@opam/base@opam:v0.14.0@8bc55fce", + "@opam/base@opam:v0.14.1@d14008e2": { + "id": "@opam/base@opam:v0.14.1@d14008e2", "name": "@opam/base", - "version": "opam:v0.14.0", + "version": "opam:v0.14.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/5a/5a00382c724e97b6768aaa27481dd3cc#md5:5a00382c724e97b6768aaa27481dd3cc", - "archive:https://ocaml.janestreet.com/ocaml-core/v0.14/files/base-v0.14.0.tar.gz#md5:5a00382c724e97b6768aaa27481dd3cc" + "archive:https://opam.ocaml.org/cache/md5/e4/e4419eae60f57e553b154856f0cacf42#md5:e4419eae60f57e553b154856f0cacf42", + "archive:https://github.com/janestreet/base/archive/v0.14.1.tar.gz#md5:e4419eae60f57e553b154856f0cacf42" ], "opam": { "name": "base", - "version": "v0.14.0", - "path": "esy.lock/opam/base.v0.14.0" + "version": "v0.14.1", + "path": "esy.lock/opam/base.v0.14.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", - "@opam/dune-configurator@opam:2.7.1@96307faa", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.2000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "@opam/dune-configurator@opam:2.8.2@c90ff40b", + "@opam/dune@opam:2.8.2@3d714e5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", - "@opam/dune-configurator@opam:2.7.1@96307faa", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "@opam/dune-configurator@opam:2.8.2@c90ff40b", + "@opam/dune@opam:2.8.2@3d714e5f" ] }, "@opam/astring@opam:0.8.5@1300cee8": { @@ -1244,12 +1239,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.11.2000@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.2000@d41d8cd9" ] }, "@grain/binaryen.ml@link-dev:./package.json": { "id": "@grain/binaryen.ml@link-dev:./package.json", @@ -1262,15 +1257,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.11.1000@d41d8cd9", - "@opam/js_of_ocaml-ppx@opam:3.8.0@aad62e50", - "@opam/js_of_ocaml@opam:3.8.0@c897ffea", - "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.11.2000@d41d8cd9", + "@opam/js_of_ocaml-ppx@opam:3.9.0@8454b2f9", + "@opam/js_of_ocaml@opam:3.9.0@db27df96", + "@opam/dune-configurator@opam:2.8.2@c90ff40b", + "@opam/dune@opam:2.8.2@3d714e5f" ], "devDependencies": [ - "@opam/ocamlformat@opam:0.15.1@cbc67b21", - "@opam/ocaml-lsp-server@opam:1.2.0@581525b2", - "@opam/js_of_ocaml-compiler@opam:3.8.0@0b5efb6b" + "@opam/ocamlformat@opam:0.15.1@512a140b", + "@opam/ocaml-lsp-server@opam:1.4.0@c9583433", + "@opam/js_of_ocaml-compiler@opam:3.9.1@19f5797f" ], "installConfig": { "pnp": false } }, diff --git a/esy.lock/opam/base.v0.14.0/opam b/esy.lock/opam/base.v0.14.1/opam similarity index 86% rename from esy.lock/opam/base.v0.14.0/opam rename to esy.lock/opam/base.v0.14.1/opam index 13947705..3a331a4e 100644 --- a/esy.lock/opam/base.v0.14.0/opam +++ b/esy.lock/opam/base.v0.14.1/opam @@ -10,7 +10,7 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.07.0" & < "4.12"} + "ocaml" {>= "4.08.0"} "sexplib0" {>= "v0.14" & < "v0.15"} "dune" {>= "2.0.0"} "dune-configurator" @@ -31,6 +31,6 @@ provided by companion libraries such as stdio: https://github.com/janestreet/stdio " url { - src: "https://ocaml.janestreet.com/ocaml-core/v0.14/files/base-v0.14.0.tar.gz" - checksum: "md5=5a00382c724e97b6768aaa27481dd3cc" + src: "https://github.com/janestreet/base/archive/v0.14.1.tar.gz" + checksum: "md5=e4419eae60f57e553b154856f0cacf42" } 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 f683f8b4..eddcc1ef 100644 --- a/esy.lock/opam/cppo.1.6.6/opam +++ b/esy.lock/opam/cppo.1.6.7/opam @@ -2,11 +2,11 @@ opam-version: "2.0" maintainer: "martin@mjambon.com" authors: "Martin Jambon" license: "BSD-3-Clause" -homepage: "http://mjambon.com/cppo.html" +homepage: "https://github.com/ocaml-community/cppo" doc: "https://ocaml-community.github.io/cppo/" bug-reports: "https://github.com/ocaml-community/cppo/issues" depends: [ - "ocaml" {>= "4.03"} + "ocaml" {>= "4.02.3"} "dune" {>= "1.0"} "base-unix" ] @@ -28,10 +28,12 @@ Cppo is: * reasonably fast * simple to install and to maintain """ +x-commit-hash: "7d217864a5fdc4551699e248137a2f8b719d2078" url { - src: "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz" + src: + "https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz" checksum: [ - "sha256=e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0" - "sha512=44ecf9d225d9e45490a2feac0bde04865ca398dba6c3579e3370fcd1ea255707b8883590852af8b2df87123801062b9f3acce2455c092deabf431f9c4fb8d8eb" + "sha256=db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d" + "sha512=9722b50fd23aaccf86816313333a3bf8fc7c6b4ef06b153e5e1e1aaf14670cf51a4aac52fb1b4a0e5531699c4047a1eff6c24c969f7e5063e78096c2195b5819" ] } diff --git a/esy.lock/opam/csexp.1.3.2/opam b/esy.lock/opam/csexp.1.4.0/opam similarity index 80% rename from esy.lock/opam/csexp.1.3.2/opam rename to esy.lock/opam/csexp.1.4.0/opam index 1508d17a..ef29a05a 100644 --- a/esy.lock/opam/csexp.1.3.2/opam +++ b/esy.lock/opam/csexp.1.4.0/opam @@ -47,12 +47,12 @@ build: [ "@doc" {with-doc} ] ] -x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b" +x-commit-hash: "0e1b2044c8d1ff187c27cec3e46d9cde14892650" url { src: - "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz" + "https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz" checksum: [ - "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" - "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026" + "sha256=8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e" + "sha512=604a5094fbbf61f497b342ad0aa8ec25275b2a904cd0c1823fc40daa54a15796b360374ff495c0d8ca3b4c1e6723b2ce37e030857fae131222606de818fb8129" ] } diff --git a/esy.lock/opam/dot-merlin-reader.3.4.2/opam b/esy.lock/opam/dot-merlin-reader.3.4.2/opam deleted file mode 100644 index e740ed7d..00000000 --- a/esy.lock/opam/dot-merlin-reader.3.4.2/opam +++ /dev/null @@ -1,28 +0,0 @@ -opam-version: "2.0" -maintainer: "defree@gmail.com" -authors: "The Merlin team" -synopsis: "Reads config files for merlin" -homepage: "https://github.com/ocaml/merlin" -bug-reports: "https://github.com/ocaml/merlin/issues" -dev-repo: "git+https://github.com/ocaml/merlin.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "ocaml" {>= "4.02.1" & < "4.12"} - "dune" {>= "1.8.0"} - "yojson" {>= "1.6.0"} - "ocamlfind" {>= "1.6.0"} - "csexp" {>= "1.2.3"} - "result" {>= "1.5"} -] -x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" -url { - src: - "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" - checksum: [ - "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" - "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" - ] -} diff --git a/esy.lock/opam/dot-merlin-reader.4.1/opam b/esy.lock/opam/dot-merlin-reader.4.1/opam new file mode 100644 index 00000000..d84045d6 --- /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-build-info.2.7.1/opam b/esy.lock/opam/dune-build-info.2.8.2/opam similarity index 72% rename from esy.lock/opam/dune-build-info.2.7.1/opam rename to esy.lock/opam/dune-build-info.2.8.2/opam index c9130976..d61859d1 100644 --- a/esy.lock/opam/dune-build-info.2.7.1/opam +++ b/esy.lock/opam/dune-build-info.2.8.2/opam @@ -15,7 +15,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.7"} + "dune" {>= "2.8"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" @@ -32,11 +32,11 @@ build: [ "@doc" {with-doc} ] ] -x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c" +x-commit-hash: "6c471da57bea666267a8a63034aed57962f378b0" url { - src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.8.2/dune-2.8.2.tbz" checksum: [ - "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" - "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b" + "sha256=e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e" + "sha512=d3cca73f5a72440273f7b4e3934dfa7e89fcb64710f3c734d2583123f5d9f3e573f0ab96a4892b2f11313038da6b4e2c614951199ffef0a3f12669d729b25376" ] } diff --git a/esy.lock/opam/dune-configurator.2.7.1/opam b/esy.lock/opam/dune-configurator.2.8.2/opam similarity index 73% rename from esy.lock/opam/dune-configurator.2.7.1/opam rename to esy.lock/opam/dune-configurator.2.8.2/opam index 3a02b1af..17a9f299 100644 --- a/esy.lock/opam/dune-configurator.2.7.1/opam +++ b/esy.lock/opam/dune-configurator.2.8.2/opam @@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.7"} + "dune" {>= "2.8"} "ocaml" {>= "4.03.0"} "result" "csexp" {>= "1.3.0"} @@ -37,11 +37,11 @@ build: [ "@doc" {with-doc} ] ] -x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c" +x-commit-hash: "6c471da57bea666267a8a63034aed57962f378b0" url { - src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.8.2/dune-2.8.2.tbz" checksum: [ - "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" - "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b" + "sha256=e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e" + "sha512=d3cca73f5a72440273f7b4e3934dfa7e89fcb64710f3c734d2583123f5d9f3e573f0ab96a4892b2f11313038da6b4e2c614951199ffef0a3f12669d729b25376" ] } diff --git a/esy.lock/opam/dune.2.7.1/opam b/esy.lock/opam/dune.2.8.2/opam similarity index 82% rename from esy.lock/opam/dune.2.7.1/opam rename to esy.lock/opam/dune.2.8.2/opam index aaa13e67..da9bacb0 100644 --- a/esy.lock/opam/dune.2.7.1/opam +++ b/esy.lock/opam/dune.2.8.2/opam @@ -26,6 +26,8 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" conflicts: [ + "merlin" {< "3.4.0"} + "ocaml-lsp-server" {< "1.3.0"} "dune-configurator" {< "2.3.0"} "odoc" {< "1.3.0"} "dune-release" {< "1.3.0"} @@ -46,11 +48,11 @@ depends: [ "base-unix" "base-threads" ] -x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c" +x-commit-hash: "6c471da57bea666267a8a63034aed57962f378b0" url { - src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.8.2/dune-2.8.2.tbz" checksum: [ - "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" - "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b" + "sha256=e2c4e8230f7c96236503fd75f22bdbc263639971bf104509e446855ded35ae1e" + "sha512=d3cca73f5a72440273f7b4e3934dfa7e89fcb64710f3c734d2583123f5d9f3e573f0ab96a4892b2f11313038da6b4e2c614951199ffef0a3f12669d729b25376" ] } diff --git a/esy.lock/opam/fix.20200131/opam b/esy.lock/opam/fix.20201120/opam similarity index 62% rename from esy.lock/opam/fix.20200131/opam rename to esy.lock/opam/fix.20201120/opam index 4babcba8..31c8a641 100644 --- a/esy.lock/opam/fix.20200131/opam +++ b/esy.lock/opam/fix.20201120/opam @@ -11,14 +11,14 @@ build: [ ] depends: [ "ocaml" { >= "4.03" } - "dune" { >= "1.3" } + "dune" {>= "1.3" } ] synopsis: "Facilities for memoization and fixed points" url { src: - "https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz" checksum: [ - "md5=991ff031666c662eaab638d2e0f4ac1d" - "sha512=01c45a1d90b02ec0939e968b185a6a373ac6117e2287b9a26d3db9d71e9569d086cea50da60710fcab5c2ed9d3b4c72b76839c0651e436f1fb39c77dc7c04b5e" + "md5=7eb570b759635fe66f3556d2b1cc88e3" + "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4" ] } diff --git a/esy.lock/opam/js_of_ocaml-compiler.3.8.0/opam b/esy.lock/opam/js_of_ocaml-compiler.3.9.1/opam similarity index 73% rename from esy.lock/opam/js_of_ocaml-compiler.3.8.0/opam rename to esy.lock/opam/js_of_ocaml-compiler.3.9.1/opam index bf6fb8b2..4acf49d9 100644 --- a/esy.lock/opam/js_of_ocaml-compiler.3.8.0/opam +++ b/esy.lock/opam/js_of_ocaml-compiler.3.9.1/opam @@ -14,7 +14,7 @@ environment like browsers and Node.js build: [["dune" "build" "-p" name "-j" jobs]] depends: [ - "ocaml" {>= "4.02.0" & < "4.12.0"} + "ocaml" {>= "4.02.0"} "dune" {>= "2.5"} "ppx_expect" {with-test & >= "v0.12.0"} "cmdliner" @@ -29,12 +29,12 @@ conflicts: [ "ocamlfind" {< "1.5.1"} "js_of_ocaml" {< "3.0"} ] -x-commit-hash: "09d5731241917577e9c16b6a0063c23baae00df8" +x-commit-hash: "c97f2543ff7bfa6c8fe683cca7beec884b38f918" url { src: - "https://github.com/ocsigen/js_of_ocaml/releases/download/3.8.0/js_of_ocaml-3.8.0.tbz" + "https://github.com/ocsigen/js_of_ocaml/releases/download/3.9.1/js_of_ocaml-3.9.1.tbz" checksum: [ - "sha256=9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219" - "sha512=e4855e242e4b0c6b396154e3d093fb5de28e4073efb1df00ee91ad52fad8530425498f4ff46631f128a9c792225f53c2046eeaea81517281cee1e3442a347578" + "sha256=a6de57f502676890191b966d2317a2bef7835786664c37f24e974aed66286545" + "sha512=f8b880bd3ff9fc1d98c5f65a1d3d9e919d16a20dd1c1c979e154642d1df7c3afc9d688e24fbbcd591974e1debb352d8f3fb2e0ffbb6df94c2d08ccd8d3f42727" ] } diff --git a/esy.lock/opam/js_of_ocaml-ppx.3.8.0/opam b/esy.lock/opam/js_of_ocaml-ppx.3.9.0/opam similarity index 71% rename from esy.lock/opam/js_of_ocaml-ppx.3.8.0/opam rename to esy.lock/opam/js_of_ocaml-ppx.3.9.0/opam index 365a57a0..24f72245 100644 --- a/esy.lock/opam/js_of_ocaml-ppx.3.8.0/opam +++ b/esy.lock/opam/js_of_ocaml-ppx.3.9.0/opam @@ -19,12 +19,12 @@ depends: [ "ppxlib" {>= "0.15.0"} "js_of_ocaml" {= version} ] -x-commit-hash: "09d5731241917577e9c16b6a0063c23baae00df8" +x-commit-hash: "95bc95d31122bae5764022f878d8a6dd95ceb169" url { src: - "https://github.com/ocsigen/js_of_ocaml/releases/download/3.8.0/js_of_ocaml-3.8.0.tbz" + "https://github.com/ocsigen/js_of_ocaml/releases/download/3.9.0/js_of_ocaml-3.9.0.tbz" checksum: [ - "sha256=9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219" - "sha512=e4855e242e4b0c6b396154e3d093fb5de28e4073efb1df00ee91ad52fad8530425498f4ff46631f128a9c792225f53c2046eeaea81517281cee1e3442a347578" + "sha256=74d3b17b089af04cde29173c9e7a1154b9a784ba415aeef5026440aeb907cb54" + "sha512=affc91ed58d71e79752595345fcb2afe0d86378a73030ce64ef5624b9fef31925a2c2bb5e772fea017a508da292c351ad89b77e28361ff6f8ed345fecb78b31d" ] } diff --git a/esy.lock/opam/js_of_ocaml.3.8.0/opam b/esy.lock/opam/js_of_ocaml.3.9.0/opam similarity index 67% rename from esy.lock/opam/js_of_ocaml.3.8.0/opam rename to esy.lock/opam/js_of_ocaml.3.9.0/opam index e11ebd03..37746189 100644 --- a/esy.lock/opam/js_of_ocaml.3.8.0/opam +++ b/esy.lock/opam/js_of_ocaml.3.9.0/opam @@ -18,14 +18,14 @@ depends: [ "dune" {>= "2.5"} "ppxlib" {>= "0.15.0" } "uchar" - "js_of_ocaml-compiler" {= version} + "js_of_ocaml-compiler" {>= "3.9.0" & < "3.10.0"} ] -x-commit-hash: "09d5731241917577e9c16b6a0063c23baae00df8" +x-commit-hash: "95bc95d31122bae5764022f878d8a6dd95ceb169" url { src: - "https://github.com/ocsigen/js_of_ocaml/releases/download/3.8.0/js_of_ocaml-3.8.0.tbz" + "https://github.com/ocsigen/js_of_ocaml/releases/download/3.9.0/js_of_ocaml-3.9.0.tbz" checksum: [ - "sha256=9ed1424afd3eeafa5c5a031d817326edd751da58bda9a16fb4fcb1ee55f43219" - "sha512=e4855e242e4b0c6b396154e3d093fb5de28e4073efb1df00ee91ad52fad8530425498f4ff46631f128a9c792225f53c2046eeaea81517281cee1e3442a347578" + "sha256=74d3b17b089af04cde29173c9e7a1154b9a784ba415aeef5026440aeb907cb54" + "sha512=affc91ed58d71e79752595345fcb2afe0d86378a73030ce64ef5624b9fef31925a2c2bb5e772fea017a508da292c351ad89b77e28361ff6f8ed345fecb78b31d" ] } diff --git a/esy.lock/opam/menhir.20200624/opam b/esy.lock/opam/menhir.20201216/opam similarity index 69% rename from esy.lock/opam/menhir.20200624/opam rename to esy.lock/opam/menhir.20201216/opam index 37637fcf..c5067e72 100644 --- a/esy.lock/opam/menhir.20200624/opam +++ b/esy.lock/opam/menhir.20201216/opam @@ -19,9 +19,9 @@ depends: [ synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz" checksum: [ - "md5=c37ff53a4a69059e1f8223067b91bb8b" - "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + "md5=f27f8f5dedd316eff4c02d9130fced49" + "sha512=50f86fb2f55184f43c4be9c572ada4feb2208eb350ef64b2651351934a1b48a0b7e98c8c752c3c22e95676c5a0f38b0e638b3f845e53ecff1740dad95b50918c" ] } diff --git a/esy.lock/opam/menhirLib.20200624/opam b/esy.lock/opam/menhirLib.20201216/opam similarity index 70% rename from esy.lock/opam/menhirLib.20200624/opam rename to esy.lock/opam/menhirLib.20201216/opam index afcbe5d5..45d6ba83 100644 --- a/esy.lock/opam/menhirLib.20200624/opam +++ b/esy.lock/opam/menhirLib.20201216/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz" checksum: [ - "md5=c37ff53a4a69059e1f8223067b91bb8b" - "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + "md5=f27f8f5dedd316eff4c02d9130fced49" + "sha512=50f86fb2f55184f43c4be9c572ada4feb2208eb350ef64b2651351934a1b48a0b7e98c8c752c3c22e95676c5a0f38b0e638b3f845e53ecff1740dad95b50918c" ] } diff --git a/esy.lock/opam/menhirSdk.20200624/opam b/esy.lock/opam/menhirSdk.20201216/opam similarity index 70% rename from esy.lock/opam/menhirSdk.20200624/opam rename to esy.lock/opam/menhirSdk.20201216/opam index af122163..be1a2774 100644 --- a/esy.lock/opam/menhirSdk.20200624/opam +++ b/esy.lock/opam/menhirSdk.20201216/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20201216/archive.tar.gz" checksum: [ - "md5=c37ff53a4a69059e1f8223067b91bb8b" - "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + "md5=f27f8f5dedd316eff4c02d9130fced49" + "sha512=50f86fb2f55184f43c4be9c572ada4feb2208eb350ef64b2651351934a1b48a0b7e98c8c752c3c22e95676c5a0f38b0e638b3f845e53ecff1740dad95b50918c" ] } diff --git a/esy.lock/opam/ocaml-lsp-server.1.2.0/opam b/esy.lock/opam/ocaml-lsp-server.1.4.0/opam similarity index 69% rename from esy.lock/opam/ocaml-lsp-server.1.2.0/opam rename to esy.lock/opam/ocaml-lsp-server.1.4.0/opam index 61e3132e..595f05fd 100644 --- a/esy.lock/opam/ocaml-lsp-server.1.2.0/opam +++ b/esy.lock/opam/ocaml-lsp-server.1.4.0/opam @@ -15,6 +15,7 @@ license: "ISC" homepage: "https://github.com/ocaml/ocaml-lsp" bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" depends: [ + "dune" {>= "2.5"} "yojson" "stdlib-shims" "ppx_yojson_conv_lib" @@ -24,12 +25,12 @@ depends: [ "result" {>= "1.5"} "ocamlformat" {with-test} "ocamlfind" {>= "1.5.2"} + "odoc" {with-doc} "ocaml" {>= "4.06" & < "4.12"} - "dune" {>= "2.5.0"} ] dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -39,12 +40,12 @@ build: [ "--release" ] ] -x-commit-hash: "45ebc4ee009f1588eaf5d5a2d0e5137be937501e" +x-commit-hash: "92924b6e36a91ce323b7f8eddfe20def4173e6e5" url { src: - "https://github.com/ocaml/ocaml-lsp/releases/download/1.2.0/jsonrpc-1.2.0.tbz" + "https://github.com/ocaml/ocaml-lsp/releases/download/1.4.0/jsonrpc-1.4.0.tbz" checksum: [ - "sha256=e4e56590b9af02160e5af7733763897d7cfe3f9b876692af4d4184ab0fce4bcb" - "sha512=724d5190a678ca8a3f3c13915cbfcf8d3cce8efa43e0dde130b14c45065b6ccd22507951e79977bcecf361c7928f271d312b87642bb2c52f33669c3e952a7e1b" + "sha256=fd138e6c4fcff32c6d15eb66cc9391b7e1183717a6d1a47c688c7f6d320a159f" + "sha512=567a73b3c10bb59c5a4d4e8291d1aeefdfd34438a95313fba8a485638294ca5fb8034334719631243c304d3328c27afa90dfd564fdb1e7390507a06db3a4ad03" ] } diff --git a/esy.lock/opam/ocamlfind.1.8.1/opam b/esy.lock/opam/ocamlfind.1.8.1/opam index d757d669..04cbc6cc 100644 --- a/esy.lock/opam/ocamlfind.1.8.1/opam +++ b/esy.lock/opam/ocamlfind.1.8.1/opam @@ -31,11 +31,25 @@ build: [ [make "opt"] {ocaml:native} ] install: [ + [ + "./configure" + "-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} + ] [make "install"] ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} ] depends: [ - "ocaml" {>= "4.00.0"} + "ocaml" {>= "4.00.0" & < "4.13"} "conf-m4" {build} ] extra-files: [ diff --git a/esy.lock/opam/ocamlformat.0.15.1/opam b/esy.lock/opam/ocamlformat.0.15.1/opam index f9df18c8..808a46ed 100644 --- a/esy.lock/opam/ocamlformat.0.15.1/opam +++ b/esy.lock/opam/ocamlformat.0.15.1/opam @@ -22,7 +22,7 @@ depends: [ "menhir" "ocp-indent" {with-test} "odoc" {>= "1.4.2"} - "ppxlib" {>= "0.18.0"} + "ppxlib" {>= "0.18.0" & < "0.22.0"} "re" "stdio" {< "v0.15"} "uuseg" {>= "10.0.0"} diff --git a/esy.lock/opam/odoc.1.5.2/opam b/esy.lock/opam/odoc.1.5.2/opam index f59e6407..67aeebd6 100644 --- a/esy.lock/opam/odoc.1.5.2/opam +++ b/esy.lock/opam/odoc.1.5.2/opam @@ -27,7 +27,7 @@ depends: [ "cppo" {build} "dune" "fpath" - "ocaml" {>= "4.02.0"} + "ocaml" {>= "4.02.0" & < "4.13"} "result" "tyxml" {>= "4.3.0"} @@ -36,7 +36,7 @@ depends: [ "ocamlfind" {dev} "sexplib" {dev & >= "113.33.00"} - "bisect_ppx" {with-test & >= "1.3.0"} + "bisect_ppx" {dev & >= "1.3.0"} ] build: [ diff --git a/esy.lock/opam/ppxlib.0.20.0/opam b/esy.lock/opam/ppxlib.0.21.0/opam similarity index 74% rename from esy.lock/opam/ppxlib.0.20.0/opam rename to esy.lock/opam/ppxlib.0.21.0/opam index 7c541f07..0d55884d 100644 --- a/esy.lock/opam/ppxlib.0.20.0/opam +++ b/esy.lock/opam/ppxlib.0.21.0/opam @@ -11,17 +11,18 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] run-test: [ - ["dune" "runtest" "-p" name "-j" jobs] { ocaml:version >= "4.10" } + ["dune" "runtest" "-p" name "-j" jobs] { ocaml:version >= "4.07" } ] depends: [ "ocaml" {>= "4.04.1" & < "4.13"} - "dune" {>= "1.11"} + "dune" {>= "2.7"} "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} @@ -39,12 +40,12 @@ 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. """ -x-commit-hash: "51b6f0bd59692712ef2af73a4f378dccc7fabac8" +x-commit-hash: "e67f1687382daaa4ac352cf97122ea098652e6f7" url { src: - "https://github.com/ocaml-ppx/ppxlib/releases/download/0.20.0/ppxlib-0.20.0.tbz" + "https://github.com/ocaml-ppx/ppxlib/releases/download/0.21.0/ppxlib-0.21.0.tbz" checksum: [ - "sha256=1cb5903ef257de9c93e154cbb53df5979d4ad0f041d01967ea5984dd6d2cad37" - "sha512=fa4179e821a88b70cf874488f2f8fcc7d0d52a2df50069dd8822d57c61a88c92c40e782267dbca0a8efc2f35976eaed73f85fcbec4299585dcf7b748ccd1c19f" + "sha256=8ea7af348d24bf52f359afaab1e8f2aa75824934c97eff76ed84f2613f4e3a3e" + "sha512=3ae8e9755a276e5b0d8e39b82a5568ca4427de18dca3201ee0678a9c84d52c7fa701351d4fdb781d64a609802020cfb2d3c2ecb000d2e3a6b151282b075aac00" ] } diff --git a/esy.lock/opam/stdlib-shims.0.1.0/opam b/esy.lock/opam/stdlib-shims.0.3.0/opam similarity index 67% rename from esy.lock/opam/stdlib-shims.0.1.0/opam rename to esy.lock/opam/stdlib-shims.0.3.0/opam index c6f3529a..d657e043 100644 --- a/esy.lock/opam/stdlib-shims.0.1.0/opam +++ b/esy.lock/opam/stdlib-shims.0.3.0/opam @@ -8,9 +8,8 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues" tags: ["stdlib" "compatibility" "org:ocaml"] license: ["typeof OCaml system"] depends: [ - "ocaml" {>= "4.02.3"} "dune" - ("dune" {>= "2.8.0"} | "ocaml" {< "4.12.0~~"}) + "ocaml" {>= "4.02.3"} ] build: [ "dune" "build" "-p" name "-j" jobs ] synopsis: "Backport some of the new stdlib features to older compiler" @@ -21,8 +20,12 @@ 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.1.0/stdlib-shims-0.1.0.tbz" - checksum: "md5=12b5704eed70c6bff5ac39a16db1425d" + "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__dune_opam__c__2.7.1_opam_override/files/build.sh b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh deleted file mode 100644 index b2a94f75..00000000 --- a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -SECONDARY_CONF="$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf" - -if test -f $SECONDARY_CONF; then - export OCAMLFIND_CONF=$SECONDARY_CONF; -fi - -env -u OCAMLLIB ocaml bootstrap.ml -./dune.exe build -p dune --profile dune-bootstrap diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json deleted file mode 100644 index c7d77ab6..00000000 --- a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "buildsInSource": true, - "build": "bash build.sh", - "install": "esy-installer dune.install", - "buildEnv": { - "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" - } -} diff --git a/package.json b/package.json index 3d5187d0..b352ae6d 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,9 @@ "author": "Oscar Spencer ", "license": "Apache-2.0", "dependencies": { - "ocaml": "^4.9.0", + "ocaml": ">= 4.9.0 < 4.12.0", "@opam/dune": "^2.7.1", + "@opam/dune-configurator": "^2.7.1", "@opam/js_of_ocaml": "^3.6.0", "@opam/js_of_ocaml-ppx": "^3.6.0" }, diff --git a/src/config/dune b/src/config/dune new file mode 100644 index 00000000..7c4e3de6 --- /dev/null +++ b/src/config/dune @@ -0,0 +1,8 @@ +(executable + (name library_flags) + (libraries dune.configurator)) + +(rule + (targets library_flags.sexp) + (action + (run ./library_flags.exe))) diff --git a/src/config/library_flags.ml b/src/config/library_flags.ml new file mode 100644 index 00000000..aed09514 --- /dev/null +++ b/src/config/library_flags.ml @@ -0,0 +1,17 @@ +module C = Configurator.V1 + +let () = + C.main ~name:"library_flags" (fun c -> + let default = [] in + + let library_flags = + match C.ocaml_config_var c "system" with + | Some("macosx") -> + (* These flags preserve the original C error behavior *) + ["-cclib"; "-Wl,-keep_dwarf_unwind"] + | Some(_) -> default + | None -> default + in + + C.Flags.write_sexp "library_flags.sexp" library_flags + ) diff --git a/src/dune b/src/dune index 991e4419..2d3b32bd 100644 --- a/src/dune +++ b/src/dune @@ -11,6 +11,8 @@ binaryen_stubs_features binaryen_stubs_modules ocaml_helpers) (flags -O2 -Wall -Wextra)) (foreign_archives binaryen) + (library_flags + (:include ./config/library_flags.sexp)) (c_library_flags -lstdc++ -lpthread)) (rule diff --git a/test/test.expected b/test/test.expected index e8e88d8f..6c5b3f56 100644 --- a/test/test.expected +++ b/test/test.expected @@ -1,6 +1,7 @@ (module (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) (memory $0 1) + (export "adder" (func $adder)) (export "memory" (memory $0)) (func $adder (param $0 i32) (param $1 i32) (result i32) (block $add (result i32) @@ -20,6 +21,25 @@ (module (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) (memory $0 1) + (export "adder" (func $adder)) + (export "memory" (memory $0)) + (func $adder (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32) + (i32.add + (select + (local.get $0) + (i32.load8_s + (local.get $1) + ) + (i32.const 1) + ) + (local.get $1) + ) + ) +) +(module + (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (memory $0 1) + (export "adder" (func $0)) (export "memory" (memory $0)) (func $0 (param $0 i32) (param $1 i32) (result i32) (i32.add diff --git a/test/test.ml b/test/test.ml index 03c0afdc..cf2a5322 100644 --- a/test/test.ml +++ b/test/test.ml @@ -22,10 +22,16 @@ let add = Expression.block wasm_mod ~return_type:Type.int32 "add" [bin] (* Create the add function *) let adder = Function.add_function wasm_mod "adder" params results [||] add +let _ = Export.add_function_export wasm_mod "adder" "adder" + let _ = Memory.set_memory wasm_mod 1 Memory.unlimited "memory" [] false let _ = Module.print wasm_mod +let _ = Module.optimize wasm_mod + +let _ = Module.print wasm_mod + let byts, _ = Module.write wasm_mod None let new_mod = Module.read byts