diff --git a/binaryen.opam b/binaryen.opam index a30c761..a6cb4ef 100644 --- a/binaryen.opam +++ b/binaryen.opam @@ -13,7 +13,7 @@ build: [ ] depends: [ "ocaml" {>= "4.08"} - "dune" {>= "2.6"} + "dune" {= "2.6.1"} "conf-cmake" {build} "conf-python-3" {build} "js_of_ocaml" {>= "3.6.0"} diff --git a/esy.lock/index.json b/esy.lock/index.json index 6447697..5c3f3bd 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,15 +1,15 @@ { - "checksum": "66cd5ee08677230468a01245bfffa63d", + "checksum": "4a283d479876ff587fb37e3c4ef95c02", "root": "binaryen.ml@link-dev:./package.json", "node": { - "ocaml@4.10.0@d41d8cd9": { - "id": "ocaml@4.10.0@d41d8cd9", + "ocaml@4.11.1000@d41d8cd9": { + "id": "ocaml@4.11.1000@d41d8cd9", "name": "ocaml", - "version": "4.10.0", + "version": "4.11.1000", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.10.0.tgz#sha1:3797ee252dca8dec38d3cdd42162923f56dba433" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.11.1000.tgz#sha1:a46c81076f3ed073de0d90351addc8a0bb87825f" ] }, "overrides": [], @@ -94,17 +94,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", + "ocaml@4.11.1000@d41d8cd9", "esy-python@github:esy-packages/esy-python#53918f6447633d149ca59329474714c50bf729c4@d41d8cd9", "esy-cmake@github:esy-packages/esy-cmake#d3e4fb29ca3e01c13f62c8ca8af061ea976b6096@d41d8cd9", - "@opam/js_of_ocaml-ppx@opam:3.7.0@9d1fa02b", - "@opam/js_of_ocaml@opam:3.7.0@99efac52", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/js_of_ocaml-ppx@opam:3.7.0@f724034c", + "@opam/js_of_ocaml@opam:3.7.0@e619b586", + "@opam/fpath@opam:0.7.2@3fd2da53", "@opam/dune@opam:2.6.1@9c1418b7" ], "devDependencies": [ - "@opam/ocamlformat@opam:0.15.0@417e3356", - "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#ce1840355541ff60b999e39388835027f89d8798@d41d8cd9", - "@opam/js_of_ocaml-compiler@opam:3.7.0@1ba8f3df" + "@opam/ocamlformat@opam:0.15.0@8e036963", + "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#0358d7db474ce5ef23a7eb7cefa39076403911da@d41d8cd9", + "@opam/js_of_ocaml-compiler@opam:3.7.0@ee4f8777" ], "installConfig": { "pnp": false } }, @@ -126,14 +126,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.11.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.6.1@9c1418b7", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/biniou@opam:1.2.1@d7570399" + "ocaml@4.11.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.6.1@9c1418b7", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -154,7 +154,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "ocaml@4.11.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", "@opam/topkg@opam:1.0.2@3c5942ad", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -162,7 +162,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + "ocaml@4.11.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, "@opam/uuseg@opam:13.0.0@f60712a7": { @@ -183,7 +183,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/topkg@opam:1.0.2@3c5942ad", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -191,7 +191,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uucp@opam:13.0.0@e9b515e0" + "ocaml@4.11.1000@d41d8cd9", "@opam/uucp@opam:13.0.0@e9b515e0" ] }, "@opam/uucp@opam:13.0.0@e9b515e0": { @@ -212,14 +212,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/topkg@opam:1.0.2@3c5942ad", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.4@93208aac", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] }, "@opam/uchar@opam:0.0.2@c8218eea": { "id": "@opam/uchar@opam:0.0.2@c8218eea", @@ -239,10 +239,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.11.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] }, "@opam/tyxml@opam:4.4.0@1dca5713": { "id": "@opam/tyxml@opam:4.4.0@1dca5713", @@ -262,14 +262,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/topkg@opam:1.0.2@3c5942ad": { @@ -290,16 +290,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.11.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + "ocaml@4.11.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, - "@opam/stdlib-shims@opam:0.1.0@d957c903": { - "id": "@opam/stdlib-shims@opam:0.1.0@d957c903", + "@opam/stdlib-shims@opam:0.1.0@8c116481": { + "id": "@opam/stdlib-shims@opam:0.1.0@8c116481", "name": "@opam/stdlib-shims", "version": "opam:0.1.0", "source": { @@ -316,11 +316,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/stdio@opam:v0.14.0@a624e254": { @@ -341,13 +341,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base@opam:v0.14.0@b8817fc1", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", + "@opam/base@opam:v0.14.0@8bc55fce", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base@opam:v0.14.0@b8817fc1" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", + "@opam/base@opam:v0.14.0@8bc55fce" ] }, "@opam/sexplib0@opam:v0.14.0@ddeb6438": { @@ -368,11 +368,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -390,9 +390,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] }, "@opam/result@opam:1.5@6b753c82": { "id": "@opam/result@opam:1.5@6b753c82", @@ -412,11 +412,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { @@ -437,12 +437,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": { @@ -463,16 +463,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.6.1@9c1418b7" ] }, - "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1": { - "id": "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", + "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414": { + "id": "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "name": "@opam/ppx_tools_versioned", "version": "opam:5.4.0", "source": { @@ -489,14 +489,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", + "ocaml@4.11.1000@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", + "ocaml@4.11.1000@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -517,11 +517,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/odoc@opam:1.5.1@52a58c0b": { @@ -542,23 +542,23 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713", - "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.2@45477b93", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.11.1000@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713", + "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.2@3fd2da53", + "@opam/dune@opam:2.6.1@9c1418b7", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/cmdliner@opam:1.0.4@93208aac", - "@opam/astring@opam:0.8.4@bfea80d7", + "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713", - "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.2@45477b93", - "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/tyxml@opam:4.4.0@1dca5713", + "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.2@3fd2da53", + "@opam/dune@opam:2.6.1@9c1418b7", "@opam/cmdliner@opam:1.0.4@93208aac", - "@opam/astring@opam:0.8.4@bfea80d7" + "@opam/astring@opam:0.8.5@1300cee8" ] }, - "@opam/ocamlformat@opam:0.15.0@417e3356": { - "id": "@opam/ocamlformat@opam:0.15.0@417e3356", + "@opam/ocamlformat@opam:0.15.0@8e036963": { + "id": "@opam/ocamlformat@opam:0.15.0@8e036963", "name": "@opam/ocamlformat", "version": "opam:0.15.0", "source": { @@ -575,64 +575,31 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.1000@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/odoc@opam:1.5.1@52a58c0b", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/menhir@opam:20200624@8629ff13", - "@opam/fpath@opam:0.7.2@45477b93", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/fpath@opam:0.7.2@3fd2da53", + "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.6.1@9c1418b7", "@opam/cmdliner@opam:1.0.4@93208aac", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/base@opam:v0.14.0@b8817fc1", + "@opam/base@opam:v0.14.0@8bc55fce", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.11.1000@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/odoc@opam:1.5.1@52a58c0b", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/menhir@opam:20200624@8629ff13", - "@opam/fpath@opam:0.7.2@45477b93", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/fpath@opam:0.7.2@3fd2da53", + "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.6.1@9c1418b7", "@opam/cmdliner@opam:1.0.4@93208aac", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/base@opam:v0.14.0@b8817fc1" - ] - }, - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2": { - "id": "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "name": "@opam/ocamlfind-secondary", - "version": "opam:1.8.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/18/18ca650982c15536616dea0e422cbd8c#md5:18ca650982c15536616dea0e422cbd8c", - "archive:http://download2.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c", - "archive:http://download.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c" - ], - "opam": { - "name": "ocamlfind-secondary", - "version": "1.8.1", - "path": "esy.lock/opam/ocamlfind-secondary.1.8.1" - } - }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override" - } - ], - "dependencies": [ - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f" + "@opam/base@opam:v0.14.0@8bc55fce" ] }, "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { @@ -659,10 +626,10 @@ } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", + "ocaml@4.11.1000@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] }, "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -687,36 +654,9 @@ } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] - }, - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f": { - "id": "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", - "name": "@opam/ocaml-secondary-compiler", - "version": "opam:4.08.1-1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/72/723b6bfe8cf5abcbccc6911143f71055#md5:723b6bfe8cf5abcbccc6911143f71055", - "archive:https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz#md5:723b6bfe8cf5abcbccc6911143f71055" - ], - "opam": { - "name": "ocaml-secondary-compiler", - "version": "4.08.1-1", - "path": "esy.lock/opam/ocaml-secondary-compiler.4.08.1-1" - } - }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override" - } - ], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] }, "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47": { "id": "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", @@ -736,46 +676,49 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.6.1@9c1418b7" ] }, - "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#ce1840355541ff60b999e39388835027f89d8798@d41d8cd9": { + "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#0358d7db474ce5ef23a7eb7cefa39076403911da@d41d8cd9": { "id": - "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#ce1840355541ff60b999e39388835027f89d8798@d41d8cd9", + "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#0358d7db474ce5ef23a7eb7cefa39076403911da@d41d8cd9", "name": "@opam/ocaml-lsp-server", "version": - "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#ce1840355541ff60b999e39388835027f89d8798", + "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#0358d7db474ce5ef23a7eb7cefa39076403911da", "source": { "type": "install", "source": [ - "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#ce1840355541ff60b999e39388835027f89d8798" + "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#0358d7db474ce5ef23a7eb7cefa39076403911da" ] }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/stdlib-shims@opam:0.1.0@d957c903", + "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/stdlib-shims@opam:0.1.0@8c116481", + "@opam/result@opam:1.5@6b753c82", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.2@03ffe168", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.6.1@9c1418b7", "@opam/csexp@opam:1.3.1@5165cf17", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/stdlib-shims@opam:0.1.0@d957c903", + "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/stdlib-shims@opam:0.1.0@8c116481", + "@opam/result@opam:1.5@6b753c82", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.2@03ffe168", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.6.1@9c1418b7", "@opam/csexp@opam:1.3.1@5165cf17" ] }, "@opam/menhirSdk@opam:20200624@2a05b5a7": { @@ -796,11 +739,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/menhirLib@opam:20200624@8bdd2b0e": { @@ -821,11 +764,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/menhir@opam:20200624@8629ff13": { @@ -846,18 +789,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "ocaml@4.11.1000@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", "@opam/menhirLib@opam:20200624@8bdd2b0e", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "ocaml@4.11.1000@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", "@opam/menhirLib@opam:20200624@8bdd2b0e", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.6.1@9c1418b7" ] }, - "@opam/js_of_ocaml-ppx@opam:3.7.0@9d1fa02b": { - "id": "@opam/js_of_ocaml-ppx@opam:3.7.0@9d1fa02b", + "@opam/js_of_ocaml-ppx@opam:3.7.0@f724034c": { + "id": "@opam/js_of_ocaml-ppx@opam:3.7.0@f724034c", "name": "@opam/js_of_ocaml-ppx", "version": "opam:3.7.0", "source": { @@ -874,22 +817,22 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", + "ocaml@4.11.1000@d41d8cd9", + "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/js_of_ocaml@opam:3.7.0@99efac52", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/js_of_ocaml@opam:3.7.0@e619b586", + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", + "ocaml@4.11.1000@d41d8cd9", + "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/js_of_ocaml@opam:3.7.0@99efac52", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/js_of_ocaml@opam:3.7.0@e619b586", + "@opam/dune@opam:2.6.1@9c1418b7" ] }, - "@opam/js_of_ocaml-compiler@opam:3.7.0@1ba8f3df": { - "id": "@opam/js_of_ocaml-compiler@opam:3.7.0@1ba8f3df", + "@opam/js_of_ocaml-compiler@opam:3.7.0@ee4f8777": { + "id": "@opam/js_of_ocaml-compiler@opam:3.7.0@ee4f8777", "name": "@opam/js_of_ocaml-compiler", "version": "opam:3.7.0", "source": { @@ -906,24 +849,24 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/menhir@opam:20200624@8629ff13", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.6.1@9c1418b7", "@opam/cmdliner@opam:1.0.4@93208aac", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.11.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/menhir@opam:20200624@8629ff13", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.6.1@9c1418b7", "@opam/cmdliner@opam:1.0.4@93208aac" ] }, - "@opam/js_of_ocaml@opam:3.7.0@99efac52": { - "id": "@opam/js_of_ocaml@opam:3.7.0@99efac52", + "@opam/js_of_ocaml@opam:3.7.0@e619b586": { + "id": "@opam/js_of_ocaml@opam:3.7.0@e619b586", "name": "@opam/js_of_ocaml", "version": "opam:3.7.0", "source": { @@ -940,22 +883,22 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", + "ocaml@4.11.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/js_of_ocaml-compiler@opam:3.7.0@1ba8f3df", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/js_of_ocaml-compiler@opam:3.7.0@ee4f8777", + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", + "ocaml@4.11.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/js_of_ocaml-compiler@opam:3.7.0@1ba8f3df", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/js_of_ocaml-compiler@opam:3.7.0@ee4f8777", + "@opam/dune@opam:2.6.1@9c1418b7" ] }, - "@opam/fpath@opam:0.7.2@45477b93": { - "id": "@opam/fpath@opam:0.7.2@45477b93", + "@opam/fpath@opam:0.7.2@3fd2da53": { + "id": "@opam/fpath@opam:0.7.2@3fd2da53", "name": "@opam/fpath", "version": "opam:0.7.2", "source": { @@ -972,16 +915,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad", + "ocaml@4.11.1000@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad", "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/astring@opam:0.8.4@bfea80d7", + "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/astring@opam:0.8.4@bfea80d7" + "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/astring@opam:0.8.5@1300cee8" ] }, "@opam/fix@opam:20200131@0ecd2f01": { @@ -1002,11 +945,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -1027,11 +970,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f": { @@ -1052,11 +995,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/dune-configurator@opam:2.6.2@a8db4839": { @@ -1078,11 +1021,11 @@ "overrides": [], "dependencies": [ "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/dune-build-info@opam:2.6.2@03ffe168": { @@ -1103,46 +1046,68 @@ }, "overrides": [], "dependencies": [ - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:2.6.2@20433b4f" ] + "devDependencies": [ "@opam/dune@opam:2.6.1@9c1418b7" ] }, - "@opam/dune@opam:2.6.2@20433b4f": { - "id": "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.6.1@9c1418b7": { + "id": "@opam/dune@opam:2.6.1@9c1418b7", "name": "@opam/dune", - "version": "opam:2.6.2", + "version": "opam:2.6.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" + "archive:https://opam.ocaml.org/cache/sha256/5e/5ef959f286448ee172f1cffc86c439a6f7b662676e6015b282db071bb88899a0#sha256:5ef959f286448ee172f1cffc86c439a6f7b662676e6015b282db071bb88899a0", + "archive:https://github.com/ocaml/dune/releases/download/2.6.1/dune-2.6.1.tbz#sha256:5ef959f286448ee172f1cffc86c439a6f7b662676e6015b282db071bb88899a0" ], "opam": { "name": "dune", - "version": "2.6.2", - "path": "esy.lock/opam/dune.2.6.2" + "version": "2.6.1", + "path": "esy.lock/opam/dune.2.6.1" } }, "overrides": [ { "opamoverride": - "esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override" + "esy.lock/overrides/opam__s__dune_opam__c__2.6.1_opam_override" } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.11.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.11.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, + "@opam/csexp@opam:1.3.1@5165cf17": { + "id": "@opam/csexp@opam:1.3.1@5165cf17", + "name": "@opam/csexp", + "version": "opam:1.3.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/89/89e8c4181dc13e99cf67ddf2e258ea334352470e65b39041e62b61bcf0825155#sha256:89e8c4181dc13e99cf67ddf2e258ea334352470e65b39041e62b61bcf0825155", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.1/csexp-1.3.1.tbz#sha256:89e8c4181dc13e99cf67ddf2e258ea334352470e65b39041e62b61bcf0825155" + ], + "opam": { + "name": "csexp", + "version": "1.3.1", + "path": "esy.lock/opam/csexp.1.3.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.11.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.6.1@9c1418b7" + ] + }, "@opam/cppo@opam:1.6.6@f4f83858": { "id": "@opam/cppo@opam:1.6.6@f4f83858", "name": "@opam/cppo", @@ -1161,12 +1126,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.11.1000@d41d8cd9", "@opam/dune@opam:2.6.1@9c1418b7", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -1205,9 +1170,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] }, "@opam/biniou@opam:1.2.1@d7570399": { "id": "@opam/biniou@opam:1.2.1@d7570399", @@ -1227,12 +1192,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.11.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.11.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.6.1@9c1418b7" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -1269,8 +1234,8 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/base@opam:v0.14.0@b8817fc1": { - "id": "@opam/base@opam:v0.14.0@b8817fc1", + "@opam/base@opam:v0.14.0@8bc55fce": { + "id": "@opam/base@opam:v0.14.0@8bc55fce", "name": "@opam/base", "version": "opam:v0.14.0", "source": { @@ -1287,40 +1252,40 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "ocaml@4.11.1000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.6.1@9c1418b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "ocaml@4.11.1000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.6.1@9c1418b7" ] }, - "@opam/astring@opam:0.8.4@bfea80d7": { - "id": "@opam/astring@opam:0.8.4@bfea80d7", + "@opam/astring@opam:0.8.5@1300cee8": { + "id": "@opam/astring@opam:0.8.5@1300cee8", "name": "@opam/astring", - "version": "opam:0.8.4", + "version": "opam:0.8.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/54/548fcbf501ca4cb816d219ca4f25f660#md5:548fcbf501ca4cb816d219ca4f25f660", - "archive:https://erratique.ch/software/astring/releases/astring-0.8.4.tbz#md5:548fcbf501ca4cb816d219ca4f25f660" + "archive:https://opam.ocaml.org/cache/md5/e1/e148907c24157d1df43bec89b58b3ec8#md5:e148907c24157d1df43bec89b58b3ec8", + "archive:https://erratique.ch/software/astring/releases/astring-0.8.5.tbz#md5:e148907c24157d1df43bec89b58b3ec8" ], "opam": { "name": "astring", - "version": "0.8.4", - "path": "esy.lock/opam/astring.0.8.4" + "version": "0.8.5", + "path": "esy.lock/opam/astring.0.8.5" } }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad", + "ocaml@4.11.1000@d41d8cd9", "@opam/topkg@opam:1.0.2@3c5942ad", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.11.1000@d41d8cd9" ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { "id": "@esy-ocaml/substs@0.0.1@d41d8cd9", diff --git a/esy.lock/opam/astring.0.8.4/opam b/esy.lock/opam/astring.0.8.5/opam similarity index 93% rename from esy.lock/opam/astring.0.8.4/opam rename to esy.lock/opam/astring.0.8.5/opam index 2e0e6d1..338a06a 100644 --- a/esy.lock/opam/astring.0.8.4/opam +++ b/esy.lock/opam/astring.0.8.5/opam @@ -8,7 +8,7 @@ bug-reports: "https://github.com/dbuenzli/astring/issues" tags: [ "string" "org:erratique" ] license: "ISC" depends: [ - "ocaml" {>= "4.05.0" & < "4.12.0"} + "ocaml" {>= "4.05.0"} "ocamlfind" {build} "ocamlbuild" {build} "topkg" {build} ] @@ -32,6 +32,6 @@ Astring depends only on the OCaml standard library. It is distributed under the ISC license. """ url { -archive: "https://erratique.ch/software/astring/releases/astring-0.8.4.tbz" -checksum: "548fcbf501ca4cb816d219ca4f25f660" +archive: "https://erratique.ch/software/astring/releases/astring-0.8.5.tbz" +checksum: "e148907c24157d1df43bec89b58b3ec8" } diff --git a/esy.lock/opam/base.v0.14.0/opam b/esy.lock/opam/base.v0.14.0/opam index 73852d1..1394770 100644 --- a/esy.lock/opam/base.v0.14.0/opam +++ b/esy.lock/opam/base.v0.14.0/opam @@ -10,7 +10,7 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.07.0"} + "ocaml" {>= "4.07.0" & < "4.12"} "sexplib0" {>= "v0.14" & < "v0.15"} "dune" {>= "2.0.0"} "dune-configurator" diff --git a/esy.lock/opam/csexp.1.3.1/opam b/esy.lock/opam/csexp.1.3.1/opam new file mode 100644 index 0000000..f7a97c2 --- /dev/null +++ b/esy.lock/opam/csexp.1.3.1/opam @@ -0,0 +1,58 @@ +opam-version: "2.0" +synopsis: "Parsing and printing of S-expressions in Canonical form" +description: """ + +This library provides minimal support for Canonical S-expressions +[1]. Canonical S-expressions are a binary encoding of S-expressions +that is super simple and well suited for communication between +programs. + +This library only provides a few helpers for simple applications. If +you need more advanced support, such as parsing from more fancy input +sources, you should consider copying the code of this library given +how simple parsing S-expressions in canonical form is. + +To avoid a dependency on a particular S-expression library, the only +module of this library is parameterised by the type of S-expressions. + +[1] https://en.wikipedia.org/wiki/Canonical_S-expressions +""" +maintainer: ["Jeremie Dimino "] +authors: [ + "Quentin Hocquet " + "Jane Street Group, LLC " + "Jeremie Dimino " +] +license: "MIT" +homepage: "https://github.com/ocaml-dune/csexp" +doc: "https://ocaml-dune.github.io/csexp/" +bug-reports: "https://github.com/ocaml-dune/csexp/issues" +depends: [ + "dune" {>= "2.5"} + "ocaml" {>= "4.02.3"} + "ppx_expect" {with-test} + "result" {>= "1.5"} +] +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/ocaml-dune/csexp.git" +url { + src: + "https://github.com/ocaml-dune/csexp/releases/download/1.3.1/csexp-1.3.1.tbz" + checksum: [ + "sha256=89e8c4181dc13e99cf67ddf2e258ea334352470e65b39041e62b61bcf0825155" + "sha512=dd6b3894529c828926ee05070548125822ad3bee8324623de0188d49655439286343f8cbc2ede8a27e01af5715e3bc1e643d6a0d770061b384d6dcefdb545eb2" + ] +} diff --git a/esy.lock/opam/dune.2.6.2/opam b/esy.lock/opam/dune.2.6.1/opam similarity index 82% rename from esy.lock/opam/dune.2.6.2/opam rename to esy.lock/opam/dune.2.6.1/opam index 655fb01..1c006c1 100644 --- a/esy.lock/opam/dune.2.6.2/opam +++ b/esy.lock/opam/dune.2.6.1/opam @@ -42,14 +42,14 @@ build: [ depends: [ # Please keep the lower bound in sync with .travis.yml, dune-project # and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + ("ocaml" {>= "4.07" & < "4.12"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.6.1/dune-2.6.1.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=5ef959f286448ee172f1cffc86c439a6f7b662676e6015b282db071bb88899a0" + "sha512=67b750716563fde1135f3d0f3892f97e912d6f95a40bcd7cd854f3ae09ba0b037e7b8829bdaee141cb6c998396f2a51a380451db117571d77895781798d625e7" ] } diff --git a/esy.lock/opam/fpath.0.7.2/opam b/esy.lock/opam/fpath.0.7.2/opam index 2613a6a..f90f49f 100644 --- a/esy.lock/opam/fpath.0.7.2/opam +++ b/esy.lock/opam/fpath.0.7.2/opam @@ -8,7 +8,7 @@ bug-reports: "https://github.com/dbuenzli/fpath/issues" tags: [ "file" "system" "path" "org:erratique" ] license: "ISC" depends: [ - "ocaml" {>= "4.01.0"} + "ocaml" {>= "4.01.0" & < "4.12"} "ocamlfind" {build} "ocamlbuild" {build} "topkg" {build & >= "0.9.0"} diff --git a/esy.lock/opam/js_of_ocaml-compiler.3.7.0/opam b/esy.lock/opam/js_of_ocaml-compiler.3.7.0/opam index ecc12b5..dbd715c 100644 --- a/esy.lock/opam/js_of_ocaml-compiler.3.7.0/opam +++ b/esy.lock/opam/js_of_ocaml-compiler.3.7.0/opam @@ -19,7 +19,7 @@ depends: [ "ppx_expect" {with-test & >= "v0.12.0"} "cmdliner" "menhir" - "ocaml-migrate-parsetree" + "ocaml-migrate-parsetree" {< "2.0.0"} "yojson" # It's optional, but we want users to be able to use source-map without pain. ] diff --git a/esy.lock/opam/js_of_ocaml-ppx.3.7.0/opam b/esy.lock/opam/js_of_ocaml-ppx.3.7.0/opam index b770226..1233c25 100644 --- a/esy.lock/opam/js_of_ocaml-ppx.3.7.0/opam +++ b/esy.lock/opam/js_of_ocaml-ppx.3.7.0/opam @@ -16,7 +16,7 @@ build: [["dune" "build" "-p" name "-j" jobs]] depends: [ "ocaml" {>= "4.02.0"} "dune" {>= "2.5"} - "ocaml-migrate-parsetree" {>= "1.4"} + "ocaml-migrate-parsetree" {>= "1.4" & < "2.0.0"} "ppx_tools_versioned" {>= "5.2.3"} "js_of_ocaml" {= version} ] diff --git a/esy.lock/opam/js_of_ocaml.3.7.0/opam b/esy.lock/opam/js_of_ocaml.3.7.0/opam index 9d56bef..a63268d 100644 --- a/esy.lock/opam/js_of_ocaml.3.7.0/opam +++ b/esy.lock/opam/js_of_ocaml.3.7.0/opam @@ -16,7 +16,7 @@ build: [["dune" "build" "-p" name "-j" jobs]] depends: [ "ocaml" {>= "4.02.0"} "dune" {>= "2.5"} - "ocaml-migrate-parsetree" {>= "1.4"} + "ocaml-migrate-parsetree" {>= "1.4" & < "2.0.0"} "ppx_tools_versioned" {>= "5.2.3"} "uchar" "js_of_ocaml-compiler" {= version} diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch deleted file mode 100644 index cda19dd..0000000 --- a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Fri, 26 Jul 2019 12:12:19 +0100 -Subject: [PATCH] Don't build manpages for stdlib docs ---- - ocamldoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index b109815071..e31e441f61 100644 ---- a/ocamldoc/Makefile -+++ b/ocamldoc/Makefile -@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) - - - .PHONY: all --all: lib exe generators manpages -+all: lib exe generators - - manpages: generators - --- -2.20.1 - diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch deleted file mode 100644 index 41f5f77..0000000 --- a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Tue, 6 Aug 2019 09:23:06 +0100 -Subject: [PATCH] Fix failure to install tools links - -In --disable-installing-bytecode-programs mode, the .opt version of the -tools is installed, but the symlink for the tool itself is not created. ---- - tools/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/Makefile b/tools/Makefile -index 530dd37f34..1b3014a3ab 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -197,6 +197,7 @@ else - do \ - if test -f "$$i".opt; then \ - $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ -+ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ - fi; \ - done - endif --- -2.20.1 - diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch deleted file mode 100644 index e37b5e8..0000000 --- a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3f10a16153308f967149917585d2bc0b9c06492c -Author: Anil Madhavapeddy -Date: Sun Jun 21 18:40:27 2020 +0100 - - Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build - - Signed-off-by: Anil Madhavapeddy - -diff --git a/configure b/configure -index 9a78a4554..0c54b560b 100755 ---- a/configure -+++ b/configure -@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( - gcc-*) : -- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings" ;; #( - msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" -diff --git a/configure.ac b/configure.ac -index f5d8a2687..775e0e2db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -540,7 +540,7 @@ AS_CASE([$host], - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings"], - [gcc-*], -- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings"], - [msvc-*], - [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam deleted file mode 100644 index 905f9b3..0000000 --- a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam +++ /dev/null @@ -1,51 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml 4.08.1 Secondary Switch Compiler" -maintainer: "platform@lists.ocaml.org" -authors: "Xavier Leroy and many contributors" -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml/ocaml/issues" -dev-repo: "git://github.com/ocaml/ocaml" -depends: "ocaml" {< "4.08.0" | >= "4.09~"} -build: [ - [ - "./configure" - "--prefix=%{_:share}%" - "--libdir=%{_:share}%/lib" - "--disable-debugger" - "--disable-installing-bytecode-programs" - "--disable-debug-runtime" - "--disable-instrumented-runtime" - "--disable-graph-lib" - "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} - "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} - ] - [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] -] -install: [make "install"] -url { - src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" - checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" -} -extra-files: [ - ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] - ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] - ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] -] -patches: [ - "0001-Don-t-build-manpages-for-stdlib-docs.patch" - "0001-Fix-failure-to-install-tools-links.patch" - "fix-gcc10.patch" -] - -post-messages: [ - "A failure in the middle of the build may be caused by build parallelism - (enabled by default). - Please file a bug report at https://github.com/ocaml/ocaml/issues" - {failure & jobs > 1 & os != "cygwin"} - "You can try installing again including --jobs=1 - to force a sequential build instead." - {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} -] -description: "Installs an additional compiler to the opam switch in -%{_:share}%/ocaml-secondary-compiler which can be accessed using -`ocamlfind -toolchain secondary`." diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in deleted file mode 100644 index 12e3ee6..0000000 --- a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in +++ /dev/null @@ -1,3 +0,0 @@ -description = "OCaml Secondary Compiler" -version = "%{ocaml-secondary-compiler:version}%" -directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in deleted file mode 100644 index d13023c..0000000 --- a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" -ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" -ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" -ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" -ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" -ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" -ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/esy.lock/opam/ocamlfind-secondary.1.8.1/opam deleted file mode 100644 index acdb576..0000000 --- a/esy.lock/opam/ocamlfind-secondary.1.8.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "David Allsopp " -homepage: "https://github.com/ocaml/opam-repository" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] -install: [ - [make "install-meta"] - ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] - ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] - ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] - ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] -] -depends: [ - "ocaml-secondary-compiler" - "ocamlfind" {= "1.8.1"} -] -synopsis: "ocamlfind support for ocaml-secondary-compiler" -description: """ -Exposes the compiler built by the ocaml-secondary-compielr package via --toolchain secondary. A virtual package called ocaml is also installed to -locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" -authors: ["Gerd Stolpmann " "David Allsopp "] -substs: ["META" "ocaml-secondary-compiler.conf"] -extra-files: [ - ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] - ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] -] -url { - src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" - checksum: "md5=18ca650982c15536616dea0e422cbd8c" - mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" -} diff --git a/esy.lock/opam/ocamlformat.0.15.0/opam b/esy.lock/opam/ocamlformat.0.15.0/opam index 236816a..9d1f9f4 100644 --- a/esy.lock/opam/ocamlformat.0.15.0/opam +++ b/esy.lock/opam/ocamlformat.0.15.0/opam @@ -20,7 +20,7 @@ depends: [ "fix" "fpath" "menhir" - "ocaml-migrate-parsetree" {>= "1.7.3"} + "ocaml-migrate-parsetree" {>= "1.7.3" & < "2.0.0"} "ocp-indent" {with-test} "odoc" {>= "1.4.2"} "re" diff --git a/esy.lock/opam/ppx_tools_versioned.5.4.0/opam b/esy.lock/opam/ppx_tools_versioned.5.4.0/opam index 4f5f125..9305dd1 100644 --- a/esy.lock/opam/ppx_tools_versioned.5.4.0/opam +++ b/esy.lock/opam/ppx_tools_versioned.5.4.0/opam @@ -18,7 +18,7 @@ build: [ depends: [ "ocaml" {>= "4.02.0"} "dune" {>= "1.0"} - "ocaml-migrate-parsetree" {>= "1.7.0"} + "ocaml-migrate-parsetree" {>= "1.7.0" & < "2.0.0"} ] synopsis: "A variant of ppx_tools based on ocaml-migrate-parsetree" url { diff --git a/esy.lock/opam/stdlib-shims.0.1.0/opam b/esy.lock/opam/stdlib-shims.0.1.0/opam index 5839c43..0d1079d 100644 --- a/esy.lock/opam/stdlib-shims.0.1.0/opam +++ b/esy.lock/opam/stdlib-shims.0.1.0/opam @@ -8,8 +8,9 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues" tags: ["stdlib" "compatibility" "org:ocaml"] license: ["typeof OCaml system"] depends: [ + "ocaml" {>="4.02.3"} "dune" - "ocaml" {>= "4.02.3"} + ("dune" {>= "2.7.0"} | "dune" & "ocaml" {<"4.12.0~~"}) ] build: [ "dune" "build" "-p" name "-j" jobs ] synopsis: "Backport some of the new stdlib features to older compiler" diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.6.1_opam_override/package.json similarity index 94% rename from esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json rename to esy.lock/overrides/opam__s__dune_opam__c__2.6.1_opam_override/package.json index f2b2e9f..affde1b 100644 --- a/esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json +++ b/esy.lock/overrides/opam__s__dune_opam__c__2.6.1_opam_override/package.json @@ -27,8 +27,5 @@ "buildEnv": { "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" - }, - "dependencies": { - "ocaml": "*" } } diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll deleted file mode 100755 index 26301dd..0000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -# clone-flexdll -# -# Brings in flexdll, if necessary - -if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then - echo "[Flexdll] Already present, no need to clone." -else - echo "[Flexdll] Cloning..." - git clone https://github.com/esy-ocaml/flexdll.git - cd flexdll - git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff - cd .. - echo "[Flexdll] Clone successful!" -fi \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows deleted file mode 100755 index 4040b49..0000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -# configure-windows -# -# Creates a native Windows MingW build, based on: -# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc - - -export prefix=C:/ocamlmgw64 -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - esac - shift -done - -echo "[configure-windows] Setting up flexdll" -./clone-flexdll -./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix -make flexdll diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build deleted file mode 100755 index b95356a..0000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build +++ /dev/null @@ -1,24 +0,0 @@ -#! /usr/bin/env bash - -# esy-build -# -# Wrapper to execute appropriate build strategy, based on platform - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-build] Detected windows environment..." - make -j4 world.opt - make flexlink.opt - ;; - *) - echo "[esy-build] Detected OSX / Linux environment" - make -j4 world.opt - ;; -esac - -# Common build steps -make install \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure deleted file mode 100755 index fd196c5..0000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure +++ /dev/null @@ -1,29 +0,0 @@ -#! /usr/bin/env bash - -# esy-configure -# -# Wrapper to delegate to configuration to the -# appropriate `configure` strategy based on the active platform. -# -# Today, OCaml has separate build strategies: -# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc -# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc -# -# We want `esy` to work cross-platform, so this is a shim script that will delegate to the -# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` -# that the `mingw` (native executable) strategy is desired. - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-configure] Detected windows environment..." - ./configure-windows "$@" - ;; - *) - echo "[esy-configure] Detected OSX / Linux environment" - ./configure "$@" - ;; -esac \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json deleted file mode 100644 index 948455c..0000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "buildEnv": { - "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - }, - "build": [ - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-configure", - "--disable-cfi", - "--prefix", "$cur__install/share/ocaml-secondary-compiler", - "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", - "--disable-debugger", - "--disable-installing-bytecode-programs", - "--disable-debug-runtime", - "--disable-instrumented-runtime", - "--disable-graph-lib" - ], - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-build" - ] - ], - "buildsInSource": true -} diff --git a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch deleted file mode 100644 index 3e3ee5a..0000000 --- a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml diff --git a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh deleted file mode 100644 index c923ef4..0000000 --- a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh +++ /dev/null @@ -1,14 +0,0 @@ -OCAML_SECONDARY_COMPILER=$1 - -cat >ocaml-secondary-compiler.conf <META <