diff --git a/esy.json b/esy.json index 24fe0998..4ec9f497 100644 --- a/esy.json +++ b/esy.json @@ -43,7 +43,6 @@ "test": "esy x bash -cx ./scripts/test-dev.cmd", "test-ci": "esy x bash -cx ./scripts/test-ci.cmd", "doc": "esy refmterr dune build --profile=release @doc" - }, "dependencies": { "refmterr": "*", @@ -52,13 +51,10 @@ "@opam/junit": "*", "@opam/qcheck-core": "0.9", "@opam/merlin": "*", - "ocaml": "~4.6.4", - "@opam/dune": "1.10.0", - "@opam/reason": "3.5.0", + "ocaml": " >= 4.2.0 < 4.11.0", + "@opam/dune": "< 2.8.0", + "@esy-ocaml/reason": "< 4.0.0", "@opam/sexplib0": "*", "@opam/odoc": "*" - }, - "resolutions": { - "@opam/reason": "let-def/reason:reason.opam#474900e6d9d5ecef788fbe78e8a23cb20d151a72" } } diff --git a/esy.lock/.gitattributes b/esy.lock/.gitattributes index 25366aee..e0b4e26c 100644 --- a/esy.lock/.gitattributes +++ b/esy.lock/.gitattributes @@ -1,3 +1,3 @@ # Set eol to LF so files aren't converted to CRLF-eol on Windows. -* text eol=lf +* text eol=lf linguist-generated diff --git a/esy.lock/index.json b/esy.lock/index.json index 7fd28dea..f062513c 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,24 +1,24 @@ { - "checksum": "497f7d119dd15c26b505a50ec084e029", + "checksum": "917e54ac6b9539d99090d0c2e56e7453", "root": "reason-native-dev@link-dev:./esy.json", "node": { - "refmterr@3.3.0@d41d8cd9": { - "id": "refmterr@3.3.0@d41d8cd9", + "refmterr@3.3.2@d41d8cd9": { + "id": "refmterr@3.3.2@d41d8cd9", "name": "refmterr", - "version": "3.3.0", + "version": "3.3.2", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.3.0.tgz#sha1:45adde80205093c201b491b3c37dd7740c9b036b" + "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.3.2.tgz#sha1:0536990e8a9f69684bdaa1e441904da6722fbb5a" ] }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@reason-native/pastel@0.2.3@d41d8cd9", + "ocaml@4.10.1002@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", "@reason-native/console@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:1.10.0@a33f48e9", - "@opam/atdgen@opam:2.0.0@46af0360", - "@esy-ocaml/reason@3.5.2@d41d8cd9" + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/atdgen@opam:2.2.1@d73fda11", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -29,45 +29,61 @@ "source": { "type": "link-dev", "path": ".", "manifest": "esy.json" }, "overrides": [], "dependencies": [ - "refmterr@3.3.0@d41d8cd9", "ocaml@4.6.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.13.0@3f54c2be", - "@opam/reason@github:let-def/reason:reason.opam#474900e6d9d5ecef788fbe78e8a23cb20d151a72@d41d8cd9", + "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.1002@d41d8cd9", + "@opam/sexplib0@opam:v0.14.0@ddeb6438", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/qcheck-core@opam:0.9@3f95f89d", - "@opam/odoc@opam:1.4.2@11b715bb", "@opam/merlin@opam:3.3.3@d653b06a", - "@opam/junit@opam:2.0.1@1b4d302c", "@opam/dune@opam:1.10.0@a33f48e9", - "@opam/atdgen@opam:2.0.0@46af0360" + "@opam/odoc@opam:1.5.2@236518eb", "@opam/merlin@opam:3.4.2@9a4d1fd4", + "@opam/junit@opam:2.0.2@0b7bd730", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/atdgen@opam:2.2.1@d73fda11", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, - "ocaml@4.6.1000@d41d8cd9": { - "id": "ocaml@4.6.1000@d41d8cd9", + "ocaml@4.10.1002@d41d8cd9": { + "id": "ocaml@4.10.1002@d41d8cd9", "name": "ocaml", - "version": "4.6.1000", + "version": "4.10.1002", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.6.1000.tgz#sha1:99525ef559353481396454f9a072dedc96b52f44" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.10.1002.tgz#sha1:66d454c686aacfeb0372b5a9306b57aa623f2eff" ] }, "overrides": [], "dependencies": [], "devDependencies": [] }, - "@reason-native/pastel@0.2.3@d41d8cd9": { - "id": "@reason-native/pastel@0.2.3@d41d8cd9", + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9": { + "id": + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9", + "name": "esy-m4", + "version": + "github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7", + "source": { + "type": "install", + "source": [ + "github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, + "@reason-native/pastel@0.3.0@d41d8cd9": { + "id": "@reason-native/pastel@0.3.0@d41d8cd9", "name": "@reason-native/pastel", - "version": "0.2.3", + "version": "0.3.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.2.3.tgz#sha1:5c5d420c09874584ce15a38695c5dfd0f0ff5dfa" + "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.3.0.tgz#sha1:07da3c5a0933e61bc3b353bc85aa71ac7c0f311c" ] }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.10.0@a33f48e9", "@esy-ocaml/reason@3.5.2@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -83,8 +99,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", - "@esy-ocaml/reason@3.5.2@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -106,14 +122,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.10.0@a33f48e9", "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.10.1002@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.10.0@a33f48e9", "@opam/biniou@opam:1.2.1@d7570399" + "ocaml@4.10.1002@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -134,15 +150,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.10.1002@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "@opam/topkg@opam:1.0.3@e4e10f1c", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.4@93208aac", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + "ocaml@4.10.1002@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, "@opam/uchar@opam:0.0.2@c8218eea": { @@ -163,168 +179,132 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.10.1002@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ] }, - "@opam/tyxml@opam:4.3.0@c1da25f1": { - "id": "@opam/tyxml@opam:4.3.0@c1da25f1", + "@opam/tyxml@opam:4.4.0@1dca5713": { + "id": "@opam/tyxml@opam:4.4.0@1dca5713", "name": "@opam/tyxml", - "version": "opam:4.3.0", + "version": "opam:4.4.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/fd/fd834a567f813bf447cab5f4c3a723e2#md5:fd834a567f813bf447cab5f4c3a723e2", - "archive:https://github.com/ocsigen/tyxml/releases/download/4.3.0/tyxml-4.3.0.tbz#md5:fd834a567f813bf447cab5f4c3a723e2" + "archive:https://opam.ocaml.org/cache/sha256/51/516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530#sha256:516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530", + "archive:https://github.com/ocsigen/tyxml/releases/download/4.4.0/tyxml-4.4.0.tbz#sha256:516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530" ], "opam": { "name": "tyxml", - "version": "4.3.0", - "path": "esy.lock/opam/tyxml.4.3.0" + "version": "4.4.0", + "path": "esy.lock/opam/tyxml.4.4.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.10.0@a33f48e9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@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" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@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/topkg@opam:1.0.1@a42c631e": { - "id": "@opam/topkg@opam:1.0.1@a42c631e", + "@opam/topkg@opam:1.0.3@e4e10f1c": { + "id": "@opam/topkg@opam:1.0.3@e4e10f1c", "name": "@opam/topkg", - "version": "opam:1.0.1", + "version": "opam:1.0.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/16/16b90e066d8972a5ef59655e7c28b3e9#md5:16b90e066d8972a5ef59655e7c28b3e9", - "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.1.tbz#md5:16b90e066d8972a5ef59655e7c28b3e9" + "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f", + "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f" ], "opam": { "name": "topkg", - "version": "1.0.1", - "path": "esy.lock/opam/topkg.1.0.1" + "version": "1.0.3", + "path": "esy.lock/opam/topkg.1.0.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.10.1002@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.6.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + "ocaml@4.10.1002@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, - "@opam/sexplib0@opam:v0.13.0@3f54c2be": { - "id": "@opam/sexplib0@opam:v0.13.0@3f54c2be", + "@opam/sexplib0@opam:v0.14.0@ddeb6438": { + "id": "@opam/sexplib0@opam:v0.14.0@ddeb6438", "name": "@opam/sexplib0", - "version": "opam:v0.13.0", + "version": "opam:v0.14.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/f8/f8a715dffda5599cfae0cb4031d57abe#md5:f8a715dffda5599cfae0cb4031d57abe", - "archive:https://ocaml.janestreet.com/ocaml-core/v0.13/files/sexplib0-v0.13.0.tar.gz#md5:f8a715dffda5599cfae0cb4031d57abe" + "archive:https://opam.ocaml.org/cache/md5/37/37aff0af8f8f6f759249475684aebdc4#md5:37aff0af8f8f6f759249475684aebdc4", + "archive:https://ocaml.janestreet.com/ocaml-core/v0.14/files/sexplib0-v0.14.0.tar.gz#md5:37aff0af8f8f6f759249475684aebdc4" ], "opam": { "name": "sexplib0", - "version": "v0.13.0", - "path": "esy.lock/opam/sexplib0.v0.13.0" + "version": "v0.14.0", + "path": "esy.lock/opam/sexplib0.v0.14.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/seq@opam:0.2.2@e9144e45": { - "id": "@opam/seq@opam:0.2.2@e9144e45", + "@opam/seq@opam:base@d8d7de1d": { + "id": "@opam/seq@opam:base@d8d7de1d", "name": "@opam/seq", - "version": "opam:0.2.2", + "version": "opam:base", "source": { "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/90/9033e02283aa3bde9f97f24e632902e3#md5:9033e02283aa3bde9f97f24e632902e3", - "archive:https://github.com/c-cube/seq/archive/0.2.2.tar.gz#md5:9033e02283aa3bde9f97f24e632902e3" - ], + "source": [ "no-source:" ], "opam": { "name": "seq", - "version": "0.2.2", - "path": "esy.lock/opam/seq.0.2.2" + "version": "base", + "path": "esy.lock/opam/seq.base" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" - ] + "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ] }, - "@opam/result@opam:1.4@dc720aef": { - "id": "@opam/result@opam:1.4@dc720aef", + "@opam/result@opam:1.5@6b753c82": { + "id": "@opam/result@opam:1.5@6b753c82", "name": "@opam/result", - "version": "opam:1.4", + "version": "opam:1.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/d3/d3162dbc501a2af65c8c71e0866541da#md5:d3162dbc501a2af65c8c71e0866541da", - "archive:https://github.com/janestreet/result/archive/1.4.tar.gz#md5:d3162dbc501a2af65c8c71e0866541da" + "archive:https://opam.ocaml.org/cache/md5/1b/1b82dec78849680b49ae9a8a365b831b#md5:1b82dec78849680b49ae9a8a365b831b", + "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#md5:1b82dec78849680b49ae9a8a365b831b" ], "opam": { "name": "result", - "version": "1.4", - "path": "esy.lock/opam/result.1.4" + "version": "1.5", + "path": "esy.lock/opam/result.1.5" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" - ] - }, - "@opam/reason@github:let-def/reason:reason.opam#474900e6d9d5ecef788fbe78e8a23cb20d151a72@d41d8cd9": { - "id": - "@opam/reason@github:let-def/reason:reason.opam#474900e6d9d5ecef788fbe78e8a23cb20d151a72@d41d8cd9", - "name": "@opam/reason", - "version": - "github:let-def/reason:reason.opam#474900e6d9d5ecef788fbe78e8a23cb20d151a72", - "source": { - "type": "install", - "source": [ - "github:let-def/reason:reason.opam#474900e6d9d5ecef788fbe78e8a23cb20d151a72" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20190924@004407ff", - "@opam/fix@opam:20181206@6f3a1b41", - "@opam/dune@opam:1.10.0@a33f48e9", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20190924@004407ff", - "@opam/fix@opam:20181206@6f3a1b41", "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { @@ -345,12 +325,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", - "@opam/dune@opam:1.10.0@a33f48e9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", - "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/qcheck-core@opam:0.9@3f95f89d": { @@ -371,13 +351,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -400,14 +380,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", - "@opam/result@opam:1.4@dc720aef", + "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", + "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef" + "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -428,40 +408,44 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/odoc@opam:1.4.2@11b715bb": { - "id": "@opam/odoc@opam:1.4.2@11b715bb", + "@opam/odoc@opam:1.5.2@236518eb": { + "id": "@opam/odoc@opam:1.5.2@236518eb", "name": "@opam/odoc", - "version": "opam:1.4.2", + "version": "opam:1.5.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/d7/d75ce63539040cd199d22203d46fc5f3#md5:d75ce63539040cd199d22203d46fc5f3", - "archive:https://github.com/ocaml/odoc/archive/1.4.2.tar.gz#md5:d75ce63539040cd199d22203d46fc5f3" + "archive:https://opam.ocaml.org/cache/sha256/d2/d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871", + "archive:https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871" ], "opam": { "name": "odoc", - "version": "1.4.2", - "path": "esy.lock/opam/odoc.1.4.2" + "version": "1.5.2", + "path": "esy.lock/opam/odoc.1.5.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/tyxml@opam:4.3.0@c1da25f1", - "@opam/result@opam:1.4@dc720aef", "@opam/fpath@opam:0.7.2@45477b93", - "@opam/dune@opam:1.10.0@a33f48e9", "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.10.1002@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/cmdliner@opam:1.0.4@93208aac", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@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/cmdliner@opam:1.0.4@93208aac", + "@opam/astring@opam:0.8.5@1300cee8" ] }, "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { @@ -488,10 +472,10 @@ } ], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", + "ocaml@4.10.1002@d41d8cd9", "@opam/conf-m4@opam:1@196bf219", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ] }, "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -516,216 +500,220 @@ } ], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ] }, - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc": { - "id": "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "name": "@opam/ocaml-migrate-parsetree", - "version": "opam:1.5.0", + "@opam/merlin-extend@opam:0.6@404f814c": { + "id": "@opam/merlin-extend@opam:0.6@404f814c", + "name": "@opam/merlin-extend", + "version": "opam:0.6", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/7f/7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0#sha256:7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0", - "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz#sha256:7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0" + "archive:https://opam.ocaml.org/cache/sha256/c2/c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43", + "archive:https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" ], "opam": { - "name": "ocaml-migrate-parsetree", - "version": "1.5.0", - "path": "esy.lock/opam/ocaml-migrate-parsetree.1.5.0" + "name": "merlin-extend", + "version": "0.6", + "path": "esy.lock/opam/merlin-extend.0.6" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.10.0@a33f48e9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/merlin-extend@opam:0.5@a5dd7d4b": { - "id": "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "name": "@opam/merlin-extend", - "version": "opam:0.5", + "@opam/merlin@opam:3.4.2@9a4d1fd4": { + "id": "@opam/merlin@opam:3.4.2@9a4d1fd4", + "name": "@opam/merlin", + "version": "opam:3.4.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/ca/ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227#sha256:ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227", - "archive:https://github.com/let-def/merlin-extend/releases/download/v0.5/merlin-extend-v0.5.tbz#sha256:ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227" + "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", + "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" ], "opam": { - "name": "merlin-extend", - "version": "0.5", - "path": "esy.lock/opam/merlin-extend.0.5" + "name": "merlin", + "version": "3.4.2", + "path": "esy.lock/opam/merlin.3.4.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", - "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/csexp@opam:1.3.2@5cea14af" ] }, - "@opam/merlin@opam:3.3.3@d653b06a": { - "id": "@opam/merlin@opam:3.3.3@d653b06a", - "name": "@opam/merlin", - "version": "opam:3.3.3", + "@opam/menhirSdk@opam:20201122@552e084f": { + "id": "@opam/menhirSdk@opam:20201122@552e084f", + "name": "@opam/menhirSdk", + "version": "opam:20201122", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/72/72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15#sha256:72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15", - "archive:https://github.com/ocaml/merlin/releases/download/v3.3.3/merlin-v3.3.3.tbz#sha256:72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15" + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" ], "opam": { - "name": "merlin", - "version": "3.3.3", - "path": "esy.lock/opam/merlin.3.3.3" + "name": "menhirSdk", + "version": "20201122", + "path": "esy.lock/opam/menhirSdk.20201122" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:1.10.0@a33f48e9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/menhir@opam:20190924@004407ff": { - "id": "@opam/menhir@opam:20190924@004407ff", - "name": "@opam/menhir", - "version": "opam:20190924", + "@opam/menhirLib@opam:20201122@a11a6018": { + "id": "@opam/menhirLib@opam:20201122@a11a6018", + "name": "@opam/menhirLib", + "version": "opam:20201122", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/67/677f1997fb73177d5a00fa1b8d61c3ef#md5:677f1997fb73177d5a00fa1b8d61c3ef", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz#md5:677f1997fb73177d5a00fa1b8d61c3ef" + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" ], "opam": { - "name": "menhir", - "version": "20190924", - "path": "esy.lock/opam/menhir.20190924" + "name": "menhirLib", + "version": "20201122", + "path": "esy.lock/opam/menhirLib.20201122" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] + "devDependencies": [ + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] }, - "@opam/junit@opam:2.0.1@1b4d302c": { - "id": "@opam/junit@opam:2.0.1@1b4d302c", - "name": "@opam/junit", - "version": "opam:2.0.1", + "@opam/menhir@opam:20201122@35e9e3ea": { + "id": "@opam/menhir@opam:20201122@35e9e3ea", + "name": "@opam/menhir", + "version": "opam:20201122", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/40/40224fb3d4f5e47dc5ff4605587d383b#md5:40224fb3d4f5e47dc5ff4605587d383b", - "archive:https://github.com/Khady/ocaml-junit/releases/download/2.0.1/junit-2.0.1.tbz#md5:40224fb3d4f5e47dc5ff4605587d383b" + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" ], "opam": { - "name": "junit", - "version": "2.0.1", - "path": "esy.lock/opam/junit.2.0.1" + "name": "menhir", + "version": "20201122", + "path": "esy.lock/opam/menhir.20201122" } }, "overrides": [], "dependencies": [ - "@opam/tyxml@opam:4.3.0@c1da25f1", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:1.10.0@a33f48e9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/menhirSdk@opam:20201122@552e084f", + "@opam/menhirLib@opam:20201122@a11a6018", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/tyxml@opam:4.3.0@c1da25f1", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/menhirSdk@opam:20201122@552e084f", + "@opam/menhirLib@opam:20201122@a11a6018", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/jbuilder@opam:transition@20522f05": { - "id": "@opam/jbuilder@opam:transition@20522f05", - "name": "@opam/jbuilder", - "version": "opam:transition", + "@opam/junit@opam:2.0.2@0b7bd730": { + "id": "@opam/junit@opam:2.0.2@0b7bd730", + "name": "@opam/junit", + "version": "opam:2.0.2", "source": { "type": "install", - "source": [ "no-source:" ], + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/fd/fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01#sha256:fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01", + "archive:https://github.com/Khady/ocaml-junit/releases/download/2.0.2/junit-2.0.2.tbz#sha256:fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01" + ], "opam": { - "name": "jbuilder", - "version": "transition", - "path": "esy.lock/opam/jbuilder.transition" + "name": "junit", + "version": "2.0.2", + "path": "esy.lock/opam/junit.2.0.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" + "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/fpath@opam:0.7.2@45477b93": { - "id": "@opam/fpath@opam:0.7.2@45477b93", + "@opam/fpath@opam:0.7.3@674d8125": { + "id": "@opam/fpath@opam:0.7.3@674d8125", "name": "@opam/fpath", - "version": "opam:0.7.2", + "version": "opam:0.7.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/52/52c7ecb0bf180088336f3c645875fa41#md5:52c7ecb0bf180088336f3c645875fa41", - "archive:http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz#md5:52c7ecb0bf180088336f3c645875fa41" + "archive:https://opam.ocaml.org/cache/md5/07/0740b530e8fed5b0adc5eee8463cfc2f#md5:0740b530e8fed5b0adc5eee8463cfc2f", + "archive:https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz#md5:0740b530e8fed5b0adc5eee8463cfc2f" ], "opam": { "name": "fpath", - "version": "0.7.2", - "path": "esy.lock/opam/fpath.0.7.2" + "version": "0.7.3", + "path": "esy.lock/opam/fpath.0.7.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", - "@opam/result@opam:1.4@dc720aef", + "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/astring@opam:0.8.3@4e5e17d5" + "ocaml@4.10.1002@d41d8cd9", "@opam/astring@opam:0.8.5@1300cee8" ] }, - "@opam/fix@opam:20181206@6f3a1b41": { - "id": "@opam/fix@opam:20181206@6f3a1b41", + "@opam/fix@opam:20201120@5c318621": { + "id": "@opam/fix@opam:20201120@5c318621", "name": "@opam/fix", - "version": "opam:20181206", + "version": "opam:20201120", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/ae/ae129ed3822149a7f8c98f975512e534#md5:ae129ed3822149a7f8c98f975512e534", - "archive:https://gitlab.inria.fr/fpottier/fix/repository/20181206/archive.tar.gz#md5:ae129ed3822149a7f8c98f975512e534" + "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": "20181206", - "path": "esy.lock/opam/fix.20181206" + "version": "20201120", + "path": "esy.lock/opam/fix.20201120" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -746,40 +734,102 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/dune@opam:1.10.0@a33f48e9": { - "id": "@opam/dune@opam:1.10.0@a33f48e9", + "@opam/dune@opam:2.7.1@f5f493bc": { + "id": "@opam/dune@opam:2.7.1@f5f493bc", "name": "@opam/dune", - "version": "opam:1.10.0", + "version": "opam:2.7.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/ed/ed16e628de270c5dc242fbf52e6b80252f7039c04d93970779f13c135e4edd95#sha256:ed16e628de270c5dc242fbf52e6b80252f7039c04d93970779f13c135e4edd95", - "archive:https://github.com/ocaml/dune/releases/download/1.10.0/dune-1.10.0.tbz#sha256:ed16e628de270c5dc242fbf52e6b80252f7039c04d93970779f13c135e4edd95" + "archive:https://opam.ocaml.org/cache/sha256/c3/c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d", + "archive:https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz#sha256:c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" ], "opam": { "name": "dune", - "version": "1.10.0", - "path": "esy.lock/opam/dune.1.10.0" + "version": "2.7.1", + "path": "esy.lock/opam/dune.2.7.1" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": + "esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override" + } + ], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.1002@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.1002@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", + "name": "@opam/dot-merlin-reader", + "version": "opam:3.4.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", + "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + ], + "opam": { + "name": "dot-merlin-reader", + "version": "3.4.2", + "path": "esy.lock/opam/dot-merlin-reader.3.4.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af" + ] + }, + "@opam/csexp@opam:1.3.2@5cea14af": { + "id": "@opam/csexp@opam:1.3.2@5cea14af", + "name": "@opam/csexp", + "version": "opam:1.3.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + ], + "opam": { + "name": "csexp", + "version": "1.3.2", + "path": "esy.lock/opam/csexp.1.3.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, "@opam/cppo@opam:1.6.6@f4f83858": { "id": "@opam/cppo@opam:1.6.6@f4f83858", "name": "@opam/cppo", @@ -798,17 +848,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.10.0@a33f48e9", + "ocaml@4.10.1002@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/conf-m4@opam:1@3b2b148a": { - "id": "@opam/conf-m4@opam:1@3b2b148a", + "@opam/conf-m4@opam:1@196bf219": { + "id": "@opam/conf-m4@opam:1@196bf219", "name": "@opam/conf-m4", "version": "opam:1", "source": { @@ -820,8 +870,16 @@ "path": "esy.lock/opam/conf-m4.1" } }, - "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "overrides": [ + { + "opamoverride": + "esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override" + } + ], + "dependencies": [ + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], "devDependencies": [] }, "@opam/cmdliner@opam:1.0.4@93208aac": { @@ -842,9 +900,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ] }, "@opam/biniou@opam:1.2.1@d7570399": { "id": "@opam/biniou@opam:1.2.1@d7570399", @@ -864,12 +922,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.10.0@a33f48e9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.10.0@a33f48e9" + "ocaml@4.10.1002@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -921,129 +979,126 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.10.1002@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" + "ocaml@4.10.1002@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" ] }, - "@opam/atdgen-runtime@opam:2.0.0@60f6faab": { - "id": "@opam/atdgen-runtime@opam:2.0.0@60f6faab", + "@opam/atdgen-runtime@opam:2.2.1@6a3a6395": { + "id": "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "name": "@opam/atdgen-runtime", - "version": "opam:2.0.0", + "version": "opam:2.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" + "archive:https://opam.ocaml.org/cache/sha256/db/db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e#sha256:db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e", + "archive:https://github.com/ahrefs/atd/releases/download/2.2.1/atd-2.2.1.tbz#sha256:db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e" ], "opam": { "name": "atdgen-runtime", - "version": "2.0.0", - "path": "esy.lock/opam/atdgen-runtime.2.0.0" + "version": "2.2.1", + "path": "esy.lock/opam/atdgen-runtime.2.2.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", + "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", + "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399" ] }, - "@opam/atdgen@opam:2.0.0@46af0360": { - "id": "@opam/atdgen@opam:2.0.0@46af0360", + "@opam/atdgen@opam:2.2.1@d73fda11": { + "id": "@opam/atdgen@opam:2.2.1@d73fda11", "name": "@opam/atdgen", - "version": "opam:2.0.0", + "version": "opam:2.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" + "archive:https://opam.ocaml.org/cache/sha256/db/db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e#sha256:db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e", + "archive:https://github.com/ahrefs/atd/releases/download/2.2.1/atd-2.2.1.tbz#sha256:db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e" ], "opam": { "name": "atdgen", - "version": "2.0.0", - "path": "esy.lock/opam/atdgen.2.0.0" + "version": "2.2.1", + "path": "esy.lock/opam/atdgen.2.2.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399", - "@opam/atdgen-runtime@opam:2.0.0@60f6faab", - "@opam/atd@opam:2.0.0@e0ddd12f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399", + "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", + "@opam/atd@opam:2.2.1@071ab6bd", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@20522f05", - "@opam/biniou@opam:1.2.1@d7570399", - "@opam/atdgen-runtime@opam:2.0.0@60f6faab", - "@opam/atd@opam:2.0.0@e0ddd12f" + "ocaml@4.10.1002@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399", + "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", + "@opam/atd@opam:2.2.1@071ab6bd" ] }, - "@opam/atd@opam:2.0.0@e0ddd12f": { - "id": "@opam/atd@opam:2.0.0@e0ddd12f", + "@opam/atd@opam:2.2.1@071ab6bd": { + "id": "@opam/atd@opam:2.2.1@071ab6bd", "name": "@opam/atd", - "version": "opam:2.0.0", + "version": "opam:2.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf", - "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf" + "archive:https://opam.ocaml.org/cache/sha256/db/db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e#sha256:db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e", + "archive:https://github.com/ahrefs/atd/releases/download/2.2.1/atd-2.2.1.tbz#sha256:db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e" ], "opam": { "name": "atd", - "version": "2.0.0", - "path": "esy.lock/opam/atd.2.0.0" + "version": "2.2.1", + "path": "esy.lock/opam/atd.2.2.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/menhir@opam:20190924@004407ff", - "@opam/jbuilder@opam:transition@20522f05", + "ocaml@4.10.1002@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/menhir@opam:20201122@35e9e3ea", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/jbuilder@opam:transition@20522f05", - "@opam/easy-format@opam:1.3.2@0484b3c4" + "ocaml@4.10.1002@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/menhir@opam:20201122@35e9e3ea", + "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc" ] }, - "@opam/astring@opam:0.8.3@4e5e17d5": { - "id": "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.5@1300cee8": { + "id": "@opam/astring@opam:0.8.5@1300cee8", "name": "@opam/astring", - "version": "opam:0.8.3", + "version": "opam:0.8.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c5/c5bf6352b9ac27fbeab342740f4fa870#md5:c5bf6352b9ac27fbeab342740f4fa870", - "archive:http://erratique.ch/software/astring/releases/astring-0.8.3.tbz#md5:c5bf6352b9ac27fbeab342740f4fa870" + "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.3", - "path": "esy.lock/opam/astring.0.8.3" + "version": "0.8.5", + "path": "esy.lock/opam/astring.0.8.5" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.10.1002@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" - ] + "devDependencies": [ "ocaml@4.10.1002@d41d8cd9" ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { "id": "@esy-ocaml/substs@0.0.1@d41d8cd9", @@ -1059,24 +1114,24 @@ "dependencies": [], "devDependencies": [] }, - "@esy-ocaml/reason@3.5.2@d41d8cd9": { - "id": "@esy-ocaml/reason@3.5.2@d41d8cd9", + "@esy-ocaml/reason@3.6.2@d41d8cd9": { + "id": "@esy-ocaml/reason@3.6.2@d41d8cd9", "name": "@esy-ocaml/reason", - "version": "3.5.2", + "version": "3.6.2", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.5.2.tgz#sha1:ac48b63fd66fbbc1d77ab6a2b7e3a1ba21a8f40b" + "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#sha1:49bd53c75dd241eb14f46277a85af353908f7e81" ] }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.10.1002@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", - "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20190924@004407ff", - "@opam/dune@opam:1.10.0@a33f48e9" + "@opam/merlin-extend@opam:0.6@404f814c", + "@opam/menhir@opam:20201122@35e9e3ea", + "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.7.1@f5f493bc" ], "devDependencies": [] } diff --git a/esy.lock/opam/astring.0.8.3/opam b/esy.lock/opam/astring.0.8.5/opam similarity index 64% rename from esy.lock/opam/astring.0.8.3/opam rename to esy.lock/opam/astring.0.8.5/opam index 578ba1fa..338a06a3 100644 --- a/esy.lock/opam/astring.0.8.3/opam +++ b/esy.lock/opam/astring.0.8.5/opam @@ -1,24 +1,22 @@ opam-version: "2.0" maintainer: "Daniel Bünzli " -authors: ["Daniel Bünzli "] -homepage: "http://erratique.ch/software/astring" -doc: "http://erratique.ch/software/astring/doc" +authors: ["The astring programmers"] +homepage: "https://erratique.ch/software/astring" +doc: "https://erratique.ch/software/astring/doc" dev-repo: "git+http://erratique.ch/repos/astring.git" bug-reports: "https://github.com/dbuenzli/astring/issues" tags: [ "string" "org:erratique" ] license: "ISC" depends: [ - "ocaml" {>= "4.01.0"} + "ocaml" {>= "4.05.0"} "ocamlfind" {build} "ocamlbuild" {build} - "topkg" {build} - "base-bytes" -] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" ]] -synopsis: "Alternative String module for OCaml" -description: """ + "topkg" {build} ] +build: [[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]] + +synopsis: """Alternative String module for OCaml""" +description: """\ + Astring exposes an alternative `String` module for OCaml. This module tries to balance minimality and expressiveness for basic, index-free, string processing and provides types and functions for substrings, @@ -31,8 +29,9 @@ and names, adds a few missing functions and fully exploits OCaml's newfound string immutability. Astring depends only on the OCaml standard library. It is distributed -under the ISC license.""" +under the ISC license. +""" url { - src: "http://erratique.ch/software/astring/releases/astring-0.8.3.tbz" - checksum: "md5=c5bf6352b9ac27fbeab342740f4fa870" +archive: "https://erratique.ch/software/astring/releases/astring-0.8.5.tbz" +checksum: "e148907c24157d1df43bec89b58b3ec8" } diff --git a/esy.lock/opam/atd.2.0.0/opam b/esy.lock/opam/atd.2.0.0/opam deleted file mode 100644 index 2808354c..00000000 --- a/esy.lock/opam/atd.2.0.0/opam +++ /dev/null @@ -1,34 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.03.0"} - "jbuilder" - "menhir" {build} - "easy-format" -] -synopsis: "Parser for the ATD data format description language" -description: """ -ATD is the OCaml library providing a parser for the ATD language and -various utilities. ATD stands for Adjustable Type Definitions in -reference to its main property of supporting annotations that allow a -good fit with a variety of data formats.""" -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/atd.2.2.1/opam b/esy.lock/opam/atd.2.2.1/opam new file mode 100644 index 00000000..66462201 --- /dev/null +++ b/esy.lock/opam/atd.2.2.1/opam @@ -0,0 +1,55 @@ +opam-version: "2.0" +synopsis: "Parser for the ATD data format description language" +description: """ +ATD is the OCaml library providing a parser for the ATD language and various +utilities. ATD stands for Adjustable Type Definitions in reference to its main +property of supporting annotations that allow a good fit with a variety of data +formats. """ +maintainer: ["Rudi Grinberg "] +authors: [ + "Martin Jambon " + "David Sheets " + "Rudi Grinberg " + "Ivan Jager " + "Jeff Meister " + "Carmelo Piccione " + "Raman Varabets " + "Mathieu Baudet " + "Rauan Mayemir " + "Louis Roché " + "Brendan Long " + "Christophe Troestler " + "Vincent Bernardoff " + "haoyang " +] +license: "MIT" +homepage: "https://github.com/ahrefs/atd" +bug-reports: "https://github.com/ahrefs/atd/issues" +depends: [ + "ocaml" {>= "4.02"} + "dune" {>= "2.0"} + "menhir" + "easy-format" + "re" +] +dev-repo: "git+https://github.com/ahrefs/atd.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ahrefs/atd/releases/download/2.2.1/atd-2.2.1.tbz" + checksum: [ + "sha256=db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e" + "sha512=0c7f1985cc4d87ddd541bb2f7085b72f81aaef69468653319a4a52e6cd6c9318511229784a12cdb413ae500e7a5b8195759e0d8d49946a9b00f62e8dda07e8a2" + ] +} diff --git a/esy.lock/opam/atdgen-runtime.2.0.0/opam b/esy.lock/opam/atdgen-runtime.2.0.0/opam deleted file mode 100644 index 7236d930..00000000 --- a/esy.lock/opam/atdgen-runtime.2.0.0/opam +++ /dev/null @@ -1,29 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.02.3"} - "jbuilder" - "biniou" {>= "1.0.6"} - "yojson" {>= "1.2.1"} -] -synopsis: "Runtime library for code generated by atdgen." -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/atdgen-runtime.2.2.1/opam b/esy.lock/opam/atdgen-runtime.2.2.1/opam new file mode 100644 index 00000000..54678984 --- /dev/null +++ b/esy.lock/opam/atdgen-runtime.2.2.1/opam @@ -0,0 +1,53 @@ +opam-version: "2.0" +synopsis: "Runtime library for code generated by atdgen" +description: """ +This package should be used only in conjunction with the stdgen code +generator""" +maintainer: ["Rudi Grinberg "] +authors: [ + "Martin Jambon " + "David Sheets " + "Rudi Grinberg " + "Ivan Jager " + "Jeff Meister " + "Carmelo Piccione " + "Raman Varabets " + "Mathieu Baudet " + "Rauan Mayemir " + "Louis Roché " + "Brendan Long " + "Christophe Troestler " + "Vincent Bernardoff " + "haoyang " +] +license: "MIT" +homepage: "https://github.com/ahrefs/atd" +bug-reports: "https://github.com/ahrefs/atd/issues" +depends: [ + "ocaml" {>= "4.02"} + "dune" {>= "2.0"} + "yojson" {>= "1.7.0"} + "biniou" {>= "1.0.6"} + "re" +] +dev-repo: "git+https://github.com/ahrefs/atd.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ahrefs/atd/releases/download/2.2.1/atd-2.2.1.tbz" + checksum: [ + "sha256=db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e" + "sha512=0c7f1985cc4d87ddd541bb2f7085b72f81aaef69468653319a4a52e6cd6c9318511229784a12cdb413ae500e7a5b8195759e0d8d49946a9b00f62e8dda07e8a2" + ] +} diff --git a/esy.lock/opam/atdgen.2.0.0/opam b/esy.lock/opam/atdgen.2.0.0/opam deleted file mode 100644 index d71d304e..00000000 --- a/esy.lock/opam/atdgen.2.0.0/opam +++ /dev/null @@ -1,44 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] - -homepage: "https://github.com/mjambon/atd" -bug-reports: "https://github.com/mjambon/atd/issues" -dev-repo: "git://github.com/mjambon/atd.git" - -build: [ - ["jbuilder" "subst" "-p" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] -] - -# Restore when https://github.com/mjambon/atd/issues/121 is resolved. -# build-test: [ -# ["jbuilder" "runtest" "-p" name] -# ] - -depends: [ - "ocaml" {>= "4.03.0"} - "jbuilder" - "atd" {>= "2.0.0"} - "atdgen-runtime" {>= "2.0.0"} - "biniou" {>= "1.0.6"} - "yojson" {>= "1.2.1"} -] -synopsis: - "Generates efficient JSON serializers, deserializers and validators" -description: """ -Atdgen is a command-line program that takes as input type definitions in the -ATD syntax and produces OCaml code suitable for data serialization and -deserialization. - -Two data formats are currently supported, these are biniou and JSON. -Atdgen-biniou and Atdgen-json will refer to Atdgen used in one context or the -other. - -Atdgen was designed with efficiency and durability in mind. Software authors -are encouraged to use Atdgen directly and to write tools that may reuse part of -Atdgen’s source code.""" -url { - src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz" - checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf" -} diff --git a/esy.lock/opam/atdgen.2.2.1/opam b/esy.lock/opam/atdgen.2.2.1/opam new file mode 100644 index 00000000..8831a69a --- /dev/null +++ b/esy.lock/opam/atdgen.2.2.1/opam @@ -0,0 +1,63 @@ +opam-version: "2.0" +synopsis: + "Generates efficient JSON serializers, deserializers and validators" +description: """ +Atdgen is a command-line program that takes as input type definitions in the ATD +syntax and produces OCaml code suitable for data serialization and +deserialization. +Two data formats are currently supported, these are biniou and JSON. +Atdgen-biniou and Atdgen-json will refer to Atdgen used in one context or the +other. +Atdgen was designed with efficiency and durability in mind. Software authors are +encouraged to use Atdgen directly and to write tools that may reuse part of +Atdgen’s source code.""" +maintainer: ["Rudi Grinberg "] +authors: [ + "Martin Jambon " + "David Sheets " + "Rudi Grinberg " + "Ivan Jager " + "Jeff Meister " + "Carmelo Piccione " + "Raman Varabets " + "Mathieu Baudet " + "Rauan Mayemir " + "Louis Roché " + "Brendan Long " + "Christophe Troestler " + "Vincent Bernardoff " + "haoyang " +] +license: "MIT" +homepage: "https://github.com/ahrefs/atd" +bug-reports: "https://github.com/ahrefs/atd/issues" +depends: [ + "ocaml" {>= "4.02"} + "dune" {>= "2.0"} + "atd" {>= "2.0.0"} + "atdgen-runtime" {>= "2.0.0"} + "atdgen-codec-runtime" {with-test} + "biniou" {>= "1.0.6"} + "yojson" {>= "1.7.0"} +] +dev-repo: "git+https://github.com/ahrefs/atd.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ahrefs/atd/releases/download/2.2.1/atd-2.2.1.tbz" + checksum: [ + "sha256=db6b4c1a6293b214a7b7a3da435e681abd1b16b55d5aa246b93d26736d3a559e" + "sha512=0c7f1985cc4d87ddd541bb2f7085b72f81aaef69468653319a4a52e6cd6c9318511229784a12cdb413ae500e7a5b8195759e0d8d49946a9b00f62e8dda07e8a2" + ] +} diff --git a/esy.lock/opam/csexp.1.3.2/opam b/esy.lock/opam/csexp.1.3.2/opam new file mode 100644 index 00000000..1508d17a --- /dev/null +++ b/esy.lock/opam/csexp.1.3.2/opam @@ -0,0 +1,58 @@ +opam-version: "2.0" +synopsis: "Parsing and printing of S-expressions in Canonical form" +description: """ + +This library provides minimal support for Canonical S-expressions +[1]. Canonical S-expressions are a binary encoding of S-expressions +that is super simple and well suited for communication between +programs. + +This library only provides a few helpers for simple applications. If +you need more advanced support, such as parsing from more fancy input +sources, you should consider copying the code of this library given +how simple parsing S-expressions in canonical form is. + +To avoid a dependency on a particular S-expression library, the only +module of this library is parameterised by the type of S-expressions. + +[1] https://en.wikipedia.org/wiki/Canonical_S-expressions +""" +maintainer: ["Jeremie Dimino "] +authors: [ + "Quentin Hocquet " + "Jane Street Group, LLC " + "Jeremie Dimino " +] +license: "MIT" +homepage: "https://github.com/ocaml-dune/csexp" +doc: "https://ocaml-dune.github.io/csexp/" +bug-reports: "https://github.com/ocaml-dune/csexp/issues" +depends: [ + "dune" {>= "1.11"} + "ocaml" {>= "4.02.3"} + "result" {>= "1.5"} +] +dev-repo: "git+https://github.com/ocaml-dune/csexp.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" +# "@runtest" {with-test & ocaml:version >= "4.04"} + "@doc" {with-doc} + ] +] +x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b" +url { + src: + "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz" + checksum: [ + "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026" + ] +} diff --git a/esy.lock/opam/dot-merlin-reader.3.4.2/opam b/esy.lock/opam/dot-merlin-reader.3.4.2/opam new file mode 100644 index 00000000..e740ed7d --- /dev/null +++ b/esy.lock/opam/dot-merlin-reader.3.4.2/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +synopsis: "Reads config files for merlin" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.1" & < "4.12"} + "dune" {>= "1.8.0"} + "yojson" {>= "1.6.0"} + "ocamlfind" {>= "1.6.0"} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} +] +x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" +url { + src: + "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" + checksum: [ + "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" + ] +} diff --git a/esy.lock/opam/dune.1.10.0/opam b/esy.lock/opam/dune.2.7.1/opam similarity index 53% rename from esy.lock/opam/dune.1.10.0/opam rename to esy.lock/opam/dune.2.7.1/opam index 54f9370b..aaa13e67 100644 --- a/esy.lock/opam/dune.1.10.0/opam +++ b/esy.lock/opam/dune.2.7.1/opam @@ -1,21 +1,14 @@ opam-version: "2.0" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -bug-reports: "https://github.com/ocaml/dune/issues" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -license: "MIT" -dev-repo: "git+https://github.com/ocaml/dune.git" -synopsis: "Fast, portable and opinionated build system" +synopsis: "Fast, portable, and opinionated build system" description: """ dune is a build system that was designed to simplify the release of Jane Street packages. It reads metadata from "dune" files following a very simple s-expression syntax. -dune is fast, it has very low-overhead and support parallel builds on -all platforms. It has no system dependencies, all you need to build -dune and packages using dune is OCaml. You don't need or make or bash +dune is fast, has very low-overhead, and supports parallel builds on +all platforms. It has no system dependencies; all you need to build +dune or packages using dune is OCaml. You don't need make or bash as long as the packages themselves don't use bash explicitly. dune supports multi-package development by simply dropping multiple @@ -26,28 +19,38 @@ several opam roots/switches simultaneously. This helps maintaining packages across several versions of OCaml and gives cross-compilation for free. """ -depends: [ - "ocaml" {>= "4.02" & < "4.09.0"} - "base-unix" - "base-threads" -] +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" conflicts: [ - "jbuilder" {!= "transition"} + "dune-configurator" {< "2.3.0"} "odoc" {< "1.3.0"} "dune-release" {< "1.3.0"} + "js_of_ocaml-compiler" {< "3.6.0"} + "jbuilder" {= "transition"} ] +dev-repo: "git+https://github.com/ocaml/dune.git" build: [ # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} - ["ocaml" "bootstrap.ml"] - ["./boot.exe" "--release" "--subst"] {pinned} - ["./boot.exe" "--release" "-j" jobs] + ["ocaml" "bootstrap.ml" "-j" jobs] + ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] +] +depends: [ + # Please keep the lower bound in sync with .github/workflows/workflow.yml, + # dune-project and min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) + "base-unix" + "base-threads" ] +x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c" url { - src: - "https://github.com/ocaml/dune/releases/download/1.10.0/dune-1.10.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz" checksum: [ - "sha256=ed16e628de270c5dc242fbf52e6b80252f7039c04d93970779f13c135e4edd95" - "sha512=2ba3e9a91650be2402bd88dc883b2b5dc1a73d63348a0fa5a9e5fa054da400f84a30e92656e7bec2c0a2786584ce85160ec5ce0b495908417d630f049af06675" + "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" + "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b" ] } diff --git a/esy.lock/opam/fix.20181206/opam b/esy.lock/opam/fix.20201120/opam similarity index 62% rename from esy.lock/opam/fix.20181206/opam rename to esy.lock/opam/fix.20201120/opam index fcdf0423..31c8a641 100644 --- a/esy.lock/opam/fix.20181206/opam +++ b/esy.lock/opam/fix.20201120/opam @@ -11,14 +11,14 @@ build: [ ] depends: [ "ocaml" { >= "4.03" } - "dune" + "dune" {>= "1.3" } ] synopsis: "Facilities for memoization and fixed points" url { src: - "https://gitlab.inria.fr/fpottier/fix/repository/20181206/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz" checksum: [ - "md5=ae129ed3822149a7f8c98f975512e534" - "sha512=1db240ff0a87200979bf4308e2110a37631f280e36c5f53dde767579ca63992a760eaeb6e1fc9a41c3f3a63d3dc29a3361114ad304cb09e83945ab4213ff5f6d" + "md5=7eb570b759635fe66f3556d2b1cc88e3" + "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4" ] } diff --git a/esy.lock/opam/fpath.0.7.2/opam b/esy.lock/opam/fpath.0.7.2/opam deleted file mode 100644 index 2613a6ac..00000000 --- a/esy.lock/opam/fpath.0.7.2/opam +++ /dev/null @@ -1,34 +0,0 @@ -opam-version: "2.0" -maintainer: "Daniel Bünzli " -authors: ["Daniel Bünzli "] -homepage: "http://erratique.ch/software/fpath" -doc: "http://erratique.ch/software/fpath/doc" -dev-repo: "git+http://erratique.ch/repos/fpath.git" -bug-reports: "https://github.com/dbuenzli/fpath/issues" -tags: [ "file" "system" "path" "org:erratique" ] -license: "ISC" -depends: [ - "ocaml" {>= "4.01.0"} - "ocamlfind" {build} - "ocamlbuild" {build} - "topkg" {build & >= "0.9.0"} - "result" - "astring" -] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--dev-pkg" "%{pinned}%" ]] -synopsis: "File system paths for OCaml" -description: """ -Fpath is an OCaml module for handling file system paths with POSIX or -Windows conventions. Fpath processes paths without accessing the file -system and is independent from any system library. - -Fpath depends on [Astring][astring] and is distributed under the ISC -license. - -[astring]: http://erratique.ch/software/astring""" -url { - src: "http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz" - checksum: "md5=52c7ecb0bf180088336f3c645875fa41" -} diff --git a/esy.lock/opam/fpath.0.7.3/opam b/esy.lock/opam/fpath.0.7.3/opam new file mode 100644 index 00000000..ae3336e4 --- /dev/null +++ b/esy.lock/opam/fpath.0.7.3/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["The fpath programmers"] +homepage: "https://erratique.ch/software/fpath" +doc: "https://erratique.ch/software/fpath/doc" +dev-repo: "git+https://erratique.ch/repos/fpath.git" +bug-reports: "https://github.com/dbuenzli/fpath/issues" +tags: [ "file" "system" "path" "org:erratique" ] +license: "ISC" +depends: [ + "ocaml" {>= "4.03.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build & >= "0.9.0"} + "astring" +] +build: [[ + "ocaml" "pkg/pkg.ml" "build" + "--dev-pkg=true" {dev} ]] + +synopsis: """File system paths for OCaml""" +description: """\ + +Fpath is an OCaml module for handling file system paths with POSIX or +Windows conventions. Fpath processes paths without accessing the file +system and is independent from any system library. + +Fpath depends on [Astring][astring] and is distributed under the ISC +license. + +[astring]: http://erratique.ch/software/astring +""" +url { +archive: "https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz" +checksum: "0740b530e8fed5b0adc5eee8463cfc2f" +} diff --git a/esy.lock/opam/jbuilder.transition/opam b/esy.lock/opam/jbuilder.transition/opam deleted file mode 100644 index 9280c3ff..00000000 --- a/esy.lock/opam/jbuilder.transition/opam +++ /dev/null @@ -1,18 +0,0 @@ -opam-version: "2.0" -maintainer: "opensource@janestreet.com" -authors: ["Jane Street Group, LLC "] -homepage: "https://github.com/ocaml/dune" -bug-reports: "https://github.com/ocaml/dune/issues" -dev-repo: "git+https://github.com/ocaml/dune.git" -license: "MIT" -depends: [ - "ocaml" - "dune" {< "2.0"} -] -post-messages: [ - "Jbuilder has been renamed and the jbuilder package is now a transition \ - package. Use the dune package instead." -] -synopsis: - "This is a transition package, jbuilder is now named dune. Use the dune" -description: "package instead." diff --git a/esy.lock/opam/junit.2.0.1/opam b/esy.lock/opam/junit.2.0.2/opam similarity index 73% rename from esy.lock/opam/junit.2.0.1/opam rename to esy.lock/opam/junit.2.0.2/opam index 77132993..874cf38f 100644 --- a/esy.lock/opam/junit.2.0.1/opam +++ b/esy.lock/opam/junit.2.0.2/opam @@ -3,7 +3,7 @@ maintainer: "Louis Roché " authors: "Louis Roché " homepage: "https://github.com/Khady/ocaml-junit" bug-reports: "https://github.com/Khady/ocaml-junit/issues" -license: "LGPL-3.0-or-later with OCaml-LGPL-linking-exception" +license: "LGPLv3+ with OCaml linking exception" dev-repo: "git+https://github.com/Khady/ocaml-junit.git" doc: "https://khady.github.io/ocaml-junit/" tags: ["junit" "jenkins"] @@ -24,6 +24,9 @@ synopsis: "JUnit XML reports generation library" description: "JUnit XML reports generation library" url { src: - "https://github.com/Khady/ocaml-junit/releases/download/2.0.1/junit-2.0.1.tbz" - checksum: "md5=40224fb3d4f5e47dc5ff4605587d383b" + "https://github.com/Khady/ocaml-junit/releases/download/2.0.2/junit-2.0.2.tbz" + checksum: [ + "sha256=fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01" + "sha512=5a9fa803c4861748bb8482fc51197420bf3cc3b9540989a489c4ffb65fdd02386aaa60437eae29182209dae0903b0e537c095249e19d395a451b8e8214f15f03" + ] } diff --git a/esy.lock/opam/menhir.20190924/opam b/esy.lock/opam/menhir.20190924/opam deleted file mode 100644 index 348967a7..00000000 --- a/esy.lock/opam/menhir.20190924/opam +++ /dev/null @@ -1,29 +0,0 @@ -opam-version: "2.0" -maintainer: "francois.pottier@inria.fr" -authors: [ - "François Pottier " - "Yann Régis-Gianas " -] -homepage: "http://gitlab.inria.fr/fpottier/menhir" -dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" -bug-reports: "menhir@inria.fr" -build: [ - [make "-f" "Makefile" "PREFIX=%{prefix}%" "USE_OCAMLFIND=true" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] -] -install: [ - [make "-f" "Makefile" "install" "PREFIX=%{prefix}%" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] -] -depends: [ - "ocaml" {>= "4.02"} - "ocamlfind" {build} - "ocamlbuild" {build} -] -synopsis: "An LR(1) parser generator" -url { - src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz" - checksum: [ - "md5=677f1997fb73177d5a00fa1b8d61c3ef" - "sha512=ea8a9a6d773529cf6ac05e4c6c4532770fbb8e574c9b646efcefe90d9f24544741e3e8cfd94c8afea0447e34059a8c79c2829b46764ce3a3d6dcb3e7f75980fc" - ] -} diff --git a/esy.lock/opam/menhir.20201122/opam b/esy.lock/opam/menhir.20201122/opam new file mode 100644 index 00000000..48faa415 --- /dev/null +++ b/esy.lock/opam/menhir.20201122/opam @@ -0,0 +1,27 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" { >= "2.2.0"} + "menhirLib" {= version} + "menhirSdk" {= version} +] +synopsis: "An LR(1) parser generator" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/esy.lock/opam/menhirLib.20201122/opam b/esy.lock/opam/menhirLib.20201122/opam new file mode 100644 index 00000000..e1cb73cc --- /dev/null +++ b/esy.lock/opam/menhirLib.20201122/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Runtime support library for parsers generated by Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/esy.lock/opam/menhirSdk.20201122/opam b/esy.lock/opam/menhirSdk.20201122/opam new file mode 100644 index 00000000..977c9fbd --- /dev/null +++ b/esy.lock/opam/menhirSdk.20201122/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Compile-time library for auxiliary tools related to Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/esy.lock/opam/merlin-extend.0.5/opam b/esy.lock/opam/merlin-extend.0.6/opam similarity index 73% rename from esy.lock/opam/merlin-extend.0.5/opam rename to esy.lock/opam/merlin-extend.0.6/opam index a3ae0d30..39b33757 100644 --- a/esy.lock/opam/merlin-extend.0.5/opam +++ b/esy.lock/opam/merlin-extend.0.6/opam @@ -19,11 +19,12 @@ description: """ This protocol allows to replace the OCaml frontend of Merlin. It extends what used to be done with the `-pp' flag to handle a few more cases.""" doc: "https://let-def.github.io/merlin-extend" +x-commit-hash: "640620568a5f5c7798239ecf7c707c813e3df3cf" url { src: - "https://github.com/let-def/merlin-extend/releases/download/v0.5/merlin-extend-v0.5.tbz" + "https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz" checksum: [ - "sha256=ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227" - "sha512=55c5a3637337abb8ca8db679128a81ca8ccce567bc214d55b2e6444dc0e905b74c64d629bdea2457d0fe4be5306414feefcdbc4d4761fdafd59aa107550936b6" + "sha256=c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" + "sha512=4c64a490e2ece04fc89aef679c1d9202175df4fe045b5fdc7a37cd7cebe861226fddd9648c1bf4f06175ecfcd2ed7686c96bd6a8cae003a5096f6134c240f857" ] } diff --git a/esy.lock/opam/merlin.3.3.3/opam b/esy.lock/opam/merlin.3.4.2/opam similarity index 79% rename from esy.lock/opam/merlin.3.3.3/opam rename to esy.lock/opam/merlin.3.4.2/opam index f0db8e9c..3e229166 100644 --- a/esy.lock/opam/merlin.3.3.3/opam +++ b/esy.lock/opam/merlin.3.4.2/opam @@ -7,15 +7,17 @@ dev-repo: "git+https://github.com/ocaml/merlin.git" build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "runtest" "-p" name "-j" "1"] {with-test & ocaml:version >= "4.03"} ] depends: [ - "ocaml" {>= "4.02.1" & < "4.10"} + "ocaml" {>= "4.02.3" & < "4.12"} "dune" {>= "1.8.0"} - "ocamlfind" {>= "1.5.2"} + "dot-merlin-reader" {= version} "yojson" {>= "1.6.0"} "mdx" {with-test & >= "1.3.0"} "conf-jq" {with-test} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} ] synopsis: "Editor helper, provides completion, typing and source browsing in Vim and Emacs" @@ -61,11 +63,12 @@ See https://github.com/OCamlPro/opam-user-setup " {success & !user-setup:installed} ] +x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" url { src: - "https://github.com/ocaml/merlin/releases/download/v3.3.3/merlin-v3.3.3.tbz" + "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" checksum: [ - "sha256=72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15" - "sha512=2a5f39d966be56c1322982effc05bc98fd5f66cd12f1f76953f8daa9eca74a58c92a186854f4e601e2f0bb038720691446e7591b4613982accded3e579fedb23" + "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" ] } diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam b/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam deleted file mode 100644 index aa41104d..00000000 --- a/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam +++ /dev/null @@ -1,37 +0,0 @@ -opam-version: "2.0" -maintainer: "frederic.bour@lakaban.net" -authors: [ - "Frédéric Bour " - "Jérémie Dimino " -] -license: "LGPL-2.1 with OCaml linking exception" -homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree" -bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues" -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git" -doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/" -tags: [ "syntax" "org:ocamllabs" ] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "result" - "ppx_derivers" - "dune" {>= "1.9.0"} - "ocaml" {>= "4.02.3"} -] -synopsis: "Convert OCaml parsetrees between different versions" -description: """ -Convert OCaml parsetrees between different versions - -This library converts parsetrees, outcometree and ast mappers between -different OCaml versions. High-level functions help making PPX -rewriters independent of a compiler version. -""" -url { - src: - "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz" - checksum: [ - "sha256=7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0" - "sha512=87fdccafae83b0437f1ccd4f3cfbc49e699bc0804596480e0df88510ba33410f31d48c7f677fe72800ed3f442a3a586d82d86aee1d12a964f79892833847b16a" - ] -} diff --git a/esy.lock/opam/odoc.1.4.2/opam b/esy.lock/opam/odoc.1.4.2/opam deleted file mode 100644 index 55c52d9e..00000000 --- a/esy.lock/opam/odoc.1.4.2/opam +++ /dev/null @@ -1,45 +0,0 @@ -opam-version: "2.0" - -version: "1.4.2" -homepage: "http://github.com/ocaml/odoc" -doc: "https://github.com/ocaml/odoc#readme" -bug-reports: "https://github.com/ocaml/odoc/issues" -license: "ISC" - -authors: [ - "Thomas Refis " - "David Sheets " - "Leo White " -] -maintainer: "Anton Bachin " -dev-repo: "git+https://github.com/ocaml/odoc.git" - -synopsis: "OCaml documentation generator" - -depends: [ - "astring" {build} - "cmdliner" {build & >= "1.0.0"} - "cppo" {build} - "dune" - "fpath" {build} - "ocaml" {>= "4.02.0" & < "4.10"} - "result" {build} - "tyxml" {build & >= "4.3.0"} - - "alcotest" {dev & >= "0.8.3"} - "markup" {dev & >= "0.8.0"} - "ocamlfind" {dev} - "sexplib" {dev & >= "113.33.00" & < "v0.14"} - - "bisect_ppx" {with-test & >= "1.3.0"} -] - -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] - -url { - src: "https://github.com/ocaml/odoc/archive/1.4.2.tar.gz" - checksum: "md5=d75ce63539040cd199d22203d46fc5f3" -} diff --git a/esy.lock/opam/odoc.1.5.2/opam b/esy.lock/opam/odoc.1.5.2/opam new file mode 100644 index 00000000..f59e6407 --- /dev/null +++ b/esy.lock/opam/odoc.1.5.2/opam @@ -0,0 +1,53 @@ +opam-version: "2.0" + +homepage: "http://github.com/ocaml/odoc" +doc: "https://ocaml.github.io/odoc/" +bug-reports: "https://github.com/ocaml/odoc/issues" +license: "ISC" + +authors: [ + "Thomas Refis " + "David Sheets " + "Leo White " + "Anton Bachin " + "Jon Ludlam " +] +maintainer: "Anton Bachin " +dev-repo: "git+https://github.com/ocaml/odoc.git" + +synopsis: "OCaml documentation generator" +description: """ +Odoc is a documentation generator for OCaml. It reads doc comments, +delimited with `(** ... *)`, and outputs HTML. +""" + +depends: [ + "astring" + "cmdliner" + "cppo" {build} + "dune" + "fpath" + "ocaml" {>= "4.02.0"} + "result" + "tyxml" {>= "4.3.0"} + + "alcotest" {dev & >= "0.8.3"} + "markup" {dev & >= "1.0.0"} + "ocamlfind" {dev} + "sexplib" {dev & >= "113.33.00"} + + "bisect_ppx" {with-test & >= "1.3.0"} +] + +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +x-commit-hash: "c0df8ce2171fa9645a41f371429aa3ddc16de5c1" +url { + src: "https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz" + checksum: [ + "sha256=d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871" + "sha512=e6c83630325de422f31cda8f88c038d213969f8b98e989593c057658f3956c0855860c9bc38f61b6479929516ca95aee689ddfba3ad8c47d821c4fdf54524cf9" + ] +} diff --git a/esy.lock/opam/result.1.4/opam b/esy.lock/opam/result.1.5/opam similarity index 83% rename from esy.lock/opam/result.1.4/opam rename to esy.lock/opam/result.1.5/opam index b44aeead..671af042 100644 --- a/esy.lock/opam/result.1.4/opam +++ b/esy.lock/opam/result.1.5/opam @@ -17,6 +17,6 @@ while staying compatible with older version of OCaml should use the Result module defined in this library.""" url { src: - "https://github.com/janestreet/result/archive/1.4.tar.gz" - checksum: "md5=d3162dbc501a2af65c8c71e0866541da" + "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz" + checksum: "md5=1b82dec78849680b49ae9a8a365b831b" } diff --git a/esy.lock/opam/seq.base/files/META.seq b/esy.lock/opam/seq.base/files/META.seq new file mode 100644 index 00000000..06b95eff --- /dev/null +++ b/esy.lock/opam/seq.base/files/META.seq @@ -0,0 +1,4 @@ +name="seq" +version="[distributed with OCaml 4.07 or above]" +description="dummy backward-compatibility package for iterators" +requires="" diff --git a/esy.lock/opam/seq.base/files/seq.install b/esy.lock/opam/seq.base/files/seq.install new file mode 100644 index 00000000..c4d70206 --- /dev/null +++ b/esy.lock/opam/seq.base/files/seq.install @@ -0,0 +1,3 @@ +lib:[ + "META.seq" {"META"} +] diff --git a/esy.lock/opam/seq.base/opam b/esy.lock/opam/seq.base/opam new file mode 100644 index 00000000..b33d8c7d --- /dev/null +++ b/esy.lock/opam/seq.base/opam @@ -0,0 +1,15 @@ +opam-version: "2.0" +maintainer: " " +authors: " " +homepage: " " +depends: [ + "ocaml" {>= "4.07.0"} +] +dev-repo: "git+https://github.com/ocaml/ocaml.git" +bug-reports: "https://caml.inria.fr/mantis/main_page.php" +synopsis: + "Compatibility package for OCaml's standard iterator type starting from 4.07." +extra-files: [ + ["seq.install" "md5=026b31e1df290373198373d5aaa26e42"] + ["META.seq" "md5=b33c8a1a6c7ed797816ce27df4855107"] +] diff --git a/esy.lock/opam/sexplib0.v0.13.0/opam b/esy.lock/opam/sexplib0.v0.14.0/opam similarity index 83% rename from esy.lock/opam/sexplib0.v0.13.0/opam rename to esy.lock/opam/sexplib0.v0.14.0/opam index 27626b3c..f7afcef3 100644 --- a/esy.lock/opam/sexplib0.v0.13.0/opam +++ b/esy.lock/opam/sexplib0.v0.14.0/opam @@ -11,7 +11,7 @@ build: [ ] depends: [ "ocaml" {>= "4.04.2"} - "dune" {>= "1.5.1"} + "dune" {>= "2.0.0"} ] synopsis: "Library containing the definition of S-expressions and some base converters" description: " @@ -21,6 +21,6 @@ OCaml's standard library that was developed by Jane Street, the largest industrial user of OCaml. " url { - src: "https://ocaml.janestreet.com/ocaml-core/v0.13/files/sexplib0-v0.13.0.tar.gz" - checksum: "md5=f8a715dffda5599cfae0cb4031d57abe" + src: "https://ocaml.janestreet.com/ocaml-core/v0.14/files/sexplib0-v0.14.0.tar.gz" + checksum: "md5=37aff0af8f8f6f759249475684aebdc4" } diff --git a/esy.lock/opam/topkg.1.0.1/opam b/esy.lock/opam/topkg.1.0.3/opam similarity index 97% rename from esy.lock/opam/topkg.1.0.1/opam rename to esy.lock/opam/topkg.1.0.3/opam index 77ae1f42..6e073a11 100644 --- a/esy.lock/opam/topkg.1.0.1/opam +++ b/esy.lock/opam/topkg.1.0.3/opam @@ -43,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on [webbrowser]: http://erratique.ch/software/webbrowser """ url { -archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.1.tbz" -checksum: "16b90e066d8972a5ef59655e7c28b3e9" +archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz" +checksum: "e285f7a296d77ee7d831ba9a6bfb396f" } diff --git a/esy.lock/opam/tyxml.4.3.0/opam b/esy.lock/opam/tyxml.4.4.0/opam similarity index 76% rename from esy.lock/opam/tyxml.4.3.0/opam rename to esy.lock/opam/tyxml.4.4.0/opam index 93872f8b..51532b53 100644 --- a/esy.lock/opam/tyxml.4.3.0/opam +++ b/esy.lock/opam/tyxml.4.4.0/opam @@ -4,7 +4,7 @@ homepage: "https://github.com/ocsigen/tyxml/" bug-reports: "https://github.com/ocsigen/tyxml/issues" doc: "https://ocsigen.org/tyxml/manual/" dev-repo: "git+https://github.com/ocsigen/tyxml.git" -license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" +license: "LGPL-2.1 with OCaml linking exception" build: [ ["dune" "subst"] {pinned} @@ -14,12 +14,11 @@ build: [ depends: [ "ocaml" {>= "4.02"} - "re" {>= "1.5.0"} - ("ocaml" {>= "4.07"} | "re" {>= "1.8.0"}) "dune" "alcotest" {with-test} "seq" "uutf" {>= "1.0.0"} + "re" {>= "1.5.0"} ] synopsis:"TyXML is a library for building correct HTML and SVG documents" @@ -40,6 +39,9 @@ let to_ocaml = Html.(a ~a:[a_href "ocaml.org"] [txt "OCaml!"]) authors: "The ocsigen team" url { src: - "https://github.com/ocsigen/tyxml/releases/download/4.3.0/tyxml-4.3.0.tbz" - checksum: "md5=fd834a567f813bf447cab5f4c3a723e2" + "https://github.com/ocsigen/tyxml/releases/download/4.4.0/tyxml-4.4.0.tbz" + checksum: [ + "sha256=516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530" + "sha512=d5f2187f8410524cec7a14b28e8950837070eb0b6571b015dd06076c2841eb7ccaffa86d5d2307eaf1950ee62f9fb926477dac01c870d9c1a2f525853cb44d0c" + ] } diff --git a/esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json b/esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json new file mode 100644 index 00000000..ca6a373d --- /dev/null +++ b/esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json @@ -0,0 +1,6 @@ +{ + "build": "true", + "dependencies": { + "esy-m4": "esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7" + } +} diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh new file mode 100644 index 00000000..b2a94f75 --- /dev/null +++ b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +SECONDARY_CONF="$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf" + +if test -f $SECONDARY_CONF; then + export OCAMLFIND_CONF=$SECONDARY_CONF; +fi + +env -u OCAMLLIB ocaml bootstrap.ml +./dune.exe build -p dune --profile dune-bootstrap diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json new file mode 100644 index 00000000..c7d77ab6 --- /dev/null +++ b/esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json @@ -0,0 +1,8 @@ +{ + "buildsInSource": true, + "build": "bash build.sh", + "install": "esy-installer dune.install", + "buildEnv": { + "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" + } +} diff --git a/fp.esy.lock/.gitattributes b/fp.esy.lock/.gitattributes new file mode 100644 index 00000000..e0b4e26c --- /dev/null +++ b/fp.esy.lock/.gitattributes @@ -0,0 +1,3 @@ + +# Set eol to LF so files aren't converted to CRLF-eol on Windows. +* text eol=lf linguist-generated diff --git a/fp.esy.lock/.gitignore b/fp.esy.lock/.gitignore new file mode 100644 index 00000000..a221be22 --- /dev/null +++ b/fp.esy.lock/.gitignore @@ -0,0 +1,3 @@ + +# Reset any possible .gitignore, we want all esy.lock to be un-ignored. +!* diff --git a/fp.esy.lock/index.json b/fp.esy.lock/index.json new file mode 100644 index 00000000..56753b1b --- /dev/null +++ b/fp.esy.lock/index.json @@ -0,0 +1,951 @@ +{ + "checksum": "b67761987758fee99ba8de60dc3884eb", + "root": "@reason-native/fp@link-dev:./fp.json", + "node": { + "ocaml@4.6.1003@d41d8cd9": { + "id": "ocaml@4.6.1003@d41d8cd9", + "name": "ocaml", + "version": "4.6.1003", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.6.1003.tgz#sha1:6a391e80b4d1859bdb1943fd3ef6221c7f0a9a49" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9": { + "id": + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9", + "name": "esy-m4", + "version": + "github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7", + "source": { + "type": "install", + "source": [ + "github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, + "@reason-native/rely@3.2.1@d41d8cd9": { + "id": "@reason-native/rely@3.2.1@d41d8cd9", + "name": "@reason-native/rely", + "version": "3.2.1", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/rely/-/rely-3.2.1.tgz#sha1:7945ac6a51773a97b8f8cfd97d2855ac7ac4ecb2" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@reason-native/file-context-printer@0.0.3@d41d8cd9", + "@reason-native/cli@0.0.1-alpha@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.2@0b7bd730", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@reason-native/pastel@0.3.0@d41d8cd9": { + "id": "@reason-native/pastel@0.3.0@d41d8cd9", + "name": "@reason-native/pastel", + "version": "0.3.0", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.3.0.tgz#sha1:07da3c5a0933e61bc3b353bc85aa71ac7c0f311c" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@reason-native/fp@link-dev:./fp.json": { + "id": "@reason-native/fp@link-dev:./fp.json", + "name": "@reason-native/fp", + "version": "link-dev:./fp.json", + "source": { "type": "link-dev", "path": ".", "manifest": "fp.json" }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/rely@3.2.1@d41d8cd9", + "@opam/merlin@opam:3.4.2@9a4d1fd4" + ] + }, + "@reason-native/file-context-printer@0.0.3@d41d8cd9": { + "id": "@reason-native/file-context-printer@0.0.3@d41d8cd9", + "name": "@reason-native/file-context-printer", + "version": "0.0.3", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/file-context-printer/-/file-context-printer-0.0.3.tgz#sha1:b92eec7b10107ccb27528f9eea9bb51252bca491" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@reason-native/cli@0.0.1-alpha@d41d8cd9": { + "id": "@reason-native/cli@0.0.1-alpha@d41d8cd9", + "name": "@reason-native/cli", + "version": "0.0.1-alpha", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/cli/-/cli-0.0.1-alpha.tgz#sha1:0b911053fa7cc661eac10ead50d6ea6cc1fcd94d" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@opam/yojson@opam:1.7.0@7056d985": { + "id": "@opam/yojson@opam:1.7.0@7056d985", + "name": "@opam/yojson", + "version": "opam:1.7.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/b8/b89d39ca3f8c532abe5f547ad3b8f84d#md5:b89d39ca3f8c532abe5f547ad3b8f84d", + "archive:https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz#md5:b89d39ca3f8c532abe5f547ad3b8f84d" + ], + "opam": { + "name": "yojson", + "version": "1.7.0", + "path": "fp.esy.lock/opam/yojson.1.7.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/biniou@opam:1.2.1@d7570399", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399" + ] + }, + "@opam/uutf@opam:1.0.2@4440868f": { + "id": "@opam/uutf@opam:1.0.2@4440868f", + "name": "@opam/uutf", + "version": "opam:1.0.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/a7/a7c542405a39630c689a82bd7ef2292c#md5:a7c542405a39630c689a82bd7ef2292c", + "archive:http://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz#md5:a7c542405a39630c689a82bd7ef2292c" + ], + "opam": { + "name": "uutf", + "version": "1.0.2", + "path": "fp.esy.lock/opam/uutf.1.0.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "@opam/topkg@opam:1.0.3@e4e10f1c", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + ] + }, + "@opam/uchar@opam:0.0.2@c8218eea": { + "id": "@opam/uchar@opam:0.0.2@c8218eea", + "name": "@opam/uchar", + "version": "opam:0.0.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/c9/c9ba2c738d264c420c642f7bb1cf4a36#md5:c9ba2c738d264c420c642f7bb1cf4a36", + "archive:https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz#md5:c9ba2c738d264c420c642f7bb1cf4a36" + ], + "opam": { + "name": "uchar", + "version": "0.0.2", + "path": "fp.esy.lock/opam/uchar.0.0.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] + }, + "@opam/tyxml@opam:4.4.0@1dca5713": { + "id": "@opam/tyxml@opam:4.4.0@1dca5713", + "name": "@opam/tyxml", + "version": "opam:4.4.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/51/516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530#sha256:516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530", + "archive:https://github.com/ocsigen/tyxml/releases/download/4.4.0/tyxml-4.4.0.tbz#sha256:516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530" + ], + "opam": { + "name": "tyxml", + "version": "4.4.0", + "path": "fp.esy.lock/opam/tyxml.4.4.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/topkg@opam:1.0.3@e4e10f1c": { + "id": "@opam/topkg@opam:1.0.3@e4e10f1c", + "name": "@opam/topkg", + "version": "opam:1.0.3", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f", + "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f" + ], + "opam": { + "name": "topkg", + "version": "1.0.3", + "path": "fp.esy.lock/opam/topkg.1.0.3" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + ] + }, + "@opam/seq@opam:0.2.2@e9144e45": { + "id": "@opam/seq@opam:0.2.2@e9144e45", + "name": "@opam/seq", + "version": "opam:0.2.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/90/9033e02283aa3bde9f97f24e632902e3#md5:9033e02283aa3bde9f97f24e632902e3", + "archive:https://github.com/c-cube/seq/archive/0.2.2.tar.gz#md5:9033e02283aa3bde9f97f24e632902e3" + ], + "opam": { + "name": "seq", + "version": "0.2.2", + "path": "fp.esy.lock/opam/seq.0.2.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/result@opam:1.5@6b753c82": { + "id": "@opam/result@opam:1.5@6b753c82", + "name": "@opam/result", + "version": "opam:1.5", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/1b/1b82dec78849680b49ae9a8a365b831b#md5:1b82dec78849680b49ae9a8a365b831b", + "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#md5:1b82dec78849680b49ae9a8a365b831b" + ], + "opam": { + "name": "result", + "version": "1.5", + "path": "fp.esy.lock/opam/result.1.5" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/re@opam:1.9.0@d4d5e13d": { + "id": "@opam/re@opam:1.9.0@d4d5e13d", + "name": "@opam/re", + "version": "opam:1.9.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/bd/bddaed4f386a22cace7850c9c7dac296#md5:bddaed4f386a22cace7850c9c7dac296", + "archive:https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz#md5:bddaed4f386a22cace7850c9c7dac296" + ], + "opam": { + "name": "re", + "version": "1.9.0", + "path": "fp.esy.lock/opam/re.1.9.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/ptime@opam:0.8.5@0051d642": { + "id": "@opam/ptime@opam:0.8.5@0051d642", + "name": "@opam/ptime", + "version": "opam:0.8.5", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/4d/4d48055d623ecf2db792439b3e96a520#md5:4d48055d623ecf2db792439b3e96a520", + "archive:https://erratique.ch/software/ptime/releases/ptime-0.8.5.tbz#md5:4d48055d623ecf2db792439b3e96a520" + ], + "opam": { + "name": "ptime", + "version": "0.8.5", + "path": "fp.esy.lock/opam/ptime.0.8.5" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82" + ] + }, + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { + "id": "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "name": "@opam/ppx_derivers", + "version": "opam:1.2.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/5d/5dc2bf130c1db3c731fe0fffc5648b41#md5:5dc2bf130c1db3c731fe0fffc5648b41", + "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#md5:5dc2bf130c1db3c731fe0fffc5648b41" + ], + "opam": { + "name": "ppx_derivers", + "version": "1.2.1", + "path": "fp.esy.lock/opam/ppx_derivers.1.2.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2": { + "id": "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "name": "@opam/ocamlfind-secondary", + "version": "opam:1.8.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/18/18ca650982c15536616dea0e422cbd8c#md5:18ca650982c15536616dea0e422cbd8c", + "archive:http://download2.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c", + "archive:http://download.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c" + ], + "opam": { + "name": "ocamlfind-secondary", + "version": "1.8.1", + "path": "fp.esy.lock/opam/ocamlfind-secondary.1.8.1" + } + }, + "overrides": [ + { + "opamoverride": + "fp.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override" + } + ], + "dependencies": [ + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f" + ] + }, + "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { + "id": "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "name": "@opam/ocamlfind", + "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", + "version": "1.8.1", + "path": "fp.esy.lock/opam/ocamlfind.1.8.1" + } + }, + "overrides": [ + { + "opamoverride": + "fp.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override" + } + ], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/conf-m4@opam:1@196bf219", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] + }, + "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { + "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "name": "@opam/ocamlbuild", + "version": "opam:0.14.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/87/87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78#sha256:87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78", + "archive:https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz#sha256:87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78" + ], + "opam": { + "name": "ocamlbuild", + "version": "0.14.0", + "path": "fp.esy.lock/opam/ocamlbuild.0.14.0" + } + }, + "overrides": [ + { + "opamoverride": + "fp.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override" + } + ], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.6.1003@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": "fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1" + } + }, + "overrides": [ + { + "opamoverride": + "fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override" + } + ], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] + }, + "@opam/merlin-extend@opam:0.6@404f814c": { + "id": "@opam/merlin-extend@opam:0.6@404f814c", + "name": "@opam/merlin-extend", + "version": "opam:0.6", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/c2/c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43", + "archive:https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" + ], + "opam": { + "name": "merlin-extend", + "version": "0.6", + "path": "fp.esy.lock/opam/merlin-extend.0.6" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/merlin@opam:3.4.2@9a4d1fd4": { + "id": "@opam/merlin@opam:3.4.2@9a4d1fd4", + "name": "@opam/merlin", + "version": "opam:3.4.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", + "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + ], + "opam": { + "name": "merlin", + "version": "3.4.2", + "path": "fp.esy.lock/opam/merlin.3.4.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/csexp@opam:1.3.2@5cea14af" + ] + }, + "@opam/menhirSdk@opam:20201122@552e084f": { + "id": "@opam/menhirSdk@opam:20201122@552e084f", + "name": "@opam/menhirSdk", + "version": "opam:20201122", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" + ], + "opam": { + "name": "menhirSdk", + "version": "20201122", + "path": "fp.esy.lock/opam/menhirSdk.20201122" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/menhirLib@opam:20201122@a11a6018": { + "id": "@opam/menhirLib@opam:20201122@a11a6018", + "name": "@opam/menhirLib", + "version": "opam:20201122", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" + ], + "opam": { + "name": "menhirLib", + "version": "20201122", + "path": "fp.esy.lock/opam/menhirLib.20201122" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/menhir@opam:20201122@35e9e3ea": { + "id": "@opam/menhir@opam:20201122@35e9e3ea", + "name": "@opam/menhir", + "version": "opam:20201122", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" + ], + "opam": { + "name": "menhir", + "version": "20201122", + "path": "fp.esy.lock/opam/menhir.20201122" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/menhirSdk@opam:20201122@552e084f", + "@opam/menhirLib@opam:20201122@a11a6018", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/menhirSdk@opam:20201122@552e084f", + "@opam/menhirLib@opam:20201122@a11a6018", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/junit@opam:2.0.2@0b7bd730": { + "id": "@opam/junit@opam:2.0.2@0b7bd730", + "name": "@opam/junit", + "version": "opam:2.0.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/fd/fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01#sha256:fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01", + "archive:https://github.com/Khady/ocaml-junit/releases/download/2.0.2/junit-2.0.2.tbz#sha256:fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01" + ], + "opam": { + "name": "junit", + "version": "2.0.2", + "path": "fp.esy.lock/opam/junit.2.0.2" + } + }, + "overrides": [], + "dependencies": [ + "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/fix@opam:20201120@5c318621": { + "id": "@opam/fix@opam:20201120@5c318621", + "name": "@opam/fix", + "version": "opam:20201120", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3", + "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3" + ], + "opam": { + "name": "fix", + "version": "20201120", + "path": "fp.esy.lock/opam/fix.20201120" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/easy-format@opam:1.3.2@0484b3c4": { + "id": "@opam/easy-format@opam:1.3.2@0484b3c4", + "name": "@opam/easy-format", + "version": "opam:1.3.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/34/3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926", + "archive:https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926" + ], + "opam": { + "name": "easy-format", + "version": "1.3.2", + "path": "fp.esy.lock/opam/easy-format.1.3.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/dune@opam:2.7.1@f5f493bc": { + "id": "@opam/dune@opam:2.7.1@f5f493bc", + "name": "@opam/dune", + "version": "opam:2.7.1", + "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" + ], + "opam": { + "name": "dune", + "version": "2.7.1", + "path": "fp.esy.lock/opam/dune.2.7.1" + } + }, + "overrides": [ + { + "opamoverride": + "fp.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override" + } + ], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "@opam/base-unix@opam:base@87d0b2eb", + "@opam/base-threads@opam:base@36803084", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "@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", + "name": "@opam/dot-merlin-reader", + "version": "opam:3.4.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", + "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + ], + "opam": { + "name": "dot-merlin-reader", + "version": "3.4.2", + "path": "fp.esy.lock/opam/dot-merlin-reader.3.4.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af" + ] + }, + "@opam/csexp@opam:1.3.2@5cea14af": { + "id": "@opam/csexp@opam:1.3.2@5cea14af", + "name": "@opam/csexp", + "version": "opam:1.3.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + ], + "opam": { + "name": "csexp", + "version": "1.3.2", + "path": "fp.esy.lock/opam/csexp.1.3.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/cppo@opam:1.6.6@f4f83858": { + "id": "@opam/cppo@opam:1.6.6@f4f83858", + "name": "@opam/cppo", + "version": "opam:1.6.6", + "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" + ], + "opam": { + "name": "cppo", + "version": "1.6.6", + "path": "fp.esy.lock/opam/cppo.1.6.6" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/base-unix@opam:base@87d0b2eb", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/base-unix@opam:base@87d0b2eb" + ] + }, + "@opam/conf-m4@opam:1@196bf219": { + "id": "@opam/conf-m4@opam:1@196bf219", + "name": "@opam/conf-m4", + "version": "opam:1", + "source": { + "type": "install", + "source": [ "no-source:" ], + "opam": { + "name": "conf-m4", + "version": "1", + "path": "fp.esy.lock/opam/conf-m4.1" + } + }, + "overrides": [ + { + "opamoverride": + "fp.esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override" + } + ], + "dependencies": [ + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [] + }, + "@opam/biniou@opam:1.2.1@d7570399": { + "id": "@opam/biniou@opam:1.2.1@d7570399", + "name": "@opam/biniou", + "version": "opam:1.2.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/35/35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335", + "archive:https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335" + ], + "opam": { + "name": "biniou", + "version": "1.2.1", + "path": "fp.esy.lock/opam/biniou.1.2.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/base-unix@opam:base@87d0b2eb": { + "id": "@opam/base-unix@opam:base@87d0b2eb", + "name": "@opam/base-unix", + "version": "opam:base", + "source": { + "type": "install", + "source": [ "no-source:" ], + "opam": { + "name": "base-unix", + "version": "base", + "path": "fp.esy.lock/opam/base-unix.base" + } + }, + "overrides": [], + "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "devDependencies": [] + }, + "@opam/base-threads@opam:base@36803084": { + "id": "@opam/base-threads@opam:base@36803084", + "name": "@opam/base-threads", + "version": "opam:base", + "source": { + "type": "install", + "source": [ "no-source:" ], + "opam": { + "name": "base-threads", + "version": "base", + "path": "fp.esy.lock/opam/base-threads.base" + } + }, + "overrides": [], + "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "devDependencies": [] + }, + "@esy-ocaml/substs@0.0.1@d41d8cd9": { + "id": "@esy-ocaml/substs@0.0.1@d41d8cd9", + "name": "@esy-ocaml/substs", + "version": "0.0.1", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@esy-ocaml/substs/-/substs-0.0.1.tgz#sha1:59ebdbbaedcda123fc7ed8fb2b302b7d819e9a46" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, + "@esy-ocaml/reason@3.6.2@d41d8cd9": { + "id": "@esy-ocaml/reason@3.6.2@d41d8cd9", + "name": "@esy-ocaml/reason", + "version": "3.6.2", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#sha1:49bd53c75dd241eb14f46277a85af353908f7e81" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/merlin-extend@opam:0.6@404f814c", + "@opam/menhir@opam:20201122@35e9e3ea", + "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.7.1@f5f493bc" + ], + "devDependencies": [] + } + } +} \ No newline at end of file diff --git a/fp.esy.lock/opam/base-threads.base/opam b/fp.esy.lock/opam/base-threads.base/opam new file mode 100644 index 00000000..914ff50c --- /dev/null +++ b/fp.esy.lock/opam/base-threads.base/opam @@ -0,0 +1,6 @@ +opam-version: "2.0" +maintainer: "https://github.com/ocaml/opam-repository/issues" +description: """ +Threads library distributed with the OCaml compiler +""" + diff --git a/fp.esy.lock/opam/base-unix.base/opam b/fp.esy.lock/opam/base-unix.base/opam new file mode 100644 index 00000000..b973540b --- /dev/null +++ b/fp.esy.lock/opam/base-unix.base/opam @@ -0,0 +1,6 @@ +opam-version: "2.0" +maintainer: "https://github.com/ocaml/opam-repository/issues" +description: """ +Unix library distributed with the OCaml compiler +""" + diff --git a/fp.esy.lock/opam/biniou.1.2.1/opam b/fp.esy.lock/opam/biniou.1.2.1/opam new file mode 100644 index 00000000..b706b425 --- /dev/null +++ b/fp.esy.lock/opam/biniou.1.2.1/opam @@ -0,0 +1,45 @@ +opam-version: "2.0" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "@doc"] {with-doc} +] +maintainer: ["martin@mjambon.com"] +authors: ["Martin Jambon"] +bug-reports: "https://github.com/mjambon/biniou/issues" +homepage: "https://github.com/mjambon/biniou" +doc: "https://mjambon.github.io/biniou/" +license: "BSD-3-Clause" +dev-repo: "git+https://github.com/mjambon/biniou.git" +synopsis: + "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve" +description: """ + +Biniou (pronounced "be new") is a binary data format designed for speed, safety, +ease of use and backward compatibility as protocols evolve. Biniou is vastly +equivalent to JSON in terms of functionality but allows implementations several +times faster (4 times faster than yojson), with 25-35% space savings. + +Biniou data can be decoded into human-readable form without knowledge of type +definitions except for field and variant names which are represented by 31-bit +hashes. A program named bdump is provided for routine visualization of biniou +data files. + +The program atdgen is used to derive OCaml-Biniou serializers and deserializers +from type definitions. + +Biniou format specification: mjambon.github.io/atdgen-doc/biniou-format.txt""" +depends: [ + "easy-format" + "dune" {>= "1.10"} + "ocaml" {>= "4.02.3"} +] +url { + src: + "https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz" + checksum: [ + "sha256=35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335" + "sha512=82670cc77bf3e869ee26e5fbe5a5affa45a22bc8b6c4bd7e85473912780e0111baca59b34a2c14feae3543ce6e239d7fddaeab24b686a65bfe642cdb91d27ebf" + ] +} diff --git a/fp.esy.lock/opam/conf-m4.1/opam b/fp.esy.lock/opam/conf-m4.1/opam new file mode 100644 index 00000000..c6feb2a7 --- /dev/null +++ b/fp.esy.lock/opam/conf-m4.1/opam @@ -0,0 +1,22 @@ +opam-version: "2.0" +maintainer: "tim@gfxmonk.net" +homepage: "http://www.gnu.org/software/m4/m4.html" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +authors: "GNU Project" +license: "GPL-3.0-only" +build: [["sh" "-exc" "echo | m4"]] +depexts: [ + ["m4"] {os-family = "debian"} + ["m4"] {os-distribution = "fedora"} + ["m4"] {os-distribution = "rhel"} + ["m4"] {os-distribution = "centos"} + ["m4"] {os-distribution = "alpine"} + ["m4"] {os-distribution = "nixos"} + ["m4"] {os-family = "suse"} + ["m4"] {os-distribution = "ol"} + ["m4"] {os-distribution = "arch"} +] +synopsis: "Virtual package relying on m4" +description: + "This package can only install if the m4 binary is installed on the system." +flags: conf diff --git a/fp.esy.lock/opam/cppo.1.6.6/opam b/fp.esy.lock/opam/cppo.1.6.6/opam new file mode 100644 index 00000000..f683f8b4 --- /dev/null +++ b/fp.esy.lock/opam/cppo.1.6.6/opam @@ -0,0 +1,37 @@ +opam-version: "2.0" +maintainer: "martin@mjambon.com" +authors: "Martin Jambon" +license: "BSD-3-Clause" +homepage: "http://mjambon.com/cppo.html" +doc: "https://ocaml-community.github.io/cppo/" +bug-reports: "https://github.com/ocaml-community/cppo/issues" +depends: [ + "ocaml" {>= "4.03"} + "dune" {>= "1.0"} + "base-unix" +] +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +dev-repo: "git+https://github.com/ocaml-community/cppo.git" +synopsis: "Code preprocessor like cpp for OCaml" +description: """ +Cppo is an equivalent of the C preprocessor for OCaml programs. +It allows the definition of simple macros and file inclusion. + +Cppo is: + +* more OCaml-friendly than cpp +* easy to learn without consulting a manual +* reasonably fast +* simple to install and to maintain +""" +url { + src: "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz" + checksum: [ + "sha256=e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0" + "sha512=44ecf9d225d9e45490a2feac0bde04865ca398dba6c3579e3370fcd1ea255707b8883590852af8b2df87123801062b9f3acce2455c092deabf431f9c4fb8d8eb" + ] +} diff --git a/fp.esy.lock/opam/csexp.1.3.2/opam b/fp.esy.lock/opam/csexp.1.3.2/opam new file mode 100644 index 00000000..1508d17a --- /dev/null +++ b/fp.esy.lock/opam/csexp.1.3.2/opam @@ -0,0 +1,58 @@ +opam-version: "2.0" +synopsis: "Parsing and printing of S-expressions in Canonical form" +description: """ + +This library provides minimal support for Canonical S-expressions +[1]. Canonical S-expressions are a binary encoding of S-expressions +that is super simple and well suited for communication between +programs. + +This library only provides a few helpers for simple applications. If +you need more advanced support, such as parsing from more fancy input +sources, you should consider copying the code of this library given +how simple parsing S-expressions in canonical form is. + +To avoid a dependency on a particular S-expression library, the only +module of this library is parameterised by the type of S-expressions. + +[1] https://en.wikipedia.org/wiki/Canonical_S-expressions +""" +maintainer: ["Jeremie Dimino "] +authors: [ + "Quentin Hocquet " + "Jane Street Group, LLC " + "Jeremie Dimino " +] +license: "MIT" +homepage: "https://github.com/ocaml-dune/csexp" +doc: "https://ocaml-dune.github.io/csexp/" +bug-reports: "https://github.com/ocaml-dune/csexp/issues" +depends: [ + "dune" {>= "1.11"} + "ocaml" {>= "4.02.3"} + "result" {>= "1.5"} +] +dev-repo: "git+https://github.com/ocaml-dune/csexp.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" +# "@runtest" {with-test & ocaml:version >= "4.04"} + "@doc" {with-doc} + ] +] +x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b" +url { + src: + "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz" + checksum: [ + "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026" + ] +} diff --git a/fp.esy.lock/opam/dot-merlin-reader.3.4.2/opam b/fp.esy.lock/opam/dot-merlin-reader.3.4.2/opam new file mode 100644 index 00000000..e740ed7d --- /dev/null +++ b/fp.esy.lock/opam/dot-merlin-reader.3.4.2/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +synopsis: "Reads config files for merlin" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.1" & < "4.12"} + "dune" {>= "1.8.0"} + "yojson" {>= "1.6.0"} + "ocamlfind" {>= "1.6.0"} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} +] +x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" +url { + src: + "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" + checksum: [ + "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" + ] +} diff --git a/fp.esy.lock/opam/dune.2.7.1/opam b/fp.esy.lock/opam/dune.2.7.1/opam new file mode 100644 index 00000000..aaa13e67 --- /dev/null +++ b/fp.esy.lock/opam/dune.2.7.1/opam @@ -0,0 +1,56 @@ +opam-version: "2.0" +synopsis: "Fast, portable, and opinionated build system" +description: """ + +dune is a build system that was designed to simplify the release of +Jane Street packages. It reads metadata from "dune" files following a +very simple s-expression syntax. + +dune is fast, has very low-overhead, and supports parallel builds on +all platforms. It has no system dependencies; all you need to build +dune or packages using dune is OCaml. You don't need make or bash +as long as the packages themselves don't use bash explicitly. + +dune supports multi-package development by simply dropping multiple +repositories into the same directory. + +It also supports multi-context builds, such as building against +several opam roots/switches simultaneously. This helps maintaining +packages across several versions of OCaml and gives cross-compilation +for free. +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +conflicts: [ + "dune-configurator" {< "2.3.0"} + "odoc" {< "1.3.0"} + "dune-release" {< "1.3.0"} + "js_of_ocaml-compiler" {< "3.6.0"} + "jbuilder" {= "transition"} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path + ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} + ["ocaml" "bootstrap.ml" "-j" jobs] + ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] +] +depends: [ + # Please keep the lower bound in sync with .github/workflows/workflow.yml, + # dune-project and min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) + "base-unix" + "base-threads" +] +x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c" +url { + src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz" + checksum: [ + "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" + "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b" + ] +} diff --git a/fp.esy.lock/opam/easy-format.1.3.2/opam b/fp.esy.lock/opam/easy-format.1.3.2/opam new file mode 100644 index 00000000..138d0fb2 --- /dev/null +++ b/fp.esy.lock/opam/easy-format.1.3.2/opam @@ -0,0 +1,46 @@ +opam-version: "2.0" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "@doc"] {with-doc} +] +maintainer: ["martin@mjambon.com" "rudi.grinberg@gmail.com"] +authors: ["Martin Jambon"] +bug-reports: "https://github.com/mjambon/easy-format/issues" +homepage: "https://github.com/mjambon/easy-format" +doc: "https://mjambon.github.io/easy-format/" +license: "BSD-3-Clause" +dev-repo: "git+https://github.com/mjambon/easy-format.git" +synopsis: + "High-level and functional interface to the Format module of the OCaml standard library" +description: """ + +This module offers a high-level and functional interface to the Format module of +the OCaml standard library. It is a pretty-printing facility, i.e. it takes as +input some code represented as a tree and formats this code into the most +visually satisfying result, breaking and indenting lines of code where +appropriate. + +Input data must be first modelled and converted into a tree using 3 kinds of +nodes: + +* atoms +* lists +* labelled nodes + +Atoms represent any text that is guaranteed to be printed as-is. Lists can model +any sequence of items such as arrays of data or lists of definitions that are +labelled with something like "int main", "let x =" or "x:".""" +depends: [ + "dune" {>= "1.10"} + "ocaml" {>= "4.02.3"} +] +url { + src: + "https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz" + checksum: [ + "sha256=3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926" + "sha512=e39377a2ff020ceb9ac29e8515a89d9bdbc91dfcfa871c4e3baafa56753fac2896768e5d9822a050dc1e2ade43c8967afb69391a386c0a8ecd4e1f774e236135" + ] +} diff --git a/fp.esy.lock/opam/fix.20201120/opam b/fp.esy.lock/opam/fix.20201120/opam new file mode 100644 index 00000000..31c8a641 --- /dev/null +++ b/fp.esy.lock/opam/fix.20201120/opam @@ -0,0 +1,24 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " +] +homepage: "https://gitlab.inria.fr/fpottier/fix" +dev-repo: "git+https://gitlab.inria.fr/fpottier/fix.git" +bug-reports: "francois.pottier@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.03" } + "dune" {>= "1.3" } +] +synopsis: "Facilities for memoization and fixed points" +url { + src: + "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz" + checksum: [ + "md5=7eb570b759635fe66f3556d2b1cc88e3" + "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4" + ] +} diff --git a/fp.esy.lock/opam/junit.2.0.2/opam b/fp.esy.lock/opam/junit.2.0.2/opam new file mode 100644 index 00000000..874cf38f --- /dev/null +++ b/fp.esy.lock/opam/junit.2.0.2/opam @@ -0,0 +1,32 @@ +opam-version: "2.0" +maintainer: "Louis Roché " +authors: "Louis Roché " +homepage: "https://github.com/Khady/ocaml-junit" +bug-reports: "https://github.com/Khady/ocaml-junit/issues" +license: "LGPLv3+ with OCaml linking exception" +dev-repo: "git+https://github.com/Khady/ocaml-junit.git" +doc: "https://khady.github.io/ocaml-junit/" +tags: ["junit" "jenkins"] +depends: [ + "dune" {>= "1.0"} + "ptime" + "tyxml" {>= "4.0.0"} + "odoc" {with-doc & >= "1.1.1"} +] +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "-j" jobs] {with-doc} +] +name: "junit" +synopsis: "JUnit XML reports generation library" +description: "JUnit XML reports generation library" +url { + src: + "https://github.com/Khady/ocaml-junit/releases/download/2.0.2/junit-2.0.2.tbz" + checksum: [ + "sha256=fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01" + "sha512=5a9fa803c4861748bb8482fc51197420bf3cc3b9540989a489c4ffb65fdd02386aaa60437eae29182209dae0903b0e537c095249e19d395a451b8e8214f15f03" + ] +} diff --git a/fp.esy.lock/opam/menhir.20201122/opam b/fp.esy.lock/opam/menhir.20201122/opam new file mode 100644 index 00000000..48faa415 --- /dev/null +++ b/fp.esy.lock/opam/menhir.20201122/opam @@ -0,0 +1,27 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" { >= "2.2.0"} + "menhirLib" {= version} + "menhirSdk" {= version} +] +synopsis: "An LR(1) parser generator" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/fp.esy.lock/opam/menhirLib.20201122/opam b/fp.esy.lock/opam/menhirLib.20201122/opam new file mode 100644 index 00000000..e1cb73cc --- /dev/null +++ b/fp.esy.lock/opam/menhirLib.20201122/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Runtime support library for parsers generated by Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/fp.esy.lock/opam/menhirSdk.20201122/opam b/fp.esy.lock/opam/menhirSdk.20201122/opam new file mode 100644 index 00000000..977c9fbd --- /dev/null +++ b/fp.esy.lock/opam/menhirSdk.20201122/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Compile-time library for auxiliary tools related to Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/fp.esy.lock/opam/merlin-extend.0.6/opam b/fp.esy.lock/opam/merlin-extend.0.6/opam new file mode 100644 index 00000000..39b33757 --- /dev/null +++ b/fp.esy.lock/opam/merlin-extend.0.6/opam @@ -0,0 +1,30 @@ +opam-version: "2.0" +maintainer: "Frederic Bour " +authors: "Frederic Bour " +homepage: "https://github.com/let-def/merlin-extend" +bug-reports: "https://github.com/let-def/merlin-extend" +license: "MIT" +dev-repo: "git+https://github.com/let-def/merlin-extend.git" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "dune" {>= "1.0"} + "cppo" {build} + "ocaml" {>= "4.02.3"} +] +synopsis: "A protocol to provide custom frontend to Merlin" +description: """ +This protocol allows to replace the OCaml frontend of Merlin. +It extends what used to be done with the `-pp' flag to handle a few more cases.""" +doc: "https://let-def.github.io/merlin-extend" +x-commit-hash: "640620568a5f5c7798239ecf7c707c813e3df3cf" +url { + src: + "https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz" + checksum: [ + "sha256=c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" + "sha512=4c64a490e2ece04fc89aef679c1d9202175df4fe045b5fdc7a37cd7cebe861226fddd9648c1bf4f06175ecfcd2ed7686c96bd6a8cae003a5096f6134c240f857" + ] +} diff --git a/fp.esy.lock/opam/merlin.3.4.2/opam b/fp.esy.lock/opam/merlin.3.4.2/opam new file mode 100644 index 00000000..3e229166 --- /dev/null +++ b/fp.esy.lock/opam/merlin.3.4.2/opam @@ -0,0 +1,74 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +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] + ["dune" "runtest" "-p" name "-j" "1"] {with-test & ocaml:version >= "4.03"} +] +depends: [ + "ocaml" {>= "4.02.3" & < "4.12"} + "dune" {>= "1.8.0"} + "dot-merlin-reader" {= version} + "yojson" {>= "1.6.0"} + "mdx" {with-test & >= "1.3.0"} + "conf-jq" {with-test} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} +] +synopsis: + "Editor helper, provides completion, typing and source browsing in Vim and Emacs" +description: + "Merlin is an assistant for editing OCaml code. It aims to provide the features available in modern IDEs: error reporting, auto completion, source browsing and much more." +post-messages: [ + "merlin installed. + +Quick setup for VIM +------------------- +Append this to your .vimrc to add merlin to vim's runtime-path: + let g:opamshare = substitute(system('opam config var share'),'\\n$','','''') + execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\" + +Also run the following line in vim to index the documentation: + :execute \"helptags \" . g:opamshare . \"/merlin/vim/doc\" + +Quick setup for EMACS +------------------- +Add opam emacs directory to your load-path by appending this to your .emacs: + (let ((opam-share (ignore-errors (car (process-lines \"opam\" \"config\" \"var\" \"share\"))))) + (when (and opam-share (file-directory-p opam-share)) + ;; Register Merlin + (add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share)) + (autoload 'merlin-mode \"merlin\" nil t nil) + ;; Automatically start it in OCaml buffers + (add-hook 'tuareg-mode-hook 'merlin-mode t) + (add-hook 'caml-mode-hook 'merlin-mode t) + ;; Use opam switch to lookup ocamlmerlin binary + (setq merlin-command 'opam))) + +Take a look at https://github.com/ocaml/merlin for more information + +Quick setup with opam-user-setup +-------------------------------- + +Opam-user-setup support Merlin. + + $ opam user-setup install + +should take care of basic setup. +See https://github.com/OCamlPro/opam-user-setup +" + {success & !user-setup:installed} +] +x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" +url { + src: + "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" + checksum: [ + "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" + ] +} diff --git a/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch new file mode 100644 index 00000000..cda19dd2 --- /dev/null +++ b/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch @@ -0,0 +1,24 @@ +From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 +From: David Allsopp +Date: Fri, 26 Jul 2019 12:12:19 +0100 +Subject: [PATCH] Don't build manpages for stdlib docs +--- + ocamldoc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile +index b109815071..e31e441f61 100644 +--- a/ocamldoc/Makefile ++++ b/ocamldoc/Makefile +@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) + + + .PHONY: all +-all: lib exe generators manpages ++all: lib exe generators + + manpages: generators + +-- +2.20.1 + diff --git a/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch new file mode 100644 index 00000000..41f5f770 --- /dev/null +++ b/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch @@ -0,0 +1,26 @@ +From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 +From: David Allsopp +Date: Tue, 6 Aug 2019 09:23:06 +0100 +Subject: [PATCH] Fix failure to install tools links + +In --disable-installing-bytecode-programs mode, the .opt version of the +tools is installed, but the symlink for the tool itself is not created. +--- + tools/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/Makefile b/tools/Makefile +index 530dd37f34..1b3014a3ab 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -197,6 +197,7 @@ else + do \ + if test -f "$$i".opt; then \ + $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ ++ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ + fi; \ + done + endif +-- +2.20.1 + diff --git a/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch new file mode 100644 index 00000000..e37b5e88 --- /dev/null +++ b/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch @@ -0,0 +1,34 @@ +commit 3f10a16153308f967149917585d2bc0b9c06492c +Author: Anil Madhavapeddy +Date: Sun Jun 21 18:40:27 2020 +0100 + + Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build + + Signed-off-by: Anil Madhavapeddy + +diff --git a/configure b/configure +index 9a78a4554..0c54b560b 100755 +--- a/configure ++++ b/configure +@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; + -fno-builtin-memcmp"; + internal_cflags="$gcc_warnings" ;; #( + gcc-*) : +- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; ++ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; + internal_cflags="$gcc_warnings" ;; #( + msvc-*) : + common_cflags="-nologo -O2 -Gy- -MD" +diff --git a/configure.ac b/configure.ac +index f5d8a2687..775e0e2db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -540,7 +540,7 @@ AS_CASE([$host], + -fno-builtin-memcmp"; + internal_cflags="$gcc_warnings"], + [gcc-*], +- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; ++ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; + internal_cflags="$gcc_warnings"], + [msvc-*], + [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam new file mode 100644 index 00000000..905f9b3d --- /dev/null +++ b/fp.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam @@ -0,0 +1,51 @@ +opam-version: "2.0" +synopsis: "OCaml 4.08.1 Secondary Switch Compiler" +maintainer: "platform@lists.ocaml.org" +authors: "Xavier Leroy and many contributors" +homepage: "https://ocaml.org" +bug-reports: "https://github.com/ocaml/ocaml/issues" +dev-repo: "git://github.com/ocaml/ocaml" +depends: "ocaml" {< "4.08.0" | >= "4.09~"} +build: [ + [ + "./configure" + "--prefix=%{_:share}%" + "--libdir=%{_:share}%/lib" + "--disable-debugger" + "--disable-installing-bytecode-programs" + "--disable-debug-runtime" + "--disable-instrumented-runtime" + "--disable-graph-lib" + "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} + "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} + ] + [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] +] +install: [make "install"] +url { + src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" + checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" +} +extra-files: [ + ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] + ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] + ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] +] +patches: [ + "0001-Don-t-build-manpages-for-stdlib-docs.patch" + "0001-Fix-failure-to-install-tools-links.patch" + "fix-gcc10.patch" +] + +post-messages: [ + "A failure in the middle of the build may be caused by build parallelism + (enabled by default). + Please file a bug report at https://github.com/ocaml/ocaml/issues" + {failure & jobs > 1 & os != "cygwin"} + "You can try installing again including --jobs=1 + to force a sequential build instead." + {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} +] +description: "Installs an additional compiler to the opam switch in +%{_:share}%/ocaml-secondary-compiler which can be accessed using +`ocamlfind -toolchain secondary`." diff --git a/fp.esy.lock/opam/ocamlbuild.0.14.0/opam b/fp.esy.lock/opam/ocamlbuild.0.14.0/opam new file mode 100644 index 00000000..8deabeed --- /dev/null +++ b/fp.esy.lock/opam/ocamlbuild.0.14.0/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +maintainer: "Gabriel Scherer " +authors: ["Nicolas Pouillard" "Berke Durak"] +homepage: "https://github.com/ocaml/ocamlbuild/" +bug-reports: "https://github.com/ocaml/ocamlbuild/issues" +license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" +doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc" +dev-repo: "git+https://github.com/ocaml/ocamlbuild.git" +build: [ + [ + make + "-f" + "configure.make" + "all" + "OCAMLBUILD_PREFIX=%{prefix}%" + "OCAMLBUILD_BINDIR=%{bin}%" + "OCAMLBUILD_LIBDIR=%{lib}%" + "OCAMLBUILD_MANDIR=%{man}%" + "OCAML_NATIVE=%{ocaml:native}%" + "OCAML_NATIVE_TOOLS=%{ocaml:native}%" + ] + [make "check-if-preinstalled" "all" "opam-install"] +] +conflicts: [ + "base-ocamlbuild" + "ocamlfind" {< "1.6.2"} +] +synopsis: + "OCamlbuild is a build system with builtin rules to easily build most OCaml projects." +depends: [ + "ocaml" {>= "4.03"} +] +url { + src: "https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz" + checksum: "sha256=87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78" +} diff --git a/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in new file mode 100644 index 00000000..12e3ee66 --- /dev/null +++ b/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in @@ -0,0 +1,3 @@ +description = "OCaml Secondary Compiler" +version = "%{ocaml-secondary-compiler:version}%" +directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in new file mode 100644 index 00000000..d13023c9 --- /dev/null +++ b/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in @@ -0,0 +1,10 @@ +path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" +ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" +ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" +ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" +ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" +ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" +ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/opam new file mode 100644 index 00000000..acdb5764 --- /dev/null +++ b/fp.esy.lock/opam/ocamlfind-secondary.1.8.1/opam @@ -0,0 +1,32 @@ +opam-version: "2.0" +maintainer: "David Allsopp " +homepage: "https://github.com/ocaml/opam-repository" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] +install: [ + [make "install-meta"] + ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] + ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] + ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] + ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] +] +depends: [ + "ocaml-secondary-compiler" + "ocamlfind" {= "1.8.1"} +] +synopsis: "ocamlfind support for ocaml-secondary-compiler" +description: """ +Exposes the compiler built by the ocaml-secondary-compielr package via +-toolchain secondary. A virtual package called ocaml is also installed to +locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" +authors: ["Gerd Stolpmann " "David Allsopp "] +substs: ["META" "ocaml-secondary-compiler.conf"] +extra-files: [ + ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] + ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] +] +url { + src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" + checksum: "md5=18ca650982c15536616dea0e422cbd8c" + mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" +} diff --git a/fp.esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub b/fp.esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub new file mode 100644 index 00000000..e5ad9907 --- /dev/null +++ b/fp.esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub @@ -0,0 +1,4 @@ +#!/bin/sh + +BINDIR=$(dirname "$(command -v ocamlc)") +"$BINDIR/ocaml" -I "$OCAML_TOPLEVEL_PATH" "$@" diff --git a/fp.esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install b/fp.esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install new file mode 100644 index 00000000..295c6254 --- /dev/null +++ b/fp.esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install @@ -0,0 +1,6 @@ +bin: [ + "src/findlib/ocamlfind" {"ocamlfind"} + "?src/findlib/ocamlfind_opt" {"ocamlfind"} + "?tools/safe_camlp4" +] +toplevel: ["src/findlib/topfind"] diff --git a/fp.esy.lock/opam/ocamlfind.1.8.1/opam b/fp.esy.lock/opam/ocamlfind.1.8.1/opam new file mode 100644 index 00000000..d757d669 --- /dev/null +++ b/fp.esy.lock/opam/ocamlfind.1.8.1/opam @@ -0,0 +1,50 @@ +opam-version: "2.0" +synopsis: "A library manager for OCaml" +maintainer: "Thomas Gazagnaire " +authors: "Gerd Stolpmann " +homepage: "http://projects.camlcity.org/projects/findlib.html" +bug-reports: "https://gitlab.camlcity.org/gerd/lib-findlib/issues" +dev-repo: "git+https://gitlab.camlcity.org/gerd/lib-findlib.git" +description: """ +Findlib is a library manager for OCaml. It provides a convention how +to store libraries, and a file format ("META") to describe the +properties of libraries. There is also a tool (ocamlfind) for +interpreting the META files, so that it is very easy to use libraries +in programs and scripts. +""" +build: [ + [ + "./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 "all"] + [make "opt"] {ocaml:native} +] +install: [ + [make "install"] + ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} +] +depends: [ + "ocaml" {>= "4.00.0"} + "conf-m4" {build} +] +extra-files: [ + ["ocamlfind.install" "md5=06f2c282ab52d93aa6adeeadd82a2543"] + ["ocaml-stub" "md5=181f259c9e0bad9ef523e7d4abfdf87a"] +] +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" +} +depopts: ["graphics"] diff --git a/fp.esy.lock/opam/ppx_derivers.1.2.1/opam b/fp.esy.lock/opam/ppx_derivers.1.2.1/opam new file mode 100644 index 00000000..3d10814e --- /dev/null +++ b/fp.esy.lock/opam/ppx_derivers.1.2.1/opam @@ -0,0 +1,23 @@ +opam-version: "2.0" +maintainer: "jeremie@dimino.org" +authors: ["Jérémie Dimino"] +license: "BSD-3-Clause" +homepage: "https://github.com/ocaml-ppx/ppx_derivers" +bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues" +dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" + "dune" +] +synopsis: "Shared [@@deriving] plugin registry" +description: """ +Ppx_derivers is a tiny package whose sole purpose is to allow +ppx_deriving and ppx_type_conv to inter-operate gracefully when linked +as part of the same ocaml-migrate-parsetree driver.""" +url { + src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz" + checksum: "md5=5dc2bf130c1db3c731fe0fffc5648b41" +} diff --git a/fp.esy.lock/opam/ptime.0.8.5/opam b/fp.esy.lock/opam/ptime.0.8.5/opam new file mode 100644 index 00000000..ed7c8d92 --- /dev/null +++ b/fp.esy.lock/opam/ptime.0.8.5/opam @@ -0,0 +1,49 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["The ptime programmers"] +homepage: "https://erratique.ch/software/ptime" +doc: "https://erratique.ch/software/ptime/doc" +dev-repo: "git+http://erratique.ch/repos/ptime.git" +bug-reports: "https://github.com/dbuenzli/ptime/issues" +tags: [ "time" "posix" "system" "org:erratique" ] +license: "ISC" +depends: [ + "ocaml" {>= "4.01.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build} + "result" +] +depopts: [ "js_of_ocaml" ] +conflicts: [ "js_of_ocaml" { < "3.3.0" } ] +build:[[ + "ocaml" "pkg/pkg.ml" "build" + "--pinned" "%{pinned}%" + "--with-js_of_ocaml" "%{js_of_ocaml:installed}%" ]] + +synopsis: """POSIX time for OCaml""" +description: """\ + +Ptime has platform independent POSIX time support in pure OCaml. It +provides a type to represent a well-defined range of POSIX timestamps +with picosecond precision, conversion with date-time values, +conversion with [RFC 3339 timestamps][rfc3339] and pretty printing to a +human-readable, locale-independent representation. + +The additional Ptime_clock library provides access to a system POSIX +clock and to the system's current time zone offset. + +Ptime is not a calendar library. + +Ptime depends on the `result` compatibility package. Ptime_clock +depends on your system library. Ptime_clock's optional JavaScript +support depends on [js_of_ocaml][jsoo]. Ptime and its libraries are +distributed under the ISC license. + +[rfc3339]: http://tools.ietf.org/html/rfc3339 +[jsoo]: http://ocsigen.org/js_of_ocaml/ +""" +url { +archive: "https://erratique.ch/software/ptime/releases/ptime-0.8.5.tbz" +checksum: "4d48055d623ecf2db792439b3e96a520" +} diff --git a/fp.esy.lock/opam/re.1.9.0/opam b/fp.esy.lock/opam/re.1.9.0/opam new file mode 100644 index 00000000..f7987544 --- /dev/null +++ b/fp.esy.lock/opam/re.1.9.0/opam @@ -0,0 +1,42 @@ +opam-version: "2.0" + +maintainer: "rudi.grinberg@gmail.com" +authors: [ + "Jerome Vouillon" + "Thomas Gazagnaire" + "Anil Madhavapeddy" + "Rudi Grinberg" + "Gabriel Radanne" +] +license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" +homepage: "https://github.com/ocaml/ocaml-re" +bug-reports: "https://github.com/ocaml/ocaml-re/issues" +dev-repo: "git+https://github.com/ocaml/ocaml-re.git" + +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] + +depends: [ + "ocaml" {>= "4.02"} + "dune" + "ounit" {with-test} + "seq" +] + +synopsis: "RE is a regular expression library for OCaml" +description: """ +Pure OCaml regular expressions with: +* Perl-style regular expressions (module Re.Perl) +* Posix extended regular expressions (module Re.Posix) +* Emacs-style regular expressions (module Re.Emacs) +* Shell-style file globbing (module Re.Glob) +* Compatibility layer for OCaml's built-in Str module (module Re.Str) +""" +url { + src: + "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz" + checksum: "md5=bddaed4f386a22cace7850c9c7dac296" +} diff --git a/fp.esy.lock/opam/result.1.5/opam b/fp.esy.lock/opam/result.1.5/opam new file mode 100644 index 00000000..671af042 --- /dev/null +++ b/fp.esy.lock/opam/result.1.5/opam @@ -0,0 +1,22 @@ +opam-version: "2.0" +maintainer: "opensource@janestreet.com" +authors: ["Jane Street Group, LLC "] +homepage: "https://github.com/janestreet/result" +dev-repo: "git+https://github.com/janestreet/result.git" +bug-reports: "https://github.com/janestreet/result/issues" +license: "BSD-3-Clause" +build: [["dune" "build" "-p" name "-j" jobs]] +depends: [ + "ocaml" + "dune" {>= "1.0"} +] +synopsis: "Compatibility Result module" +description: """ +Projects that want to use the new result type defined in OCaml >= 4.03 +while staying compatible with older version of OCaml should use the +Result module defined in this library.""" +url { + src: + "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz" + checksum: "md5=1b82dec78849680b49ae9a8a365b831b" +} diff --git a/esy.lock/opam/seq.0.2.2/opam b/fp.esy.lock/opam/seq.0.2.2/opam similarity index 99% rename from esy.lock/opam/seq.0.2.2/opam rename to fp.esy.lock/opam/seq.0.2.2/opam index 4786ab82..5ed51654 100644 --- a/esy.lock/opam/seq.0.2.2/opam +++ b/fp.esy.lock/opam/seq.0.2.2/opam @@ -21,4 +21,4 @@ url { "md5=9033e02283aa3bde9f97f24e632902e3" "sha512=cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c" ] -} \ No newline at end of file +} diff --git a/fp.esy.lock/opam/topkg.1.0.3/opam b/fp.esy.lock/opam/topkg.1.0.3/opam new file mode 100644 index 00000000..6e073a11 --- /dev/null +++ b/fp.esy.lock/opam/topkg.1.0.3/opam @@ -0,0 +1,48 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["Daniel Bünzli "] +homepage: "http://erratique.ch/software/topkg" +doc: "http://erratique.ch/software/topkg/doc" +license: "ISC" +dev-repo: "git+http://erratique.ch/repos/topkg.git" +bug-reports: "https://github.com/dbuenzli/topkg/issues" +tags: ["packaging" "ocamlbuild" "org:erratique"] +depends: [ + "ocaml" {>= "4.03.0"} + "ocamlfind" {build & >= "1.6.1"} + "ocamlbuild" ] +build: [[ + "ocaml" "pkg/pkg.ml" "build" + "--pkg-name" name + "--dev-pkg" "%{pinned}%" ]] +synopsis: """The transitory OCaml software packager""" +description: """\ + +Topkg is a packager for distributing OCaml software. It provides an +API to describe the files a package installs in a given build +configuration and to specify information about the package's +distribution, creation and publication procedures. + +The optional topkg-care package provides the `topkg` command line tool +which helps with various aspects of a package's life cycle: creating +and linting a distribution, releasing it on the WWW, publish its +documentation, add it to the OCaml opam repository, etc. + +Topkg is distributed under the ISC license and has **no** +dependencies. This is what your packages will need as a *build* +dependency. + +Topkg-care is distributed under the ISC license it depends on +[fmt][fmt], [logs][logs], [bos][bos], [cmdliner][cmdliner], +[webbrowser][webbrowser] and `opam-format`. + +[fmt]: http://erratique.ch/software/fmt +[logs]: http://erratique.ch/software/logs +[bos]: http://erratique.ch/software/bos +[cmdliner]: http://erratique.ch/software/cmdliner +[webbrowser]: http://erratique.ch/software/webbrowser +""" +url { +archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz" +checksum: "e285f7a296d77ee7d831ba9a6bfb396f" +} diff --git a/fp.esy.lock/opam/tyxml.4.4.0/opam b/fp.esy.lock/opam/tyxml.4.4.0/opam new file mode 100644 index 00000000..51532b53 --- /dev/null +++ b/fp.esy.lock/opam/tyxml.4.4.0/opam @@ -0,0 +1,47 @@ +opam-version: "2.0" +maintainer: "dev@ocsigen.org" +homepage: "https://github.com/ocsigen/tyxml/" +bug-reports: "https://github.com/ocsigen/tyxml/issues" +doc: "https://ocsigen.org/tyxml/manual/" +dev-repo: "git+https://github.com/ocsigen/tyxml.git" +license: "LGPL-2.1 with OCaml linking exception" + +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] + +depends: [ + "ocaml" {>= "4.02"} + "dune" + "alcotest" {with-test} + "seq" + "uutf" {>= "1.0.0"} + "re" {>= "1.5.0"} +] + +synopsis:"TyXML is a library for building correct HTML and SVG documents" +description:""" +TyXML provides a set of convenient combinators that uses the OCaml +type system to ensure the validity of the generated documents. TyXML +can be used with any representation of HTML and SVG: the textual one, +provided directly by this package, or DOM trees (`js_of_ocaml-tyxml`) +virtual DOM (`virtual-dom`) and reactive or replicated trees +(`eliom`). You can also create your own representation and use it to +instantiate a new set of combinators. + +```ocaml +open Tyxml +let to_ocaml = Html.(a ~a:[a_href "ocaml.org"] [txt "OCaml!"]) +``` +""" +authors: "The ocsigen team" +url { + src: + "https://github.com/ocsigen/tyxml/releases/download/4.4.0/tyxml-4.4.0.tbz" + checksum: [ + "sha256=516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530" + "sha512=d5f2187f8410524cec7a14b28e8950837070eb0b6571b015dd06076c2841eb7ccaffa86d5d2307eaf1950ee62f9fb926477dac01c870d9c1a2f525853cb44d0c" + ] +} diff --git a/fp.esy.lock/opam/uchar.0.0.2/opam b/fp.esy.lock/opam/uchar.0.0.2/opam new file mode 100644 index 00000000..428d7aa6 --- /dev/null +++ b/fp.esy.lock/opam/uchar.0.0.2/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["Daniel Bünzli "] +homepage: "http://ocaml.org" +doc: "https://ocaml.github.io/uchar/" +dev-repo: "git+https://github.com/ocaml/uchar.git" +bug-reports: "https://github.com/ocaml/uchar/issues" +tags: [ "text" "character" "unicode" "compatibility" "org:ocaml.org" ] +license: "typeof OCaml system" +depends: [ + "ocaml" {>= "3.12.0"} + "ocamlbuild" {build} +] +build: [ + ["ocaml" "pkg/git.ml"] + [ + "ocaml" + "pkg/build.ml" + "native=%{ocaml:native}%" + "native-dynlink=%{ocaml:native-dynlink}%" + ] +] +synopsis: "Compatibility library for OCaml's Uchar module" +description: """ +The `uchar` package provides a compatibility library for the +[`Uchar`][1] module introduced in OCaml 4.03. + +The `uchar` package is distributed under the license of the OCaml +compiler. See [LICENSE](LICENSE) for details. + +[1]: http://caml.inria.fr/pub/docs/manual-ocaml/libref/Uchar.html""" +url { + src: + "https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz" + checksum: "md5=c9ba2c738d264c420c642f7bb1cf4a36" +} diff --git a/fp.esy.lock/opam/uutf.1.0.2/opam b/fp.esy.lock/opam/uutf.1.0.2/opam new file mode 100644 index 00000000..3a9f5678 --- /dev/null +++ b/fp.esy.lock/opam/uutf.1.0.2/opam @@ -0,0 +1,40 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["Daniel Bünzli "] +homepage: "http://erratique.ch/software/uutf" +doc: "http://erratique.ch/software/uutf/doc/Uutf" +dev-repo: "git+http://erratique.ch/repos/uutf.git" +bug-reports: "https://github.com/dbuenzli/uutf/issues" +tags: [ "unicode" "text" "utf-8" "utf-16" "codec" "org:erratique" ] +license: "ISC" +depends: [ + "ocaml" {>= "4.01.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build} + "uchar" +] +depopts: ["cmdliner"] +conflicts: ["cmdliner" { < "0.9.6"} ] +build: [[ + "ocaml" "pkg/pkg.ml" "build" + "--pinned" "%{pinned}%" + "--with-cmdliner" "%{cmdliner:installed}%" ]] +synopsis: """Non-blocking streaming Unicode codec for OCaml""" +description: """\ + +Uutf is a non-blocking streaming codec to decode and encode the UTF-8, +UTF-16, UTF-16LE and UTF-16BE encoding schemes. It can efficiently +work character by character without blocking on IO. Decoders perform +character position tracking and support newline normalization. + +Functions are also provided to fold over the characters of UTF encoded +OCaml string values and to directly encode characters in OCaml +Buffer.t values. + +Uutf has no dependency and is distributed under the ISC license. +""" +url { +archive: "http://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz" +checksum: "a7c542405a39630c689a82bd7ef2292c" +} diff --git a/fp.esy.lock/opam/yojson.1.7.0/opam b/fp.esy.lock/opam/yojson.1.7.0/opam new file mode 100644 index 00000000..ffef0682 --- /dev/null +++ b/fp.esy.lock/opam/yojson.1.7.0/opam @@ -0,0 +1,38 @@ +opam-version: "2.0" +maintainer: "martin@mjambon.com" +authors: ["Martin Jambon"] +homepage: "https://github.com/ocaml-community/yojson" +bug-reports: "https://github.com/ocaml-community/yojson/issues" +dev-repo: "git+https://github.com/ocaml-community/yojson.git" +doc: "https://ocaml-community.github.io/yojson/" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +run-test: [["dune" "runtest" "-p" name "-j" jobs]] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" + "cppo" {build} + "easy-format" + "biniou" {>= "1.2.0"} + "alcotest" {with-test & >= "0.8.5"} +] +synopsis: + "Yojson is an optimized parsing and printing library for the JSON format" +description: """ +Yojson is an optimized parsing and printing library for the JSON format. + +It addresses a few shortcomings of json-wheel including 2x speedup, +polymorphic variants and optional syntax for tuples and variants. + +ydump is a pretty-printing command-line program provided with the +yojson package. + +The program atdgen can be used to derive OCaml-JSON serializers and +deserializers from type definitions.""" +url { + src: + "https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz" + checksum: "md5=b89d39ca3f8c532abe5f547ad3b8f84d" +} diff --git a/fp.esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json b/fp.esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json new file mode 100644 index 00000000..ca6a373d --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json @@ -0,0 +1,6 @@ +{ + "build": "true", + "dependencies": { + "esy-m4": "esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7" + } +} diff --git a/fp.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh b/fp.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh new file mode 100644 index 00000000..b2a94f75 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +SECONDARY_CONF="$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf" + +if test -f $SECONDARY_CONF; then + export OCAMLFIND_CONF=$SECONDARY_CONF; +fi + +env -u OCAMLLIB ocaml bootstrap.ml +./dune.exe build -p dune --profile dune-bootstrap diff --git a/fp.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json b/fp.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json new file mode 100644 index 00000000..c7d77ab6 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json @@ -0,0 +1,8 @@ +{ + "buildsInSource": true, + "build": "bash build.sh", + "install": "esy-installer dune.install", + "buildEnv": { + "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" + } +} diff --git a/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll new file mode 100755 index 00000000..26301ddd --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll @@ -0,0 +1,16 @@ +#! /bin/sh + +# clone-flexdll +# +# Brings in flexdll, if necessary + +if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then + echo "[Flexdll] Already present, no need to clone." +else + echo "[Flexdll] Cloning..." + git clone https://github.com/esy-ocaml/flexdll.git + cd flexdll + git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff + cd .. + echo "[Flexdll] Clone successful!" +fi \ No newline at end of file diff --git a/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows new file mode 100755 index 00000000..4040b49e --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows @@ -0,0 +1,22 @@ +#! /bin/sh + +# configure-windows +# +# Creates a native Windows MingW build, based on: +# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc + + +export prefix=C:/ocamlmgw64 +while : ; do + case "$1" in + "") break;; + -prefix|--prefix) + prefix=$2; shift;; + esac + shift +done + +echo "[configure-windows] Setting up flexdll" +./clone-flexdll +./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix +make flexdll diff --git a/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build new file mode 100755 index 00000000..b95356a5 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build @@ -0,0 +1,24 @@ +#! /usr/bin/env bash + +# esy-build +# +# Wrapper to execute appropriate build strategy, based on platform + +set -u +set -e +set -o pipefail + +case "$(uname -s)" in + CYGWIN*|MINGW32*|MSYS*) + echo "[esy-build] Detected windows environment..." + make -j4 world.opt + make flexlink.opt + ;; + *) + echo "[esy-build] Detected OSX / Linux environment" + make -j4 world.opt + ;; +esac + +# Common build steps +make install \ No newline at end of file diff --git a/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure new file mode 100755 index 00000000..fd196c51 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure @@ -0,0 +1,29 @@ +#! /usr/bin/env bash + +# esy-configure +# +# Wrapper to delegate to configuration to the +# appropriate `configure` strategy based on the active platform. +# +# Today, OCaml has separate build strategies: +# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc +# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc +# +# We want `esy` to work cross-platform, so this is a shim script that will delegate to the +# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` +# that the `mingw` (native executable) strategy is desired. + +set -u +set -e +set -o pipefail + +case "$(uname -s)" in + CYGWIN*|MINGW32*|MSYS*) + echo "[esy-configure] Detected windows environment..." + ./configure-windows "$@" + ;; + *) + echo "[esy-configure] Detected OSX / Linux environment" + ./configure "$@" + ;; +esac \ No newline at end of file diff --git a/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json new file mode 100644 index 00000000..948455ca --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json @@ -0,0 +1,28 @@ +{ + "buildEnv": { + "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" + }, + "build": [ + [ + "env", + "-u", + "OCAMLLIB", + "bash", "./esy-configure", + "--disable-cfi", + "--prefix", "$cur__install/share/ocaml-secondary-compiler", + "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", + "--disable-debugger", + "--disable-installing-bytecode-programs", + "--disable-debug-runtime", + "--disable-instrumented-runtime", + "--disable-graph-lib" + ], + [ + "env", + "-u", + "OCAMLLIB", + "bash", "./esy-build" + ] + ], + "buildsInSource": true +} diff --git a/fp.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch b/fp.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch new file mode 100644 index 00000000..4d5bea0e --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch @@ -0,0 +1,463 @@ +--- ./Makefile ++++ ./Makefile +@@ -213,7 +213,7 @@ + rm -f man/ocamlbuild.1 + + man/options_man.byte: src/ocamlbuild_pack.cmo +- $(OCAMLC) $^ -I src man/options_man.ml -o man/options_man.byte ++ $(OCAMLC) -I +unix unix.cma $^ -I src man/options_man.ml -o man/options_man.byte + + clean:: + rm -f man/options_man.cm* +--- ./src/command.ml ++++ ./src/command.ml +@@ -148,9 +148,10 @@ + let self = string_of_command_spec_with_calls call_with_tags call_with_target resolve_virtuals in + let b = Buffer.create 256 in + (* The best way to prevent bash from switching to its windows-style +- * quote-handling is to prepend an empty string before the command name. *) ++ * quote-handling is to prepend an empty string before the command name. ++ * space seems to work, too - and the ouput is nicer *) + if Sys.os_type = "Win32" then +- Buffer.add_string b "''"; ++ Buffer.add_char b ' '; + let first = ref true in + let put_space () = + if !first then +@@ -260,7 +261,7 @@ + + let execute_many ?(quiet=false) ?(pretend=false) cmds = + add_parallel_stat (List.length cmds); +- let degraded = !*My_unix.is_degraded || Sys.os_type = "Win32" in ++ let degraded = !*My_unix.is_degraded in + let jobs = !jobs in + if jobs < 0 then invalid_arg "jobs < 0"; + let max_jobs = if jobs = 0 then None else Some jobs in +--- ./src/findlib.ml ++++ ./src/findlib.ml +@@ -66,9 +66,6 @@ + (fun command -> lexer & Lexing.from_string & run_and_read command) + command + +-let run_and_read command = +- Printf.ksprintf run_and_read command +- + let rec query name = + try + Hashtbl.find packages name +@@ -135,7 +132,8 @@ + with Not_found -> s + + let list () = +- List.map before_space (split_nl & run_and_read "%s list" ocamlfind) ++ let cmd = Shell.quote_filename_if_needed ocamlfind ^ " list" in ++ List.map before_space (split_nl & run_and_read cmd) + + (* The closure algorithm is easy because the dependencies are already closed + and sorted for each package. We only have to make the union. We could also +--- ./src/main.ml ++++ ./src/main.ml +@@ -162,6 +162,9 @@ + Tags.mem "traverse" tags + || List.exists (Pathname.is_prefix path_name) !Options.include_dirs + || List.exists (Pathname.is_prefix path_name) target_dirs) ++ && ((* beware: !Options.build_dir is an absolute directory *) ++ Pathname.normalize !Options.build_dir ++ <> Pathname.normalize (Pathname.pwd/path_name)) + end + end + end +--- ./src/my_std.ml ++++ ./src/my_std.ml +@@ -271,13 +271,107 @@ + try Array.iter (fun x -> if x = basename then raise Exit) a; false + with Exit -> true + ++let command_plain = function ++| [| |] -> 0 ++| margv -> ++ let rec waitpid a b = ++ match Unix.waitpid a b with ++ | exception (Unix.Unix_error(Unix.EINTR,_,_)) -> waitpid a b ++ | x -> x ++ in ++ let pid = Unix.(create_process margv.(0) margv stdin stdout stderr) in ++ let pid', process_status = waitpid [] pid in ++ assert (pid = pid'); ++ match process_status with ++ | Unix.WEXITED n -> n ++ | Unix.WSIGNALED _ -> 2 (* like OCaml's uncaught exceptions *) ++ | Unix.WSTOPPED _ -> 127 ++ ++(* can't use Lexers because of circular dependency *) ++let split_path_win str = ++ let rec aux pos = ++ try ++ let i = String.index_from str pos ';' in ++ let len = i - pos in ++ if len = 0 then ++ aux (succ i) ++ else ++ String.sub str pos (i - pos) :: aux (succ i) ++ with Not_found | Invalid_argument _ -> ++ let len = String.length str - pos in ++ if len = 0 then [] else [String.sub str pos len] ++ in ++ aux 0 ++ ++let windows_shell = lazy begin ++ let rec iter = function ++ | [] -> [| "bash.exe" ; "--norc" ; "--noprofile" |] ++ | hd::tl -> ++ let dash = Filename.concat hd "dash.exe" in ++ if Sys.file_exists dash then [|dash|] else ++ let bash = Filename.concat hd "bash.exe" in ++ if Sys.file_exists bash = false then iter tl else ++ (* if sh.exe and bash.exe exist in the same dir, choose sh.exe *) ++ let sh = Filename.concat hd "sh.exe" in ++ if Sys.file_exists sh then [|sh|] else [|bash ; "--norc" ; "--noprofile"|] ++ in ++ split_path_win (try Sys.getenv "PATH" with Not_found -> "") |> iter ++end ++ ++let prep_windows_cmd cmd = ++ (* workaround known ocaml bug, remove later *) ++ if String.contains cmd '\t' && String.contains cmd ' ' = false then ++ " " ^ cmd ++ else ++ cmd ++ ++let run_with_shell = function ++| "" -> 0 ++| cmd -> ++ let cmd = prep_windows_cmd cmd in ++ let shell = Lazy.force windows_shell in ++ let qlen = Filename.quote cmd |> String.length in ++ (* old versions of dash had problems with bs *) ++ try ++ if qlen < 7_900 then ++ command_plain (Array.append shell [| "-ec" ; cmd |]) ++ else begin ++ (* it can still work, if the called command is a cygwin tool *) ++ let ch_closed = ref false in ++ let file_deleted = ref false in ++ let fln,ch = ++ Filename.open_temp_file ++ ~mode:[Open_binary] ++ "ocamlbuildtmp" ++ ".sh" ++ in ++ try ++ let f_slash = String.map ( fun x -> if x = '\\' then '/' else x ) fln in ++ output_string ch cmd; ++ ch_closed:= true; ++ close_out ch; ++ let ret = command_plain (Array.append shell [| "-e" ; f_slash |]) in ++ file_deleted:= true; ++ Sys.remove fln; ++ ret ++ with ++ | x -> ++ if !ch_closed = false then ++ close_out_noerr ch; ++ if !file_deleted = false then ++ (try Sys.remove fln with _ -> ()); ++ raise x ++ end ++ with ++ | (Unix.Unix_error _) as x -> ++ (* Sys.command doesn't raise an exception, so run_with_shell also won't ++ raise *) ++ Printexc.to_string x ^ ":" ^ cmd |> prerr_endline; ++ 1 ++ + let sys_command = +- match Sys.os_type with +- | "Win32" -> fun cmd -> +- if cmd = "" then 0 else +- let cmd = "bash --norc -c " ^ Filename.quote cmd in +- Sys.command cmd +- | _ -> fun cmd -> if cmd = "" then 0 else Sys.command cmd ++ if Sys.win32 then run_with_shell ++ else fun cmd -> if cmd = "" then 0 else Sys.command cmd + + (* FIXME warning fix and use Filename.concat *) + let filename_concat x y = +--- ./src/my_std.mli ++++ ./src/my_std.mli +@@ -69,3 +69,6 @@ + + val split_ocaml_version : (int * int * int * string) option + (** (major, minor, patchlevel, rest) *) ++ ++val windows_shell : string array Lazy.t ++val prep_windows_cmd : string -> string +--- ./src/ocamlbuild_executor.ml ++++ ./src/ocamlbuild_executor.ml +@@ -34,6 +34,8 @@ + job_stdin : out_channel; + job_stderr : in_channel; + job_buffer : Buffer.t; ++ job_pid : int; ++ job_tmp_file: string option; + mutable job_dying : bool; + };; + +@@ -76,6 +78,61 @@ + in + loop 0 + ;; ++ ++let open_process_full_win cmd env = ++ let (in_read, in_write) = Unix.pipe () in ++ let (out_read, out_write) = Unix.pipe () in ++ let (err_read, err_write) = Unix.pipe () in ++ Unix.set_close_on_exec in_read; ++ Unix.set_close_on_exec out_write; ++ Unix.set_close_on_exec err_read; ++ let inchan = Unix.in_channel_of_descr in_read in ++ let outchan = Unix.out_channel_of_descr out_write in ++ let errchan = Unix.in_channel_of_descr err_read in ++ let shell = Lazy.force Ocamlbuild_pack.My_std.windows_shell in ++ let test_cmd = ++ String.concat " " (List.map Filename.quote (Array.to_list shell)) ^ ++ "-ec " ^ ++ Filename.quote (Ocamlbuild_pack.My_std.prep_windows_cmd cmd) in ++ let argv,tmp_file = ++ if String.length test_cmd < 7_900 then ++ Array.append ++ shell ++ [| "-ec" ; Ocamlbuild_pack.My_std.prep_windows_cmd cmd |],None ++ else ++ let fln,ch = Filename.open_temp_file ~mode:[Open_binary] "ocamlbuild" ".sh" in ++ output_string ch (Ocamlbuild_pack.My_std.prep_windows_cmd cmd); ++ close_out ch; ++ let fln' = String.map (function '\\' -> '/' | c -> c) fln in ++ Array.append ++ shell ++ [| "-c" ; fln' |], Some fln in ++ let pid = ++ Unix.create_process_env argv.(0) argv env out_read in_write err_write in ++ Unix.close out_read; ++ Unix.close in_write; ++ Unix.close err_write; ++ (pid, inchan, outchan, errchan,tmp_file) ++ ++let close_process_full_win (pid,inchan, outchan, errchan, tmp_file) = ++ let delete tmp_file = ++ match tmp_file with ++ | None -> () ++ | Some x -> try Sys.remove x with Sys_error _ -> () in ++ let tmp_file_deleted = ref false in ++ try ++ close_in inchan; ++ close_out outchan; ++ close_in errchan; ++ let res = snd(Unix.waitpid [] pid) in ++ tmp_file_deleted := true; ++ delete tmp_file; ++ res ++ with ++ | x when tmp_file <> None && !tmp_file_deleted = false -> ++ delete tmp_file; ++ raise x ++ + (* ***) + (*** execute *) + (* XXX: Add test for non reentrancy *) +@@ -130,10 +187,16 @@ + (*** add_job *) + let add_job cmd rest result id = + (*display begin fun oc -> fp oc "Job %a is %s\n%!" print_job_id id cmd; end;*) +- let (stdout', stdin', stderr') = open_process_full cmd env in ++ let (pid,stdout', stdin', stderr', tmp_file) = ++ if Sys.win32 then open_process_full_win cmd env else ++ let a,b,c = open_process_full cmd env in ++ -1,a,b,c,None ++ in + incr jobs_active; +- set_nonblock (doi stdout'); +- set_nonblock (doi stderr'); ++ if not Sys.win32 then ( ++ set_nonblock (doi stdout'); ++ set_nonblock (doi stderr'); ++ ); + let job = + { job_id = id; + job_command = cmd; +@@ -143,7 +206,9 @@ + job_stdin = stdin'; + job_stderr = stderr'; + job_buffer = Buffer.create 1024; +- job_dying = false } ++ job_dying = false; ++ job_tmp_file = tmp_file; ++ job_pid = pid } + in + outputs := FDM.add (doi stdout') job (FDM.add (doi stderr') job !outputs); + jobs := JS.add job !jobs; +@@ -199,6 +264,7 @@ + try + read fd u 0 (Bytes.length u) + with ++ | Unix.Unix_error(Unix.EPIPE,_,_) when Sys.win32 -> 0 + | Unix.Unix_error(e,_,_) -> + let msg = error_message e in + display (fun oc -> fp oc +@@ -241,14 +307,19 @@ + decr jobs_active; + + (* PR#5371: we would get EAGAIN below otherwise *) +- clear_nonblock (doi job.job_stdout); +- clear_nonblock (doi job.job_stderr); +- ++ if not Sys.win32 then ( ++ clear_nonblock (doi job.job_stdout); ++ clear_nonblock (doi job.job_stderr); ++ ); + do_read ~loop:true (doi job.job_stdout) job; + do_read ~loop:true (doi job.job_stderr) job; + outputs := FDM.remove (doi job.job_stdout) (FDM.remove (doi job.job_stderr) !outputs); + jobs := JS.remove job !jobs; +- let status = close_process_full (job.job_stdout, job.job_stdin, job.job_stderr) in ++ let status = ++ if Sys.win32 then ++ close_process_full_win (job.job_pid, job.job_stdout, job.job_stdin, job.job_stderr, job.job_tmp_file) ++ else ++ close_process_full (job.job_stdout, job.job_stdin, job.job_stderr) in + + let shown = ref false in + +--- ./src/ocamlbuild_unix_plugin.ml ++++ ./src/ocamlbuild_unix_plugin.ml +@@ -48,12 +48,22 @@ + end + + let run_and_open s kont = ++ let s_orig = s in ++ let s = ++ (* Be consistent! My_unix.run_and_open uses My_std.sys_command and ++ sys_command uses bash. *) ++ if Sys.win32 = false then s else ++ let l = match Lazy.force My_std.windows_shell |> Array.to_list with ++ | hd::tl -> (Filename.quote hd)::tl ++ | _ -> assert false in ++ "\"" ^ (String.concat " " l) ^ " -ec " ^ Filename.quote (" " ^ s) ^ "\"" ++ in + let ic = Unix.open_process_in s in + let close () = + match Unix.close_process_in ic with + | Unix.WEXITED 0 -> () + | Unix.WEXITED _ | Unix.WSIGNALED _ | Unix.WSTOPPED _ -> +- failwith (Printf.sprintf "Error while running: %s" s) in ++ failwith (Printf.sprintf "Error while running: %s" s_orig) in + let res = try + kont ic + with e -> (close (); raise e) +--- ./src/options.ml ++++ ./src/options.ml +@@ -174,11 +174,24 @@ + build_dir := Filename.concat (Sys.getcwd ()) s + else + build_dir := s ++ ++let slashify = ++ if Sys.win32 then fun p -> String.map (function '\\' -> '/' | x -> x) p ++ else fun p ->p ++ ++let sb () = ++ match Sys.os_type with ++ | "Win32" -> ++ (try set_binary_mode_out stdout true with _ -> ()); ++ | _ -> () ++ ++ + let spec = ref ( + let print_version () = ++ sb (); + Printf.printf "ocamlbuild %s\n%!" Ocamlbuild_config.version; raise Exit_OK + in +- let print_vnum () = print_endline Ocamlbuild_config.version; raise Exit_OK in ++ let print_vnum () = sb (); print_endline Ocamlbuild_config.version; raise Exit_OK in + Arg.align + [ + "-version", Unit print_version , " Display the version"; +@@ -257,8 +270,8 @@ + "-build-dir", String set_build_dir, " Set build directory (implies no-links)"; + "-install-lib-dir", Set_string Ocamlbuild_where.libdir, " Set the install library directory"; + "-install-bin-dir", Set_string Ocamlbuild_where.bindir, " Set the install binary directory"; +- "-where", Unit (fun () -> print_endline !Ocamlbuild_where.libdir; raise Exit_OK), " Display the install library directory"; +- "-which", String (fun cmd -> print_endline (find_tool cmd); raise Exit_OK), " Display path to the tool command"; ++ "-where", Unit (fun () -> sb (); print_endline (slashify !Ocamlbuild_where.libdir); raise Exit_OK), " Display the install library directory"; ++ "-which", String (fun cmd -> sb (); print_endline (slashify (find_tool cmd)); raise Exit_OK), " Display path to the tool command"; + "-ocamlc", set_cmd ocamlc, " Set the OCaml bytecode compiler"; + "-plugin-ocamlc", set_cmd plugin_ocamlc, " Set the OCaml bytecode compiler \ + used when building myocamlbuild.ml (only)"; +--- ./src/pathname.ml ++++ ./src/pathname.ml +@@ -84,6 +84,26 @@ + | x :: xs -> x :: normalize_list xs + + let normalize x = ++ let x = ++ if Sys.win32 = false then ++ x ++ else ++ let len = String.length x in ++ let b = Bytes.create len in ++ for i = 0 to pred len do ++ match x.[i] with ++ | '\\' -> Bytes.set b i '/' ++ | c -> Bytes.set b i c ++ done; ++ if len > 1 then ( ++ let c1 = Bytes.get b 0 in ++ let c2 = Bytes.get b 1 in ++ if c2 = ':' && c1 >= 'a' && c1 <= 'z' && ++ ( len = 2 || Bytes.get b 2 = '/') then ++ Bytes.set b 0 (Char.uppercase_ascii c1) ++ ); ++ Bytes.unsafe_to_string b ++ in + if Glob.eval not_normal_form_re x then + let root, paths = split x in + join root (normalize_list paths) +--- ./src/shell.ml ++++ ./src/shell.ml +@@ -24,12 +24,26 @@ + | 'a'..'z' | 'A'..'Z' | '0'..'9' | '.' | '-' | '/' | '_' | ':' | '@' | '+' | ',' -> loop (pos + 1) + | _ -> false in + loop 0 ++ ++let generic_quote quotequote s = ++ let l = String.length s in ++ let b = Buffer.create (l + 20) in ++ Buffer.add_char b '\''; ++ for i = 0 to l - 1 do ++ if s.[i] = '\'' ++ then Buffer.add_string b quotequote ++ else Buffer.add_char b s.[i] ++ done; ++ Buffer.add_char b '\''; ++ Buffer.contents b ++let unix_quote = generic_quote "'\\''" ++ + let quote_filename_if_needed s = + if is_simple_filename s then s + (* We should probably be using [Filename.unix_quote] except that function + * isn't exported. Users on Windows will have to live with not being able to + * install OCaml into c:\o'caml. Too bad. *) +- else if Sys.os_type = "Win32" then Printf.sprintf "'%s'" s ++ else if Sys.os_type = "Win32" then unix_quote s + else Filename.quote s + let chdir dir = + reset_filesys_cache (); +@@ -37,7 +51,7 @@ + let run args target = + reset_readdir_cache (); + let cmd = String.concat " " (List.map quote_filename_if_needed args) in +- if !*My_unix.is_degraded || Sys.os_type = "Win32" then ++ if !*My_unix.is_degraded then + begin + Log.event cmd target Tags.empty; + let st = sys_command cmd in diff --git a/fp.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json b/fp.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json new file mode 100644 index 00000000..b24be7b5 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json @@ -0,0 +1,27 @@ +{ + "build": [ + [ + "bash", + "-c", + "#{os == 'windows' ? 'patch -p1 < ocamlbuild-0.14.0.patch' : 'true'}" + ], + [ + "make", + "-f", + "configure.make", + "all", + "OCAMLBUILD_PREFIX=#{self.install}", + "OCAMLBUILD_BINDIR=#{self.bin}", + "OCAMLBUILD_LIBDIR=#{self.lib}", + "OCAMLBUILD_MANDIR=#{self.man}", + "OCAMLBUILD_NATIVE=true", + "OCAMLBUILD_NATIVE_TOOLS=true" + ], + [ + "make", + "check-if-preinstalled", + "all", + "#{os == 'windows' ? 'install' : 'opam-install'}" + ] + ] +} diff --git a/fp.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/fp.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch new file mode 100644 index 00000000..3e3ee5a2 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch @@ -0,0 +1,471 @@ +--- ./Makefile ++++ ./Makefile +@@ -57,16 +57,16 @@ + cat findlib.conf.in | \ + $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ +- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ ++ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamlopt; then \ +- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ ++ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldep; then \ +- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ ++ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldoc; then \ +- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ ++ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + + .PHONY: install-doc +--- ./src/findlib/findlib_config.mlp ++++ ./src/findlib/findlib_config.mlp +@@ -24,3 +24,5 @@ + | "MacOS" -> "" (* don't know *) + | _ -> failwith "Unknown Sys.os_type" + ;; ++ ++let exec_suffix = "@EXEC_SUFFIX@";; +--- ./src/findlib/findlib.ml ++++ ./src/findlib/findlib.ml +@@ -28,15 +28,20 @@ + let conf_ldconf = ref "";; + let conf_ignore_dups_in = ref ([] : string list);; + +-let ocamlc_default = "ocamlc";; +-let ocamlopt_default = "ocamlopt";; +-let ocamlcp_default = "ocamlcp";; +-let ocamloptp_default = "ocamloptp";; +-let ocamlmklib_default = "ocamlmklib";; +-let ocamlmktop_default = "ocamlmktop";; +-let ocamldep_default = "ocamldep";; +-let ocamlbrowser_default = "ocamlbrowser";; +-let ocamldoc_default = "ocamldoc";; ++let add_exec str = ++ match Findlib_config.exec_suffix with ++ | "" -> str ++ | a -> str ^ a ;; ++let ocamlc_default = add_exec "ocamlc";; ++let ocamlopt_default = add_exec "ocamlopt";; ++let ocamlcp_default = add_exec "ocamlcp";; ++let ocamloptp_default = add_exec "ocamloptp";; ++let ocamlmklib_default = add_exec "ocamlmklib";; ++let ocamlmktop_default = add_exec "ocamlmktop";; ++let ocamldep_default = add_exec "ocamldep";; ++let ocamlbrowser_default = add_exec "ocamlbrowser";; ++let ocamldoc_default = add_exec "ocamldoc";; ++ + + + let init_manually +--- ./src/findlib/fl_package_base.ml ++++ ./src/findlib/fl_package_base.ml +@@ -133,7 +133,15 @@ + List.find (fun def -> def.def_var = "exists_if") p.package_defs in + let files = Fl_split.in_words def.def_value in + List.exists +- (fun file -> Sys.file_exists (Filename.concat d' file)) ++ (fun file -> ++ let fln = Filename.concat d' file in ++ let e = Sys.file_exists fln in ++ (* necessary for ppx executables *) ++ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then ++ e ++ else ++ Sys.file_exists (fln ^ ".exe") ++ ) + files + with Not_found -> true in + +--- ./src/findlib/fl_split.ml ++++ ./src/findlib/fl_split.ml +@@ -126,10 +126,17 @@ + | '/' | '\\' -> true + | _ -> false in + let norm_dir_win() = +- if l >= 1 && s.[0] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; +- if l >= 2 && s.[1] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; ++ if l >= 1 then ( ++ if s.[0] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[0] ; ++ if l >= 2 then ++ if s.[1] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[1]; ++ ); + for k = 2 to l - 1 do + let c = s.[k] in + if is_slash c then ( +--- ./src/findlib/frontend.ml ++++ ./src/findlib/frontend.ml +@@ -31,10 +31,18 @@ + else + Sys_error (arg ^ ": " ^ Unix.error_message code) + ++let is_win = Sys.os_type = "Win32" ++ ++let () = ++ match Findlib_config.system with ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> ++ (try set_binary_mode_out stdout true with _ -> ()); ++ (try set_binary_mode_out stderr true with _ -> ()); ++ | _ -> () + + let slashify s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> + let b = Buffer.create 80 in + String.iter + (function +@@ -49,7 +57,7 @@ + + let out_path ?(prefix="") s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> + let u = slashify s in + prefix ^ + (if String.contains u ' ' then +@@ -273,11 +281,9 @@ + + + let identify_dir d = +- match Sys.os_type with +- | "Win32" -> +- failwith "identify_dir" (* not available *) +- | _ -> +- let s = Unix.stat d in ++ if is_win then ++ failwith "identify_dir"; (* not available *) ++ let s = Unix.stat d in + (s.Unix.st_dev, s.Unix.st_ino) + ;; + +@@ -459,6 +465,96 @@ + ) + packages + ++let rewrite_cmd s = ++ if s = "" || not is_win then ++ s ++ else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_cmd s = ++ if s = "" || not is_win then s else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_pp cmd = ++ if not is_win then cmd else ++ let module T = struct exception Keep end in ++ let is_whitespace = function ++ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true ++ | _ -> false in ++ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) ++ let is_unsafe_char = function ++ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true ++ | _ -> false in ++ let len = String.length cmd in ++ let buf = Buffer.create (len + 4) in ++ let buf_cmd = Buffer.create len in ++ let rec iter_ws i = ++ if i >= len then () else ++ let cur = cmd.[i] in ++ if is_whitespace cur then ( ++ Buffer.add_char buf cur; ++ iter_ws (succ i) ++ ) ++ else ++ iter_cmd i ++ and iter_cmd i = ++ if i >= len then add_buf_cmd () else ++ let cur = cmd.[i] in ++ if is_unsafe_char cur || cur = '"' || cur = '\'' then ++ raise T.Keep; ++ if is_whitespace cur then ( ++ add_buf_cmd (); ++ Buffer.add_substring buf cmd i (len - i) ++ ) ++ else ( ++ Buffer.add_char buf_cmd cur; ++ iter_cmd (succ i) ++ ) ++ and add_buf_cmd () = ++ if Buffer.length buf_cmd > 0 then ++ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) ++ in ++ try ++ iter_ws 0; ++ Buffer.contents buf ++ with ++ | T.Keep -> cmd + + let process_pp_spec syntax_preds packages pp_opts = + (* Returns: pp_command *) +@@ -549,7 +645,7 @@ + None -> [] + | Some cmd -> + ["-pp"; +- cmd ^ " " ^ ++ (rewrite_cmd cmd) ^ " " ^ + String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ + String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ + String.concat " " (List.map Filename.quote pp_opts)] +@@ -625,9 +721,11 @@ + in + try + let preprocessor = ++ rewrite_cmd ( + resolve_path + ~base ~explicit:true +- (package_property predicates pname "ppx") in ++ (package_property predicates pname "ppx") ) ++ in + ["-ppx"; String.concat " " (preprocessor :: options)] + with Not_found -> [] + ) +@@ -895,6 +993,14 @@ + switch (e.g. -L instead of -L ) + *) + ++(* We may need to remove files on which we do not have complete control. ++ On Windows, removing a read-only file fails so try to change the ++ mode of the file first. *) ++let remove_file fname = ++ try Sys.remove fname ++ with Sys_error _ when is_win -> ++ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); ++ Sys.remove fname + + let ocamlc which () = + +@@ -1022,9 +1128,12 @@ + + "-intf", + Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); +- ++ + "-pp", +- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); ++ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); ++ ++ "-ppx", ++ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); + + "-thread", + Arg.Unit (fun _ -> threads := threads_default); +@@ -1237,7 +1346,7 @@ + with + any -> + close_out initl; +- Sys.remove initl_file_name; ++ remove_file initl_file_name; + raise any + end; + +@@ -1245,9 +1354,9 @@ + at_exit + (fun () -> + let tr f x = try f x with _ -> () in +- tr Sys.remove initl_file_name; +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); ++ tr remove_file initl_file_name; ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); + ); + + let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in +@@ -1493,7 +1602,9 @@ + [ "-v", Arg.Unit (fun () -> verbose := Verbose); + "-pp", Arg.String (fun s -> + pp_specified := true; +- options := !options @ ["-pp"; s]); ++ options := !options @ ["-pp"; rewrite_pp s]); ++ "-ppx", Arg.String (fun s -> ++ options := !options @ ["-ppx"; rewrite_pp s]); + ] + ) + ) +@@ -1672,7 +1783,9 @@ + Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); + + "-pp", Arg.String (fun s -> pp_specified := true; +- add_spec_fn "-pp" s); ++ add_spec_fn "-pp" (rewrite_pp s)); ++ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); ++ + ] + ) + ) +@@ -1830,7 +1943,10 @@ + output_string ch_out append; + close_out ch_out; + close_in ch_in; +- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; ++ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime ++ with Unix.Unix_error(e,_,_) -> ++ prerr_endline("Warning: setting utimes for " ^ outpath ++ ^ ": " ^ Unix.error_message e)); + + prerr_endline("Installed " ^ outpath); + with +@@ -1882,6 +1998,8 @@ + Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in + let f = + Unix.in_channel_of_descr fd in ++ if is_win then ++ set_binary_mode_in f false; + try + let line = input_line f in + let is_my_file = (line = pkg) in +@@ -2208,7 +2326,7 @@ + let lines = read_ldconf !ldconf in + let dlldir_norm = Fl_split.norm_dir dlldir in + let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in +- let ci_filesys = (Sys.os_type = "Win32") in ++ let ci_filesys = is_win in + let check_dir d = + let d' = Fl_split.norm_dir d in + (d' = dlldir_norm) || +@@ -2356,7 +2474,7 @@ + List.iter + (fun file -> + let absfile = Filename.concat dlldir file in +- Sys.remove absfile; ++ remove_file absfile; + prerr_endline ("Removed " ^ absfile) + ) + dll_files +@@ -2365,7 +2483,7 @@ + (* Remove the files from the package directory: *) + if Sys.file_exists pkgdir then begin + let files = Sys.readdir pkgdir in +- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; ++ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; + Unix.rmdir pkgdir; + prerr_endline ("Removed " ^ pkgdir) + end +@@ -2415,7 +2533,9 @@ + + + let print_configuration() = ++ let sl = slashify in + let dir s = ++ let s = sl s in + if Sys.file_exists s then + s + else +@@ -2453,27 +2573,27 @@ + if md = "" then "the corresponding package directories" else dir md + ); + Printf.printf "The standard library is assumed to reside in:\n %s\n" +- (Findlib.ocaml_stdlib()); ++ (sl (Findlib.ocaml_stdlib())); + Printf.printf "The ld.conf file can be found here:\n %s\n" +- (Findlib.ocaml_ldconf()); ++ (sl (Findlib.ocaml_ldconf())); + flush stdout + | Some "conf" -> +- print_endline (Findlib.config_file()) ++ print_endline (sl (Findlib.config_file())) + | Some "path" -> +- List.iter print_endline (Findlib.search_path()) ++ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) + | Some "destdir" -> +- print_endline (Findlib.default_location()) ++ print_endline ( sl (Findlib.default_location())) + | Some "metadir" -> +- print_endline (Findlib.meta_directory()) ++ print_endline ( sl (Findlib.meta_directory())) + | Some "metapath" -> + let mdir = Findlib.meta_directory() in + let ddir = Findlib.default_location() in +- print_endline +- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") ++ print_endline ( sl ++ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) + | Some "stdlib" -> +- print_endline (Findlib.ocaml_stdlib()) ++ print_endline ( sl (Findlib.ocaml_stdlib())) + | Some "ldconf" -> +- print_endline (Findlib.ocaml_ldconf()) ++ print_endline ( sl (Findlib.ocaml_ldconf())) + | _ -> + assert false + ;; +@@ -2481,7 +2601,7 @@ + + let ocamlcall pkg cmd = + let dir = package_directory pkg in +- let path = Filename.concat dir cmd in ++ let path = rewrite_cmd (Filename.concat dir cmd) in + begin + try Unix.access path [ Unix.X_OK ] + with +@@ -2647,6 +2767,10 @@ + | Sys_error f -> + prerr_endline ("ocamlfind: " ^ f); + exit 2 ++ | Unix.Unix_error (e, fn, f) -> ++ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f ++ ^ ": " ^ Unix.error_message e); ++ exit 2 + | Findlib.No_such_package(pkg,info) -> + prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ + (if info <> "" then " - " ^ info else "")); +--- ./src/findlib/Makefile ++++ ./src/findlib/Makefile +@@ -90,6 +90,7 @@ + cat findlib_config.mlp | \ + $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ + $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ ++ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ + sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ + -e 's;@SYSTEM@;$(SYSTEM);g' \ + >findlib_config.ml diff --git a/fp.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json b/fp.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json new file mode 100644 index 00000000..9314f870 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json @@ -0,0 +1,61 @@ +{ + "build": [ + [ + "bash", + "-c", + "#{os == 'windows' ? 'patch -p1 < findlib-1.8.1.patch' : 'true'}" + ], + [ + "./configure", + "-bindir", + "#{self.bin}", + "-sitelib", + "#{self.lib}", + "-mandir", + "#{self.man}", + "-config", + "#{self.lib}/findlib.conf", + "-no-custom", + "-no-topfind" + ], + [ + "make", + "all" + ], + [ + "make", + "opt" + ] + ], + "install": [ + [ + "make", + "install" + ], + [ + "install", + "-m", + "0755", + "ocaml-stub", + "#{self.bin}/ocaml" + ], + [ + "mkdir", + "-p", + "#{self.toplevel}" + ], + [ + "install", + "-m", + "0644", + "src/findlib/topfind", + "#{self.toplevel}/topfind" + ] + ], + "exportedEnv": { + "OCAML_TOPLEVEL_PATH": { + "val": "#{self.toplevel}", + "scope": "global" + } + } +} diff --git a/fp.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/fp.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch new file mode 100644 index 00000000..3e3ee5a2 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch @@ -0,0 +1,471 @@ +--- ./Makefile ++++ ./Makefile +@@ -57,16 +57,16 @@ + cat findlib.conf.in | \ + $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ +- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ ++ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamlopt; then \ +- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ ++ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldep; then \ +- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ ++ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldoc; then \ +- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ ++ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + + .PHONY: install-doc +--- ./src/findlib/findlib_config.mlp ++++ ./src/findlib/findlib_config.mlp +@@ -24,3 +24,5 @@ + | "MacOS" -> "" (* don't know *) + | _ -> failwith "Unknown Sys.os_type" + ;; ++ ++let exec_suffix = "@EXEC_SUFFIX@";; +--- ./src/findlib/findlib.ml ++++ ./src/findlib/findlib.ml +@@ -28,15 +28,20 @@ + let conf_ldconf = ref "";; + let conf_ignore_dups_in = ref ([] : string list);; + +-let ocamlc_default = "ocamlc";; +-let ocamlopt_default = "ocamlopt";; +-let ocamlcp_default = "ocamlcp";; +-let ocamloptp_default = "ocamloptp";; +-let ocamlmklib_default = "ocamlmklib";; +-let ocamlmktop_default = "ocamlmktop";; +-let ocamldep_default = "ocamldep";; +-let ocamlbrowser_default = "ocamlbrowser";; +-let ocamldoc_default = "ocamldoc";; ++let add_exec str = ++ match Findlib_config.exec_suffix with ++ | "" -> str ++ | a -> str ^ a ;; ++let ocamlc_default = add_exec "ocamlc";; ++let ocamlopt_default = add_exec "ocamlopt";; ++let ocamlcp_default = add_exec "ocamlcp";; ++let ocamloptp_default = add_exec "ocamloptp";; ++let ocamlmklib_default = add_exec "ocamlmklib";; ++let ocamlmktop_default = add_exec "ocamlmktop";; ++let ocamldep_default = add_exec "ocamldep";; ++let ocamlbrowser_default = add_exec "ocamlbrowser";; ++let ocamldoc_default = add_exec "ocamldoc";; ++ + + + let init_manually +--- ./src/findlib/fl_package_base.ml ++++ ./src/findlib/fl_package_base.ml +@@ -133,7 +133,15 @@ + List.find (fun def -> def.def_var = "exists_if") p.package_defs in + let files = Fl_split.in_words def.def_value in + List.exists +- (fun file -> Sys.file_exists (Filename.concat d' file)) ++ (fun file -> ++ let fln = Filename.concat d' file in ++ let e = Sys.file_exists fln in ++ (* necessary for ppx executables *) ++ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then ++ e ++ else ++ Sys.file_exists (fln ^ ".exe") ++ ) + files + with Not_found -> true in + +--- ./src/findlib/fl_split.ml ++++ ./src/findlib/fl_split.ml +@@ -126,10 +126,17 @@ + | '/' | '\\' -> true + | _ -> false in + let norm_dir_win() = +- if l >= 1 && s.[0] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; +- if l >= 2 && s.[1] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; ++ if l >= 1 then ( ++ if s.[0] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[0] ; ++ if l >= 2 then ++ if s.[1] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[1]; ++ ); + for k = 2 to l - 1 do + let c = s.[k] in + if is_slash c then ( +--- ./src/findlib/frontend.ml ++++ ./src/findlib/frontend.ml +@@ -31,10 +31,18 @@ + else + Sys_error (arg ^ ": " ^ Unix.error_message code) + ++let is_win = Sys.os_type = "Win32" ++ ++let () = ++ match Findlib_config.system with ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> ++ (try set_binary_mode_out stdout true with _ -> ()); ++ (try set_binary_mode_out stderr true with _ -> ()); ++ | _ -> () + + let slashify s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> + let b = Buffer.create 80 in + String.iter + (function +@@ -49,7 +57,7 @@ + + let out_path ?(prefix="") s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> + let u = slashify s in + prefix ^ + (if String.contains u ' ' then +@@ -273,11 +281,9 @@ + + + let identify_dir d = +- match Sys.os_type with +- | "Win32" -> +- failwith "identify_dir" (* not available *) +- | _ -> +- let s = Unix.stat d in ++ if is_win then ++ failwith "identify_dir"; (* not available *) ++ let s = Unix.stat d in + (s.Unix.st_dev, s.Unix.st_ino) + ;; + +@@ -459,6 +465,96 @@ + ) + packages + ++let rewrite_cmd s = ++ if s = "" || not is_win then ++ s ++ else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_cmd s = ++ if s = "" || not is_win then s else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_pp cmd = ++ if not is_win then cmd else ++ let module T = struct exception Keep end in ++ let is_whitespace = function ++ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true ++ | _ -> false in ++ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) ++ let is_unsafe_char = function ++ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true ++ | _ -> false in ++ let len = String.length cmd in ++ let buf = Buffer.create (len + 4) in ++ let buf_cmd = Buffer.create len in ++ let rec iter_ws i = ++ if i >= len then () else ++ let cur = cmd.[i] in ++ if is_whitespace cur then ( ++ Buffer.add_char buf cur; ++ iter_ws (succ i) ++ ) ++ else ++ iter_cmd i ++ and iter_cmd i = ++ if i >= len then add_buf_cmd () else ++ let cur = cmd.[i] in ++ if is_unsafe_char cur || cur = '"' || cur = '\'' then ++ raise T.Keep; ++ if is_whitespace cur then ( ++ add_buf_cmd (); ++ Buffer.add_substring buf cmd i (len - i) ++ ) ++ else ( ++ Buffer.add_char buf_cmd cur; ++ iter_cmd (succ i) ++ ) ++ and add_buf_cmd () = ++ if Buffer.length buf_cmd > 0 then ++ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) ++ in ++ try ++ iter_ws 0; ++ Buffer.contents buf ++ with ++ | T.Keep -> cmd + + let process_pp_spec syntax_preds packages pp_opts = + (* Returns: pp_command *) +@@ -549,7 +645,7 @@ + None -> [] + | Some cmd -> + ["-pp"; +- cmd ^ " " ^ ++ (rewrite_cmd cmd) ^ " " ^ + String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ + String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ + String.concat " " (List.map Filename.quote pp_opts)] +@@ -625,9 +721,11 @@ + in + try + let preprocessor = ++ rewrite_cmd ( + resolve_path + ~base ~explicit:true +- (package_property predicates pname "ppx") in ++ (package_property predicates pname "ppx") ) ++ in + ["-ppx"; String.concat " " (preprocessor :: options)] + with Not_found -> [] + ) +@@ -895,6 +993,14 @@ + switch (e.g. -L instead of -L ) + *) + ++(* We may need to remove files on which we do not have complete control. ++ On Windows, removing a read-only file fails so try to change the ++ mode of the file first. *) ++let remove_file fname = ++ try Sys.remove fname ++ with Sys_error _ when is_win -> ++ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); ++ Sys.remove fname + + let ocamlc which () = + +@@ -1022,9 +1128,12 @@ + + "-intf", + Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); +- ++ + "-pp", +- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); ++ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); ++ ++ "-ppx", ++ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); + + "-thread", + Arg.Unit (fun _ -> threads := threads_default); +@@ -1237,7 +1346,7 @@ + with + any -> + close_out initl; +- Sys.remove initl_file_name; ++ remove_file initl_file_name; + raise any + end; + +@@ -1245,9 +1354,9 @@ + at_exit + (fun () -> + let tr f x = try f x with _ -> () in +- tr Sys.remove initl_file_name; +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); ++ tr remove_file initl_file_name; ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); + ); + + let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in +@@ -1493,7 +1602,9 @@ + [ "-v", Arg.Unit (fun () -> verbose := Verbose); + "-pp", Arg.String (fun s -> + pp_specified := true; +- options := !options @ ["-pp"; s]); ++ options := !options @ ["-pp"; rewrite_pp s]); ++ "-ppx", Arg.String (fun s -> ++ options := !options @ ["-ppx"; rewrite_pp s]); + ] + ) + ) +@@ -1672,7 +1783,9 @@ + Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); + + "-pp", Arg.String (fun s -> pp_specified := true; +- add_spec_fn "-pp" s); ++ add_spec_fn "-pp" (rewrite_pp s)); ++ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); ++ + ] + ) + ) +@@ -1830,7 +1943,10 @@ + output_string ch_out append; + close_out ch_out; + close_in ch_in; +- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; ++ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime ++ with Unix.Unix_error(e,_,_) -> ++ prerr_endline("Warning: setting utimes for " ^ outpath ++ ^ ": " ^ Unix.error_message e)); + + prerr_endline("Installed " ^ outpath); + with +@@ -1882,6 +1998,8 @@ + Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in + let f = + Unix.in_channel_of_descr fd in ++ if is_win then ++ set_binary_mode_in f false; + try + let line = input_line f in + let is_my_file = (line = pkg) in +@@ -2208,7 +2326,7 @@ + let lines = read_ldconf !ldconf in + let dlldir_norm = Fl_split.norm_dir dlldir in + let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in +- let ci_filesys = (Sys.os_type = "Win32") in ++ let ci_filesys = is_win in + let check_dir d = + let d' = Fl_split.norm_dir d in + (d' = dlldir_norm) || +@@ -2356,7 +2474,7 @@ + List.iter + (fun file -> + let absfile = Filename.concat dlldir file in +- Sys.remove absfile; ++ remove_file absfile; + prerr_endline ("Removed " ^ absfile) + ) + dll_files +@@ -2365,7 +2483,7 @@ + (* Remove the files from the package directory: *) + if Sys.file_exists pkgdir then begin + let files = Sys.readdir pkgdir in +- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; ++ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; + Unix.rmdir pkgdir; + prerr_endline ("Removed " ^ pkgdir) + end +@@ -2415,7 +2533,9 @@ + + + let print_configuration() = ++ let sl = slashify in + let dir s = ++ let s = sl s in + if Sys.file_exists s then + s + else +@@ -2453,27 +2573,27 @@ + if md = "" then "the corresponding package directories" else dir md + ); + Printf.printf "The standard library is assumed to reside in:\n %s\n" +- (Findlib.ocaml_stdlib()); ++ (sl (Findlib.ocaml_stdlib())); + Printf.printf "The ld.conf file can be found here:\n %s\n" +- (Findlib.ocaml_ldconf()); ++ (sl (Findlib.ocaml_ldconf())); + flush stdout + | Some "conf" -> +- print_endline (Findlib.config_file()) ++ print_endline (sl (Findlib.config_file())) + | Some "path" -> +- List.iter print_endline (Findlib.search_path()) ++ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) + | Some "destdir" -> +- print_endline (Findlib.default_location()) ++ print_endline ( sl (Findlib.default_location())) + | Some "metadir" -> +- print_endline (Findlib.meta_directory()) ++ print_endline ( sl (Findlib.meta_directory())) + | Some "metapath" -> + let mdir = Findlib.meta_directory() in + let ddir = Findlib.default_location() in +- print_endline +- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") ++ print_endline ( sl ++ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) + | Some "stdlib" -> +- print_endline (Findlib.ocaml_stdlib()) ++ print_endline ( sl (Findlib.ocaml_stdlib())) + | Some "ldconf" -> +- print_endline (Findlib.ocaml_ldconf()) ++ print_endline ( sl (Findlib.ocaml_ldconf())) + | _ -> + assert false + ;; +@@ -2481,7 +2601,7 @@ + + let ocamlcall pkg cmd = + let dir = package_directory pkg in +- let path = Filename.concat dir cmd in ++ let path = rewrite_cmd (Filename.concat dir cmd) in + begin + try Unix.access path [ Unix.X_OK ] + with +@@ -2647,6 +2767,10 @@ + | Sys_error f -> + prerr_endline ("ocamlfind: " ^ f); + exit 2 ++ | Unix.Unix_error (e, fn, f) -> ++ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f ++ ^ ": " ^ Unix.error_message e); ++ exit 2 + | Findlib.No_such_package(pkg,info) -> + prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ + (if info <> "" then " - " ^ info else "")); +--- ./src/findlib/Makefile ++++ ./src/findlib/Makefile +@@ -90,6 +90,7 @@ + cat findlib_config.mlp | \ + $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ + $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ ++ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ + sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ + -e 's;@SYSTEM@;$(SYSTEM);g' \ + >findlib_config.ml diff --git a/fp.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/fp.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh new file mode 100644 index 00000000..c923ef49 --- /dev/null +++ b/fp.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh @@ -0,0 +1,14 @@ +OCAML_SECONDARY_COMPILER=$1 + +cat >ocaml-secondary-compiler.conf <META <= 4.2.0 < 4.11.0", + "@opam/dune": "< 2.8.0", + "@esy-ocaml/reason": "< 4.0.0" }, "devDependencies": { "@opam/merlin": "*", diff --git a/fs.esy.lock/.gitattributes b/fs.esy.lock/.gitattributes new file mode 100644 index 00000000..e0b4e26c --- /dev/null +++ b/fs.esy.lock/.gitattributes @@ -0,0 +1,3 @@ + +# Set eol to LF so files aren't converted to CRLF-eol on Windows. +* text eol=lf linguist-generated diff --git a/fs.esy.lock/.gitignore b/fs.esy.lock/.gitignore new file mode 100644 index 00000000..a221be22 --- /dev/null +++ b/fs.esy.lock/.gitignore @@ -0,0 +1,3 @@ + +# Reset any possible .gitignore, we want all esy.lock to be un-ignored. +!* diff --git a/fs.esy.lock/index.json b/fs.esy.lock/index.json new file mode 100644 index 00000000..de389590 --- /dev/null +++ b/fs.esy.lock/index.json @@ -0,0 +1,968 @@ +{ + "checksum": "520532cbebe163511fbf9d93ee9760ce", + "root": "@reason-native/fs@link-dev:./fs.json", + "node": { + "ocaml@4.6.1003@d41d8cd9": { + "id": "ocaml@4.6.1003@d41d8cd9", + "name": "ocaml", + "version": "4.6.1003", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.6.1003.tgz#sha1:6a391e80b4d1859bdb1943fd3ef6221c7f0a9a49" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9": { + "id": + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9", + "name": "esy-m4", + "version": + "github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7", + "source": { + "type": "install", + "source": [ + "github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, + "@reason-native/rely@3.2.1@d41d8cd9": { + "id": "@reason-native/rely@3.2.1@d41d8cd9", + "name": "@reason-native/rely", + "version": "3.2.1", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/rely/-/rely-3.2.1.tgz#sha1:7945ac6a51773a97b8f8cfd97d2855ac7ac4ecb2" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@reason-native/file-context-printer@0.0.3@d41d8cd9", + "@reason-native/cli@0.0.1-alpha@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.2@0b7bd730", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@reason-native/pastel@0.3.0@d41d8cd9": { + "id": "@reason-native/pastel@0.3.0@d41d8cd9", + "name": "@reason-native/pastel", + "version": "0.3.0", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.3.0.tgz#sha1:07da3c5a0933e61bc3b353bc85aa71ac7c0f311c" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@reason-native/fs@link-dev:./fs.json": { + "id": "@reason-native/fs@link-dev:./fs.json", + "name": "@reason-native/fs", + "version": "link-dev:./fs.json", + "source": { "type": "link-dev", "path": ".", "manifest": "fs.json" }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/fp@0.0.1@d41d8cd9", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/rely@3.2.1@d41d8cd9", + "@opam/merlin@opam:3.4.2@9a4d1fd4" + ] + }, + "@reason-native/fp@0.0.1@d41d8cd9": { + "id": "@reason-native/fp@0.0.1@d41d8cd9", + "name": "@reason-native/fp", + "version": "0.0.1", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/fp/-/fp-0.0.1.tgz#sha1:265a16f26e928489d7e96b26a933fce0aed5f384" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@reason-native/file-context-printer@0.0.3@d41d8cd9": { + "id": "@reason-native/file-context-printer@0.0.3@d41d8cd9", + "name": "@reason-native/file-context-printer", + "version": "0.0.3", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/file-context-printer/-/file-context-printer-0.0.3.tgz#sha1:b92eec7b10107ccb27528f9eea9bb51252bca491" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@reason-native/cli@0.0.1-alpha@d41d8cd9": { + "id": "@reason-native/cli@0.0.1-alpha@d41d8cd9", + "name": "@reason-native/cli", + "version": "0.0.1-alpha", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@reason-native/cli/-/cli-0.0.1-alpha.tgz#sha1:0b911053fa7cc661eac10ead50d6ea6cc1fcd94d" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/reason@3.6.2@d41d8cd9" + ], + "devDependencies": [] + }, + "@opam/yojson@opam:1.7.0@7056d985": { + "id": "@opam/yojson@opam:1.7.0@7056d985", + "name": "@opam/yojson", + "version": "opam:1.7.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/b8/b89d39ca3f8c532abe5f547ad3b8f84d#md5:b89d39ca3f8c532abe5f547ad3b8f84d", + "archive:https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz#md5:b89d39ca3f8c532abe5f547ad3b8f84d" + ], + "opam": { + "name": "yojson", + "version": "1.7.0", + "path": "fs.esy.lock/opam/yojson.1.7.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/biniou@opam:1.2.1@d7570399", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399" + ] + }, + "@opam/uutf@opam:1.0.2@4440868f": { + "id": "@opam/uutf@opam:1.0.2@4440868f", + "name": "@opam/uutf", + "version": "opam:1.0.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/a7/a7c542405a39630c689a82bd7ef2292c#md5:a7c542405a39630c689a82bd7ef2292c", + "archive:http://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz#md5:a7c542405a39630c689a82bd7ef2292c" + ], + "opam": { + "name": "uutf", + "version": "1.0.2", + "path": "fs.esy.lock/opam/uutf.1.0.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "@opam/topkg@opam:1.0.3@e4e10f1c", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + ] + }, + "@opam/uchar@opam:0.0.2@c8218eea": { + "id": "@opam/uchar@opam:0.0.2@c8218eea", + "name": "@opam/uchar", + "version": "opam:0.0.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/c9/c9ba2c738d264c420c642f7bb1cf4a36#md5:c9ba2c738d264c420c642f7bb1cf4a36", + "archive:https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz#md5:c9ba2c738d264c420c642f7bb1cf4a36" + ], + "opam": { + "name": "uchar", + "version": "0.0.2", + "path": "fs.esy.lock/opam/uchar.0.0.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] + }, + "@opam/tyxml@opam:4.4.0@1dca5713": { + "id": "@opam/tyxml@opam:4.4.0@1dca5713", + "name": "@opam/tyxml", + "version": "opam:4.4.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/51/516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530#sha256:516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530", + "archive:https://github.com/ocsigen/tyxml/releases/download/4.4.0/tyxml-4.4.0.tbz#sha256:516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530" + ], + "opam": { + "name": "tyxml", + "version": "4.4.0", + "path": "fs.esy.lock/opam/tyxml.4.4.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/topkg@opam:1.0.3@e4e10f1c": { + "id": "@opam/topkg@opam:1.0.3@e4e10f1c", + "name": "@opam/topkg", + "version": "opam:1.0.3", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/e2/e285f7a296d77ee7d831ba9a6bfb396f#md5:e285f7a296d77ee7d831ba9a6bfb396f", + "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz#md5:e285f7a296d77ee7d831ba9a6bfb396f" + ], + "opam": { + "name": "topkg", + "version": "1.0.3", + "path": "fs.esy.lock/opam/topkg.1.0.3" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + ] + }, + "@opam/seq@opam:0.2.2@e9144e45": { + "id": "@opam/seq@opam:0.2.2@e9144e45", + "name": "@opam/seq", + "version": "opam:0.2.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/90/9033e02283aa3bde9f97f24e632902e3#md5:9033e02283aa3bde9f97f24e632902e3", + "archive:https://github.com/c-cube/seq/archive/0.2.2.tar.gz#md5:9033e02283aa3bde9f97f24e632902e3" + ], + "opam": { + "name": "seq", + "version": "0.2.2", + "path": "fs.esy.lock/opam/seq.0.2.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/result@opam:1.5@6b753c82": { + "id": "@opam/result@opam:1.5@6b753c82", + "name": "@opam/result", + "version": "opam:1.5", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/1b/1b82dec78849680b49ae9a8a365b831b#md5:1b82dec78849680b49ae9a8a365b831b", + "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#md5:1b82dec78849680b49ae9a8a365b831b" + ], + "opam": { + "name": "result", + "version": "1.5", + "path": "fs.esy.lock/opam/result.1.5" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/re@opam:1.9.0@d4d5e13d": { + "id": "@opam/re@opam:1.9.0@d4d5e13d", + "name": "@opam/re", + "version": "opam:1.9.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/bd/bddaed4f386a22cace7850c9c7dac296#md5:bddaed4f386a22cace7850c9c7dac296", + "archive:https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz#md5:bddaed4f386a22cace7850c9c7dac296" + ], + "opam": { + "name": "re", + "version": "1.9.0", + "path": "fs.esy.lock/opam/re.1.9.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/ptime@opam:0.8.5@0051d642": { + "id": "@opam/ptime@opam:0.8.5@0051d642", + "name": "@opam/ptime", + "version": "opam:0.8.5", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/4d/4d48055d623ecf2db792439b3e96a520#md5:4d48055d623ecf2db792439b3e96a520", + "archive:https://erratique.ch/software/ptime/releases/ptime-0.8.5.tbz#md5:4d48055d623ecf2db792439b3e96a520" + ], + "opam": { + "name": "ptime", + "version": "0.8.5", + "path": "fs.esy.lock/opam/ptime.0.8.5" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82" + ] + }, + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { + "id": "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "name": "@opam/ppx_derivers", + "version": "opam:1.2.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/5d/5dc2bf130c1db3c731fe0fffc5648b41#md5:5dc2bf130c1db3c731fe0fffc5648b41", + "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#md5:5dc2bf130c1db3c731fe0fffc5648b41" + ], + "opam": { + "name": "ppx_derivers", + "version": "1.2.1", + "path": "fs.esy.lock/opam/ppx_derivers.1.2.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2": { + "id": "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "name": "@opam/ocamlfind-secondary", + "version": "opam:1.8.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/18/18ca650982c15536616dea0e422cbd8c#md5:18ca650982c15536616dea0e422cbd8c", + "archive:http://download2.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c", + "archive:http://download.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c" + ], + "opam": { + "name": "ocamlfind-secondary", + "version": "1.8.1", + "path": "fs.esy.lock/opam/ocamlfind-secondary.1.8.1" + } + }, + "overrides": [ + { + "opamoverride": + "fs.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override" + } + ], + "dependencies": [ + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f" + ] + }, + "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { + "id": "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "name": "@opam/ocamlfind", + "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", + "version": "1.8.1", + "path": "fs.esy.lock/opam/ocamlfind.1.8.1" + } + }, + "overrides": [ + { + "opamoverride": + "fs.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override" + } + ], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/conf-m4@opam:1@196bf219", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] + }, + "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { + "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "name": "@opam/ocamlbuild", + "version": "opam:0.14.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/87/87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78#sha256:87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78", + "archive:https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz#sha256:87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78" + ], + "opam": { + "name": "ocamlbuild", + "version": "0.14.0", + "path": "fs.esy.lock/opam/ocamlbuild.0.14.0" + } + }, + "overrides": [ + { + "opamoverride": + "fs.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override" + } + ], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.6.1003@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": "fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1" + } + }, + "overrides": [ + { + "opamoverride": + "fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override" + } + ], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] + }, + "@opam/merlin-extend@opam:0.6@404f814c": { + "id": "@opam/merlin-extend@opam:0.6@404f814c", + "name": "@opam/merlin-extend", + "version": "opam:0.6", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/c2/c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43", + "archive:https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" + ], + "opam": { + "name": "merlin-extend", + "version": "0.6", + "path": "fs.esy.lock/opam/merlin-extend.0.6" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/merlin@opam:3.4.2@9a4d1fd4": { + "id": "@opam/merlin@opam:3.4.2@9a4d1fd4", + "name": "@opam/merlin", + "version": "opam:3.4.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", + "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + ], + "opam": { + "name": "merlin", + "version": "3.4.2", + "path": "fs.esy.lock/opam/merlin.3.4.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dot-merlin-reader@opam:3.4.2@55baebb0", + "@opam/csexp@opam:1.3.2@5cea14af" + ] + }, + "@opam/menhirSdk@opam:20201122@552e084f": { + "id": "@opam/menhirSdk@opam:20201122@552e084f", + "name": "@opam/menhirSdk", + "version": "opam:20201122", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" + ], + "opam": { + "name": "menhirSdk", + "version": "20201122", + "path": "fs.esy.lock/opam/menhirSdk.20201122" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/menhirLib@opam:20201122@a11a6018": { + "id": "@opam/menhirLib@opam:20201122@a11a6018", + "name": "@opam/menhirLib", + "version": "opam:20201122", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" + ], + "opam": { + "name": "menhirLib", + "version": "20201122", + "path": "fs.esy.lock/opam/menhirLib.20201122" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/menhir@opam:20201122@35e9e3ea": { + "id": "@opam/menhir@opam:20201122@35e9e3ea", + "name": "@opam/menhir", + "version": "opam:20201122", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/9a/9ad6a5f88aab6ec677b970e0d9de1763#md5:9ad6a5f88aab6ec677b970e0d9de1763", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz#md5:9ad6a5f88aab6ec677b970e0d9de1763" + ], + "opam": { + "name": "menhir", + "version": "20201122", + "path": "fs.esy.lock/opam/menhir.20201122" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/menhirSdk@opam:20201122@552e084f", + "@opam/menhirLib@opam:20201122@a11a6018", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/menhirSdk@opam:20201122@552e084f", + "@opam/menhirLib@opam:20201122@a11a6018", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/junit@opam:2.0.2@0b7bd730": { + "id": "@opam/junit@opam:2.0.2@0b7bd730", + "name": "@opam/junit", + "version": "opam:2.0.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/fd/fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01#sha256:fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01", + "archive:https://github.com/Khady/ocaml-junit/releases/download/2.0.2/junit-2.0.2.tbz#sha256:fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01" + ], + "opam": { + "name": "junit", + "version": "2.0.2", + "path": "fs.esy.lock/opam/junit.2.0.2" + } + }, + "overrides": [], + "dependencies": [ + "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/fix@opam:20201120@5c318621": { + "id": "@opam/fix@opam:20201120@5c318621", + "name": "@opam/fix", + "version": "opam:20201120", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3", + "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3" + ], + "opam": { + "name": "fix", + "version": "20201120", + "path": "fs.esy.lock/opam/fix.20201120" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/easy-format@opam:1.3.2@0484b3c4": { + "id": "@opam/easy-format@opam:1.3.2@0484b3c4", + "name": "@opam/easy-format", + "version": "opam:1.3.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/34/3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926", + "archive:https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926" + ], + "opam": { + "name": "easy-format", + "version": "1.3.2", + "path": "fs.esy.lock/opam/easy-format.1.3.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/dune@opam:2.7.1@f5f493bc": { + "id": "@opam/dune@opam:2.7.1@f5f493bc", + "name": "@opam/dune", + "version": "opam:2.7.1", + "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" + ], + "opam": { + "name": "dune", + "version": "2.7.1", + "path": "fs.esy.lock/opam/dune.2.7.1" + } + }, + "overrides": [ + { + "opamoverride": + "fs.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override" + } + ], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "@opam/base-unix@opam:base@87d0b2eb", + "@opam/base-threads@opam:base@36803084", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", + "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", + "@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", + "name": "@opam/dot-merlin-reader", + "version": "opam:3.4.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/e1/e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81", + "archive:https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz#sha256:e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + ], + "opam": { + "name": "dot-merlin-reader", + "version": "3.4.2", + "path": "fs.esy.lock/opam/dot-merlin-reader.3.4.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/dune@opam:2.7.1@f5f493bc", "@opam/csexp@opam:1.3.2@5cea14af" + ] + }, + "@opam/csexp@opam:1.3.2@5cea14af": { + "id": "@opam/csexp@opam:1.3.2@5cea14af", + "name": "@opam/csexp", + "version": "opam:1.3.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + ], + "opam": { + "name": "csexp", + "version": "1.3.2", + "path": "fs.esy.lock/opam/csexp.1.3.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/cppo@opam:1.6.6@f4f83858": { + "id": "@opam/cppo@opam:1.6.6@f4f83858", + "name": "@opam/cppo", + "version": "opam:1.6.6", + "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" + ], + "opam": { + "name": "cppo", + "version": "1.6.6", + "path": "fs.esy.lock/opam/cppo.1.6.6" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/base-unix@opam:base@87d0b2eb", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/base-unix@opam:base@87d0b2eb" + ] + }, + "@opam/conf-m4@opam:1@196bf219": { + "id": "@opam/conf-m4@opam:1@196bf219", + "name": "@opam/conf-m4", + "version": "opam:1", + "source": { + "type": "install", + "source": [ "no-source:" ], + "opam": { + "name": "conf-m4", + "version": "1", + "path": "fs.esy.lock/opam/conf-m4.1" + } + }, + "overrides": [ + { + "opamoverride": + "fs.esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override" + } + ], + "dependencies": [ + "esy-m4@github:esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [] + }, + "@opam/biniou@opam:1.2.1@d7570399": { + "id": "@opam/biniou@opam:1.2.1@d7570399", + "name": "@opam/biniou", + "version": "opam:1.2.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/35/35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335", + "archive:https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335" + ], + "opam": { + "name": "biniou", + "version": "1.2.1", + "path": "fs.esy.lock/opam/biniou.1.2.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.7.1@f5f493bc" + ] + }, + "@opam/base-unix@opam:base@87d0b2eb": { + "id": "@opam/base-unix@opam:base@87d0b2eb", + "name": "@opam/base-unix", + "version": "opam:base", + "source": { + "type": "install", + "source": [ "no-source:" ], + "opam": { + "name": "base-unix", + "version": "base", + "path": "fs.esy.lock/opam/base-unix.base" + } + }, + "overrides": [], + "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "devDependencies": [] + }, + "@opam/base-threads@opam:base@36803084": { + "id": "@opam/base-threads@opam:base@36803084", + "name": "@opam/base-threads", + "version": "opam:base", + "source": { + "type": "install", + "source": [ "no-source:" ], + "opam": { + "name": "base-threads", + "version": "base", + "path": "fs.esy.lock/opam/base-threads.base" + } + }, + "overrides": [], + "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "devDependencies": [] + }, + "@esy-ocaml/substs@0.0.1@d41d8cd9": { + "id": "@esy-ocaml/substs@0.0.1@d41d8cd9", + "name": "@esy-ocaml/substs", + "version": "0.0.1", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@esy-ocaml/substs/-/substs-0.0.1.tgz#sha1:59ebdbbaedcda123fc7ed8fb2b302b7d819e9a46" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, + "@esy-ocaml/reason@3.6.2@d41d8cd9": { + "id": "@esy-ocaml/reason@3.6.2@d41d8cd9", + "name": "@esy-ocaml/reason", + "version": "3.6.2", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#sha1:49bd53c75dd241eb14f46277a85af353908f7e81" + ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/merlin-extend@opam:0.6@404f814c", + "@opam/menhir@opam:20201122@35e9e3ea", + "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.7.1@f5f493bc" + ], + "devDependencies": [] + } + } +} \ No newline at end of file diff --git a/fs.esy.lock/opam/base-threads.base/opam b/fs.esy.lock/opam/base-threads.base/opam new file mode 100644 index 00000000..914ff50c --- /dev/null +++ b/fs.esy.lock/opam/base-threads.base/opam @@ -0,0 +1,6 @@ +opam-version: "2.0" +maintainer: "https://github.com/ocaml/opam-repository/issues" +description: """ +Threads library distributed with the OCaml compiler +""" + diff --git a/fs.esy.lock/opam/base-unix.base/opam b/fs.esy.lock/opam/base-unix.base/opam new file mode 100644 index 00000000..b973540b --- /dev/null +++ b/fs.esy.lock/opam/base-unix.base/opam @@ -0,0 +1,6 @@ +opam-version: "2.0" +maintainer: "https://github.com/ocaml/opam-repository/issues" +description: """ +Unix library distributed with the OCaml compiler +""" + diff --git a/fs.esy.lock/opam/biniou.1.2.1/opam b/fs.esy.lock/opam/biniou.1.2.1/opam new file mode 100644 index 00000000..b706b425 --- /dev/null +++ b/fs.esy.lock/opam/biniou.1.2.1/opam @@ -0,0 +1,45 @@ +opam-version: "2.0" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "@doc"] {with-doc} +] +maintainer: ["martin@mjambon.com"] +authors: ["Martin Jambon"] +bug-reports: "https://github.com/mjambon/biniou/issues" +homepage: "https://github.com/mjambon/biniou" +doc: "https://mjambon.github.io/biniou/" +license: "BSD-3-Clause" +dev-repo: "git+https://github.com/mjambon/biniou.git" +synopsis: + "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve" +description: """ + +Biniou (pronounced "be new") is a binary data format designed for speed, safety, +ease of use and backward compatibility as protocols evolve. Biniou is vastly +equivalent to JSON in terms of functionality but allows implementations several +times faster (4 times faster than yojson), with 25-35% space savings. + +Biniou data can be decoded into human-readable form without knowledge of type +definitions except for field and variant names which are represented by 31-bit +hashes. A program named bdump is provided for routine visualization of biniou +data files. + +The program atdgen is used to derive OCaml-Biniou serializers and deserializers +from type definitions. + +Biniou format specification: mjambon.github.io/atdgen-doc/biniou-format.txt""" +depends: [ + "easy-format" + "dune" {>= "1.10"} + "ocaml" {>= "4.02.3"} +] +url { + src: + "https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz" + checksum: [ + "sha256=35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335" + "sha512=82670cc77bf3e869ee26e5fbe5a5affa45a22bc8b6c4bd7e85473912780e0111baca59b34a2c14feae3543ce6e239d7fddaeab24b686a65bfe642cdb91d27ebf" + ] +} diff --git a/fs.esy.lock/opam/conf-m4.1/opam b/fs.esy.lock/opam/conf-m4.1/opam new file mode 100644 index 00000000..c6feb2a7 --- /dev/null +++ b/fs.esy.lock/opam/conf-m4.1/opam @@ -0,0 +1,22 @@ +opam-version: "2.0" +maintainer: "tim@gfxmonk.net" +homepage: "http://www.gnu.org/software/m4/m4.html" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +authors: "GNU Project" +license: "GPL-3.0-only" +build: [["sh" "-exc" "echo | m4"]] +depexts: [ + ["m4"] {os-family = "debian"} + ["m4"] {os-distribution = "fedora"} + ["m4"] {os-distribution = "rhel"} + ["m4"] {os-distribution = "centos"} + ["m4"] {os-distribution = "alpine"} + ["m4"] {os-distribution = "nixos"} + ["m4"] {os-family = "suse"} + ["m4"] {os-distribution = "ol"} + ["m4"] {os-distribution = "arch"} +] +synopsis: "Virtual package relying on m4" +description: + "This package can only install if the m4 binary is installed on the system." +flags: conf diff --git a/fs.esy.lock/opam/cppo.1.6.6/opam b/fs.esy.lock/opam/cppo.1.6.6/opam new file mode 100644 index 00000000..f683f8b4 --- /dev/null +++ b/fs.esy.lock/opam/cppo.1.6.6/opam @@ -0,0 +1,37 @@ +opam-version: "2.0" +maintainer: "martin@mjambon.com" +authors: "Martin Jambon" +license: "BSD-3-Clause" +homepage: "http://mjambon.com/cppo.html" +doc: "https://ocaml-community.github.io/cppo/" +bug-reports: "https://github.com/ocaml-community/cppo/issues" +depends: [ + "ocaml" {>= "4.03"} + "dune" {>= "1.0"} + "base-unix" +] +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +dev-repo: "git+https://github.com/ocaml-community/cppo.git" +synopsis: "Code preprocessor like cpp for OCaml" +description: """ +Cppo is an equivalent of the C preprocessor for OCaml programs. +It allows the definition of simple macros and file inclusion. + +Cppo is: + +* more OCaml-friendly than cpp +* easy to learn without consulting a manual +* reasonably fast +* simple to install and to maintain +""" +url { + src: "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz" + checksum: [ + "sha256=e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0" + "sha512=44ecf9d225d9e45490a2feac0bde04865ca398dba6c3579e3370fcd1ea255707b8883590852af8b2df87123801062b9f3acce2455c092deabf431f9c4fb8d8eb" + ] +} diff --git a/fs.esy.lock/opam/csexp.1.3.2/opam b/fs.esy.lock/opam/csexp.1.3.2/opam new file mode 100644 index 00000000..1508d17a --- /dev/null +++ b/fs.esy.lock/opam/csexp.1.3.2/opam @@ -0,0 +1,58 @@ +opam-version: "2.0" +synopsis: "Parsing and printing of S-expressions in Canonical form" +description: """ + +This library provides minimal support for Canonical S-expressions +[1]. Canonical S-expressions are a binary encoding of S-expressions +that is super simple and well suited for communication between +programs. + +This library only provides a few helpers for simple applications. If +you need more advanced support, such as parsing from more fancy input +sources, you should consider copying the code of this library given +how simple parsing S-expressions in canonical form is. + +To avoid a dependency on a particular S-expression library, the only +module of this library is parameterised by the type of S-expressions. + +[1] https://en.wikipedia.org/wiki/Canonical_S-expressions +""" +maintainer: ["Jeremie Dimino "] +authors: [ + "Quentin Hocquet " + "Jane Street Group, LLC " + "Jeremie Dimino " +] +license: "MIT" +homepage: "https://github.com/ocaml-dune/csexp" +doc: "https://ocaml-dune.github.io/csexp/" +bug-reports: "https://github.com/ocaml-dune/csexp/issues" +depends: [ + "dune" {>= "1.11"} + "ocaml" {>= "4.02.3"} + "result" {>= "1.5"} +] +dev-repo: "git+https://github.com/ocaml-dune/csexp.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" +# "@runtest" {with-test & ocaml:version >= "4.04"} + "@doc" {with-doc} + ] +] +x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b" +url { + src: + "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz" + checksum: [ + "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a" + "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026" + ] +} diff --git a/fs.esy.lock/opam/dot-merlin-reader.3.4.2/opam b/fs.esy.lock/opam/dot-merlin-reader.3.4.2/opam new file mode 100644 index 00000000..e740ed7d --- /dev/null +++ b/fs.esy.lock/opam/dot-merlin-reader.3.4.2/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +synopsis: "Reads config files for merlin" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.1" & < "4.12"} + "dune" {>= "1.8.0"} + "yojson" {>= "1.6.0"} + "ocamlfind" {>= "1.6.0"} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} +] +x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" +url { + src: + "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" + checksum: [ + "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" + ] +} diff --git a/fs.esy.lock/opam/dune.2.7.1/opam b/fs.esy.lock/opam/dune.2.7.1/opam new file mode 100644 index 00000000..aaa13e67 --- /dev/null +++ b/fs.esy.lock/opam/dune.2.7.1/opam @@ -0,0 +1,56 @@ +opam-version: "2.0" +synopsis: "Fast, portable, and opinionated build system" +description: """ + +dune is a build system that was designed to simplify the release of +Jane Street packages. It reads metadata from "dune" files following a +very simple s-expression syntax. + +dune is fast, has very low-overhead, and supports parallel builds on +all platforms. It has no system dependencies; all you need to build +dune or packages using dune is OCaml. You don't need make or bash +as long as the packages themselves don't use bash explicitly. + +dune supports multi-package development by simply dropping multiple +repositories into the same directory. + +It also supports multi-context builds, such as building against +several opam roots/switches simultaneously. This helps maintaining +packages across several versions of OCaml and gives cross-compilation +for free. +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +conflicts: [ + "dune-configurator" {< "2.3.0"} + "odoc" {< "1.3.0"} + "dune-release" {< "1.3.0"} + "js_of_ocaml-compiler" {< "3.6.0"} + "jbuilder" {= "transition"} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path + ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} + ["ocaml" "bootstrap.ml" "-j" jobs] + ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] +] +depends: [ + # Please keep the lower bound in sync with .github/workflows/workflow.yml, + # dune-project and min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) + "base-unix" + "base-threads" +] +x-commit-hash: "5472766b2448308a7160dfd0fca1ec711e124a5c" +url { + src: "https://github.com/ocaml/dune/releases/download/2.7.1/dune-2.7.1.tbz" + checksum: [ + "sha256=c3528f2f8b3a2e3fe18e166fc823e6caeee8b7c78ade6b6fe4d2fa978070925d" + "sha512=2b4b311824471dac8196181d7c7267f96b1b73f35341b72019f169cf6d42a19254e90bdfba2d3ecb138ad318e2e2431dd0ec6c38d9efe1da382ec95f5d9e959b" + ] +} diff --git a/fs.esy.lock/opam/easy-format.1.3.2/opam b/fs.esy.lock/opam/easy-format.1.3.2/opam new file mode 100644 index 00000000..138d0fb2 --- /dev/null +++ b/fs.esy.lock/opam/easy-format.1.3.2/opam @@ -0,0 +1,46 @@ +opam-version: "2.0" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "@doc"] {with-doc} +] +maintainer: ["martin@mjambon.com" "rudi.grinberg@gmail.com"] +authors: ["Martin Jambon"] +bug-reports: "https://github.com/mjambon/easy-format/issues" +homepage: "https://github.com/mjambon/easy-format" +doc: "https://mjambon.github.io/easy-format/" +license: "BSD-3-Clause" +dev-repo: "git+https://github.com/mjambon/easy-format.git" +synopsis: + "High-level and functional interface to the Format module of the OCaml standard library" +description: """ + +This module offers a high-level and functional interface to the Format module of +the OCaml standard library. It is a pretty-printing facility, i.e. it takes as +input some code represented as a tree and formats this code into the most +visually satisfying result, breaking and indenting lines of code where +appropriate. + +Input data must be first modelled and converted into a tree using 3 kinds of +nodes: + +* atoms +* lists +* labelled nodes + +Atoms represent any text that is guaranteed to be printed as-is. Lists can model +any sequence of items such as arrays of data or lists of definitions that are +labelled with something like "int main", "let x =" or "x:".""" +depends: [ + "dune" {>= "1.10"} + "ocaml" {>= "4.02.3"} +] +url { + src: + "https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz" + checksum: [ + "sha256=3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926" + "sha512=e39377a2ff020ceb9ac29e8515a89d9bdbc91dfcfa871c4e3baafa56753fac2896768e5d9822a050dc1e2ade43c8967afb69391a386c0a8ecd4e1f774e236135" + ] +} diff --git a/fs.esy.lock/opam/fix.20201120/opam b/fs.esy.lock/opam/fix.20201120/opam new file mode 100644 index 00000000..31c8a641 --- /dev/null +++ b/fs.esy.lock/opam/fix.20201120/opam @@ -0,0 +1,24 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " +] +homepage: "https://gitlab.inria.fr/fpottier/fix" +dev-repo: "git+https://gitlab.inria.fr/fpottier/fix.git" +bug-reports: "francois.pottier@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.03" } + "dune" {>= "1.3" } +] +synopsis: "Facilities for memoization and fixed points" +url { + src: + "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz" + checksum: [ + "md5=7eb570b759635fe66f3556d2b1cc88e3" + "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4" + ] +} diff --git a/fs.esy.lock/opam/junit.2.0.2/opam b/fs.esy.lock/opam/junit.2.0.2/opam new file mode 100644 index 00000000..874cf38f --- /dev/null +++ b/fs.esy.lock/opam/junit.2.0.2/opam @@ -0,0 +1,32 @@ +opam-version: "2.0" +maintainer: "Louis Roché " +authors: "Louis Roché " +homepage: "https://github.com/Khady/ocaml-junit" +bug-reports: "https://github.com/Khady/ocaml-junit/issues" +license: "LGPLv3+ with OCaml linking exception" +dev-repo: "git+https://github.com/Khady/ocaml-junit.git" +doc: "https://khady.github.io/ocaml-junit/" +tags: ["junit" "jenkins"] +depends: [ + "dune" {>= "1.0"} + "ptime" + "tyxml" {>= "4.0.0"} + "odoc" {with-doc & >= "1.1.1"} +] +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "-j" jobs] {with-doc} +] +name: "junit" +synopsis: "JUnit XML reports generation library" +description: "JUnit XML reports generation library" +url { + src: + "https://github.com/Khady/ocaml-junit/releases/download/2.0.2/junit-2.0.2.tbz" + checksum: [ + "sha256=fda941b653613a4a5731f9b3557364b12baa341daa13c01676c9eb8d64e96b01" + "sha512=5a9fa803c4861748bb8482fc51197420bf3cc3b9540989a489c4ffb65fdd02386aaa60437eae29182209dae0903b0e537c095249e19d395a451b8e8214f15f03" + ] +} diff --git a/fs.esy.lock/opam/menhir.20201122/opam b/fs.esy.lock/opam/menhir.20201122/opam new file mode 100644 index 00000000..48faa415 --- /dev/null +++ b/fs.esy.lock/opam/menhir.20201122/opam @@ -0,0 +1,27 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" { >= "2.2.0"} + "menhirLib" {= version} + "menhirSdk" {= version} +] +synopsis: "An LR(1) parser generator" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/fs.esy.lock/opam/menhirLib.20201122/opam b/fs.esy.lock/opam/menhirLib.20201122/opam new file mode 100644 index 00000000..e1cb73cc --- /dev/null +++ b/fs.esy.lock/opam/menhirLib.20201122/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Runtime support library for parsers generated by Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/fs.esy.lock/opam/menhirSdk.20201122/opam b/fs.esy.lock/opam/menhirSdk.20201122/opam new file mode 100644 index 00000000..977c9fbd --- /dev/null +++ b/fs.esy.lock/opam/menhirSdk.20201122/opam @@ -0,0 +1,28 @@ +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " + "Yann Régis-Gianas " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "menhir@inria.fr" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Compile-time library for auxiliary tools related to Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20201122/archive.tar.gz" + checksum: [ + "md5=9ad6a5f88aab6ec677b970e0d9de1763" + "sha512=9174e74cfb2336c5008c7461411ba79190e673d310da99117e363f60782bcf9a4bb26a04f6448cf6f3ed7888aa2b5b04d38c32e6d86594accfaadbbb72528068" + ] +} diff --git a/fs.esy.lock/opam/merlin-extend.0.6/opam b/fs.esy.lock/opam/merlin-extend.0.6/opam new file mode 100644 index 00000000..39b33757 --- /dev/null +++ b/fs.esy.lock/opam/merlin-extend.0.6/opam @@ -0,0 +1,30 @@ +opam-version: "2.0" +maintainer: "Frederic Bour " +authors: "Frederic Bour " +homepage: "https://github.com/let-def/merlin-extend" +bug-reports: "https://github.com/let-def/merlin-extend" +license: "MIT" +dev-repo: "git+https://github.com/let-def/merlin-extend.git" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "dune" {>= "1.0"} + "cppo" {build} + "ocaml" {>= "4.02.3"} +] +synopsis: "A protocol to provide custom frontend to Merlin" +description: """ +This protocol allows to replace the OCaml frontend of Merlin. +It extends what used to be done with the `-pp' flag to handle a few more cases.""" +doc: "https://let-def.github.io/merlin-extend" +x-commit-hash: "640620568a5f5c7798239ecf7c707c813e3df3cf" +url { + src: + "https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz" + checksum: [ + "sha256=c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" + "sha512=4c64a490e2ece04fc89aef679c1d9202175df4fe045b5fdc7a37cd7cebe861226fddd9648c1bf4f06175ecfcd2ed7686c96bd6a8cae003a5096f6134c240f857" + ] +} diff --git a/fs.esy.lock/opam/merlin.3.4.2/opam b/fs.esy.lock/opam/merlin.3.4.2/opam new file mode 100644 index 00000000..3e229166 --- /dev/null +++ b/fs.esy.lock/opam/merlin.3.4.2/opam @@ -0,0 +1,74 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +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] + ["dune" "runtest" "-p" name "-j" "1"] {with-test & ocaml:version >= "4.03"} +] +depends: [ + "ocaml" {>= "4.02.3" & < "4.12"} + "dune" {>= "1.8.0"} + "dot-merlin-reader" {= version} + "yojson" {>= "1.6.0"} + "mdx" {with-test & >= "1.3.0"} + "conf-jq" {with-test} + "csexp" {>= "1.2.3"} + "result" {>= "1.5"} +] +synopsis: + "Editor helper, provides completion, typing and source browsing in Vim and Emacs" +description: + "Merlin is an assistant for editing OCaml code. It aims to provide the features available in modern IDEs: error reporting, auto completion, source browsing and much more." +post-messages: [ + "merlin installed. + +Quick setup for VIM +------------------- +Append this to your .vimrc to add merlin to vim's runtime-path: + let g:opamshare = substitute(system('opam config var share'),'\\n$','','''') + execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\" + +Also run the following line in vim to index the documentation: + :execute \"helptags \" . g:opamshare . \"/merlin/vim/doc\" + +Quick setup for EMACS +------------------- +Add opam emacs directory to your load-path by appending this to your .emacs: + (let ((opam-share (ignore-errors (car (process-lines \"opam\" \"config\" \"var\" \"share\"))))) + (when (and opam-share (file-directory-p opam-share)) + ;; Register Merlin + (add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share)) + (autoload 'merlin-mode \"merlin\" nil t nil) + ;; Automatically start it in OCaml buffers + (add-hook 'tuareg-mode-hook 'merlin-mode t) + (add-hook 'caml-mode-hook 'merlin-mode t) + ;; Use opam switch to lookup ocamlmerlin binary + (setq merlin-command 'opam))) + +Take a look at https://github.com/ocaml/merlin for more information + +Quick setup with opam-user-setup +-------------------------------- + +Opam-user-setup support Merlin. + + $ opam user-setup install + +should take care of basic setup. +See https://github.com/OCamlPro/opam-user-setup +" + {success & !user-setup:installed} +] +x-commit-hash: "c9761a552380838e9f530b5c47c0ea3c47c33565" +url { + src: + "https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz" + checksum: [ + "sha256=e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81" + "sha512=7c39c70fc923971c4eca9432061077941498574c0b804efc20af244c1c9ab34c9178d7eb50ab750feaac30696e7ff911a0ccd5fb86341b68485bedae472aa15f" + ] +} diff --git a/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch new file mode 100644 index 00000000..cda19dd2 --- /dev/null +++ b/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch @@ -0,0 +1,24 @@ +From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 +From: David Allsopp +Date: Fri, 26 Jul 2019 12:12:19 +0100 +Subject: [PATCH] Don't build manpages for stdlib docs +--- + ocamldoc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile +index b109815071..e31e441f61 100644 +--- a/ocamldoc/Makefile ++++ b/ocamldoc/Makefile +@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) + + + .PHONY: all +-all: lib exe generators manpages ++all: lib exe generators + + manpages: generators + +-- +2.20.1 + diff --git a/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch new file mode 100644 index 00000000..41f5f770 --- /dev/null +++ b/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch @@ -0,0 +1,26 @@ +From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 +From: David Allsopp +Date: Tue, 6 Aug 2019 09:23:06 +0100 +Subject: [PATCH] Fix failure to install tools links + +In --disable-installing-bytecode-programs mode, the .opt version of the +tools is installed, but the symlink for the tool itself is not created. +--- + tools/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/Makefile b/tools/Makefile +index 530dd37f34..1b3014a3ab 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -197,6 +197,7 @@ else + do \ + if test -f "$$i".opt; then \ + $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ ++ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ + fi; \ + done + endif +-- +2.20.1 + diff --git a/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch new file mode 100644 index 00000000..e37b5e88 --- /dev/null +++ b/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch @@ -0,0 +1,34 @@ +commit 3f10a16153308f967149917585d2bc0b9c06492c +Author: Anil Madhavapeddy +Date: Sun Jun 21 18:40:27 2020 +0100 + + Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build + + Signed-off-by: Anil Madhavapeddy + +diff --git a/configure b/configure +index 9a78a4554..0c54b560b 100755 +--- a/configure ++++ b/configure +@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; + -fno-builtin-memcmp"; + internal_cflags="$gcc_warnings" ;; #( + gcc-*) : +- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; ++ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; + internal_cflags="$gcc_warnings" ;; #( + msvc-*) : + common_cflags="-nologo -O2 -Gy- -MD" +diff --git a/configure.ac b/configure.ac +index f5d8a2687..775e0e2db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -540,7 +540,7 @@ AS_CASE([$host], + -fno-builtin-memcmp"; + internal_cflags="$gcc_warnings"], + [gcc-*], +- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; ++ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; + internal_cflags="$gcc_warnings"], + [msvc-*], + [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam new file mode 100644 index 00000000..905f9b3d --- /dev/null +++ b/fs.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam @@ -0,0 +1,51 @@ +opam-version: "2.0" +synopsis: "OCaml 4.08.1 Secondary Switch Compiler" +maintainer: "platform@lists.ocaml.org" +authors: "Xavier Leroy and many contributors" +homepage: "https://ocaml.org" +bug-reports: "https://github.com/ocaml/ocaml/issues" +dev-repo: "git://github.com/ocaml/ocaml" +depends: "ocaml" {< "4.08.0" | >= "4.09~"} +build: [ + [ + "./configure" + "--prefix=%{_:share}%" + "--libdir=%{_:share}%/lib" + "--disable-debugger" + "--disable-installing-bytecode-programs" + "--disable-debug-runtime" + "--disable-instrumented-runtime" + "--disable-graph-lib" + "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} + "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} + ] + [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] +] +install: [make "install"] +url { + src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" + checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" +} +extra-files: [ + ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] + ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] + ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] +] +patches: [ + "0001-Don-t-build-manpages-for-stdlib-docs.patch" + "0001-Fix-failure-to-install-tools-links.patch" + "fix-gcc10.patch" +] + +post-messages: [ + "A failure in the middle of the build may be caused by build parallelism + (enabled by default). + Please file a bug report at https://github.com/ocaml/ocaml/issues" + {failure & jobs > 1 & os != "cygwin"} + "You can try installing again including --jobs=1 + to force a sequential build instead." + {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} +] +description: "Installs an additional compiler to the opam switch in +%{_:share}%/ocaml-secondary-compiler which can be accessed using +`ocamlfind -toolchain secondary`." diff --git a/fs.esy.lock/opam/ocamlbuild.0.14.0/opam b/fs.esy.lock/opam/ocamlbuild.0.14.0/opam new file mode 100644 index 00000000..8deabeed --- /dev/null +++ b/fs.esy.lock/opam/ocamlbuild.0.14.0/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +maintainer: "Gabriel Scherer " +authors: ["Nicolas Pouillard" "Berke Durak"] +homepage: "https://github.com/ocaml/ocamlbuild/" +bug-reports: "https://github.com/ocaml/ocamlbuild/issues" +license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" +doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc" +dev-repo: "git+https://github.com/ocaml/ocamlbuild.git" +build: [ + [ + make + "-f" + "configure.make" + "all" + "OCAMLBUILD_PREFIX=%{prefix}%" + "OCAMLBUILD_BINDIR=%{bin}%" + "OCAMLBUILD_LIBDIR=%{lib}%" + "OCAMLBUILD_MANDIR=%{man}%" + "OCAML_NATIVE=%{ocaml:native}%" + "OCAML_NATIVE_TOOLS=%{ocaml:native}%" + ] + [make "check-if-preinstalled" "all" "opam-install"] +] +conflicts: [ + "base-ocamlbuild" + "ocamlfind" {< "1.6.2"} +] +synopsis: + "OCamlbuild is a build system with builtin rules to easily build most OCaml projects." +depends: [ + "ocaml" {>= "4.03"} +] +url { + src: "https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz" + checksum: "sha256=87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78" +} diff --git a/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in new file mode 100644 index 00000000..12e3ee66 --- /dev/null +++ b/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in @@ -0,0 +1,3 @@ +description = "OCaml Secondary Compiler" +version = "%{ocaml-secondary-compiler:version}%" +directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in new file mode 100644 index 00000000..d13023c9 --- /dev/null +++ b/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in @@ -0,0 +1,10 @@ +path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" +ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" +ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" +ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" +ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" +ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" +ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" +ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/opam new file mode 100644 index 00000000..acdb5764 --- /dev/null +++ b/fs.esy.lock/opam/ocamlfind-secondary.1.8.1/opam @@ -0,0 +1,32 @@ +opam-version: "2.0" +maintainer: "David Allsopp " +homepage: "https://github.com/ocaml/opam-repository" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] +install: [ + [make "install-meta"] + ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] + ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] + ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] + ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] +] +depends: [ + "ocaml-secondary-compiler" + "ocamlfind" {= "1.8.1"} +] +synopsis: "ocamlfind support for ocaml-secondary-compiler" +description: """ +Exposes the compiler built by the ocaml-secondary-compielr package via +-toolchain secondary. A virtual package called ocaml is also installed to +locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" +authors: ["Gerd Stolpmann " "David Allsopp "] +substs: ["META" "ocaml-secondary-compiler.conf"] +extra-files: [ + ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] + ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] +] +url { + src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" + checksum: "md5=18ca650982c15536616dea0e422cbd8c" + mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" +} diff --git a/fs.esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub b/fs.esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub new file mode 100644 index 00000000..e5ad9907 --- /dev/null +++ b/fs.esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub @@ -0,0 +1,4 @@ +#!/bin/sh + +BINDIR=$(dirname "$(command -v ocamlc)") +"$BINDIR/ocaml" -I "$OCAML_TOPLEVEL_PATH" "$@" diff --git a/fs.esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install b/fs.esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install new file mode 100644 index 00000000..295c6254 --- /dev/null +++ b/fs.esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install @@ -0,0 +1,6 @@ +bin: [ + "src/findlib/ocamlfind" {"ocamlfind"} + "?src/findlib/ocamlfind_opt" {"ocamlfind"} + "?tools/safe_camlp4" +] +toplevel: ["src/findlib/topfind"] diff --git a/fs.esy.lock/opam/ocamlfind.1.8.1/opam b/fs.esy.lock/opam/ocamlfind.1.8.1/opam new file mode 100644 index 00000000..d757d669 --- /dev/null +++ b/fs.esy.lock/opam/ocamlfind.1.8.1/opam @@ -0,0 +1,50 @@ +opam-version: "2.0" +synopsis: "A library manager for OCaml" +maintainer: "Thomas Gazagnaire " +authors: "Gerd Stolpmann " +homepage: "http://projects.camlcity.org/projects/findlib.html" +bug-reports: "https://gitlab.camlcity.org/gerd/lib-findlib/issues" +dev-repo: "git+https://gitlab.camlcity.org/gerd/lib-findlib.git" +description: """ +Findlib is a library manager for OCaml. It provides a convention how +to store libraries, and a file format ("META") to describe the +properties of libraries. There is also a tool (ocamlfind) for +interpreting the META files, so that it is very easy to use libraries +in programs and scripts. +""" +build: [ + [ + "./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 "all"] + [make "opt"] {ocaml:native} +] +install: [ + [make "install"] + ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} +] +depends: [ + "ocaml" {>= "4.00.0"} + "conf-m4" {build} +] +extra-files: [ + ["ocamlfind.install" "md5=06f2c282ab52d93aa6adeeadd82a2543"] + ["ocaml-stub" "md5=181f259c9e0bad9ef523e7d4abfdf87a"] +] +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" +} +depopts: ["graphics"] diff --git a/fs.esy.lock/opam/ppx_derivers.1.2.1/opam b/fs.esy.lock/opam/ppx_derivers.1.2.1/opam new file mode 100644 index 00000000..3d10814e --- /dev/null +++ b/fs.esy.lock/opam/ppx_derivers.1.2.1/opam @@ -0,0 +1,23 @@ +opam-version: "2.0" +maintainer: "jeremie@dimino.org" +authors: ["Jérémie Dimino"] +license: "BSD-3-Clause" +homepage: "https://github.com/ocaml-ppx/ppx_derivers" +bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues" +dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" + "dune" +] +synopsis: "Shared [@@deriving] plugin registry" +description: """ +Ppx_derivers is a tiny package whose sole purpose is to allow +ppx_deriving and ppx_type_conv to inter-operate gracefully when linked +as part of the same ocaml-migrate-parsetree driver.""" +url { + src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz" + checksum: "md5=5dc2bf130c1db3c731fe0fffc5648b41" +} diff --git a/fs.esy.lock/opam/ptime.0.8.5/opam b/fs.esy.lock/opam/ptime.0.8.5/opam new file mode 100644 index 00000000..ed7c8d92 --- /dev/null +++ b/fs.esy.lock/opam/ptime.0.8.5/opam @@ -0,0 +1,49 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["The ptime programmers"] +homepage: "https://erratique.ch/software/ptime" +doc: "https://erratique.ch/software/ptime/doc" +dev-repo: "git+http://erratique.ch/repos/ptime.git" +bug-reports: "https://github.com/dbuenzli/ptime/issues" +tags: [ "time" "posix" "system" "org:erratique" ] +license: "ISC" +depends: [ + "ocaml" {>= "4.01.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build} + "result" +] +depopts: [ "js_of_ocaml" ] +conflicts: [ "js_of_ocaml" { < "3.3.0" } ] +build:[[ + "ocaml" "pkg/pkg.ml" "build" + "--pinned" "%{pinned}%" + "--with-js_of_ocaml" "%{js_of_ocaml:installed}%" ]] + +synopsis: """POSIX time for OCaml""" +description: """\ + +Ptime has platform independent POSIX time support in pure OCaml. It +provides a type to represent a well-defined range of POSIX timestamps +with picosecond precision, conversion with date-time values, +conversion with [RFC 3339 timestamps][rfc3339] and pretty printing to a +human-readable, locale-independent representation. + +The additional Ptime_clock library provides access to a system POSIX +clock and to the system's current time zone offset. + +Ptime is not a calendar library. + +Ptime depends on the `result` compatibility package. Ptime_clock +depends on your system library. Ptime_clock's optional JavaScript +support depends on [js_of_ocaml][jsoo]. Ptime and its libraries are +distributed under the ISC license. + +[rfc3339]: http://tools.ietf.org/html/rfc3339 +[jsoo]: http://ocsigen.org/js_of_ocaml/ +""" +url { +archive: "https://erratique.ch/software/ptime/releases/ptime-0.8.5.tbz" +checksum: "4d48055d623ecf2db792439b3e96a520" +} diff --git a/fs.esy.lock/opam/re.1.9.0/opam b/fs.esy.lock/opam/re.1.9.0/opam new file mode 100644 index 00000000..f7987544 --- /dev/null +++ b/fs.esy.lock/opam/re.1.9.0/opam @@ -0,0 +1,42 @@ +opam-version: "2.0" + +maintainer: "rudi.grinberg@gmail.com" +authors: [ + "Jerome Vouillon" + "Thomas Gazagnaire" + "Anil Madhavapeddy" + "Rudi Grinberg" + "Gabriel Radanne" +] +license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" +homepage: "https://github.com/ocaml/ocaml-re" +bug-reports: "https://github.com/ocaml/ocaml-re/issues" +dev-repo: "git+https://github.com/ocaml/ocaml-re.git" + +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] + +depends: [ + "ocaml" {>= "4.02"} + "dune" + "ounit" {with-test} + "seq" +] + +synopsis: "RE is a regular expression library for OCaml" +description: """ +Pure OCaml regular expressions with: +* Perl-style regular expressions (module Re.Perl) +* Posix extended regular expressions (module Re.Posix) +* Emacs-style regular expressions (module Re.Emacs) +* Shell-style file globbing (module Re.Glob) +* Compatibility layer for OCaml's built-in Str module (module Re.Str) +""" +url { + src: + "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz" + checksum: "md5=bddaed4f386a22cace7850c9c7dac296" +} diff --git a/fs.esy.lock/opam/result.1.5/opam b/fs.esy.lock/opam/result.1.5/opam new file mode 100644 index 00000000..671af042 --- /dev/null +++ b/fs.esy.lock/opam/result.1.5/opam @@ -0,0 +1,22 @@ +opam-version: "2.0" +maintainer: "opensource@janestreet.com" +authors: ["Jane Street Group, LLC "] +homepage: "https://github.com/janestreet/result" +dev-repo: "git+https://github.com/janestreet/result.git" +bug-reports: "https://github.com/janestreet/result/issues" +license: "BSD-3-Clause" +build: [["dune" "build" "-p" name "-j" jobs]] +depends: [ + "ocaml" + "dune" {>= "1.0"} +] +synopsis: "Compatibility Result module" +description: """ +Projects that want to use the new result type defined in OCaml >= 4.03 +while staying compatible with older version of OCaml should use the +Result module defined in this library.""" +url { + src: + "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz" + checksum: "md5=1b82dec78849680b49ae9a8a365b831b" +} diff --git a/fs.esy.lock/opam/seq.0.2.2/opam b/fs.esy.lock/opam/seq.0.2.2/opam new file mode 100644 index 00000000..5ed51654 --- /dev/null +++ b/fs.esy.lock/opam/seq.0.2.2/opam @@ -0,0 +1,24 @@ +opam-version: "2.0" +synopsis: + "Compatibility package for OCaml's standard iterator type starting from 4.07" +maintainer: "simon.cruanes.2007@m4x.org" +license: "LGPL2.1" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "dune" {>= "1.1.0"} + "ocaml" +] +tags: [ "iterator" "seq" "pure" "list" "compatibility" "cascade" ] +homepage: "https://github.com/c-cube/seq/" +bug-reports: "https://github.com/c-cube/seq/issues" +dev-repo: "git+https://github.com/c-cube/seq.git" +authors: "Simon Cruanes" +url { + src: "https://github.com/c-cube/seq/archive/0.2.2.tar.gz" + checksum: [ + "md5=9033e02283aa3bde9f97f24e632902e3" + "sha512=cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c" + ] +} diff --git a/fs.esy.lock/opam/topkg.1.0.3/opam b/fs.esy.lock/opam/topkg.1.0.3/opam new file mode 100644 index 00000000..6e073a11 --- /dev/null +++ b/fs.esy.lock/opam/topkg.1.0.3/opam @@ -0,0 +1,48 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["Daniel Bünzli "] +homepage: "http://erratique.ch/software/topkg" +doc: "http://erratique.ch/software/topkg/doc" +license: "ISC" +dev-repo: "git+http://erratique.ch/repos/topkg.git" +bug-reports: "https://github.com/dbuenzli/topkg/issues" +tags: ["packaging" "ocamlbuild" "org:erratique"] +depends: [ + "ocaml" {>= "4.03.0"} + "ocamlfind" {build & >= "1.6.1"} + "ocamlbuild" ] +build: [[ + "ocaml" "pkg/pkg.ml" "build" + "--pkg-name" name + "--dev-pkg" "%{pinned}%" ]] +synopsis: """The transitory OCaml software packager""" +description: """\ + +Topkg is a packager for distributing OCaml software. It provides an +API to describe the files a package installs in a given build +configuration and to specify information about the package's +distribution, creation and publication procedures. + +The optional topkg-care package provides the `topkg` command line tool +which helps with various aspects of a package's life cycle: creating +and linting a distribution, releasing it on the WWW, publish its +documentation, add it to the OCaml opam repository, etc. + +Topkg is distributed under the ISC license and has **no** +dependencies. This is what your packages will need as a *build* +dependency. + +Topkg-care is distributed under the ISC license it depends on +[fmt][fmt], [logs][logs], [bos][bos], [cmdliner][cmdliner], +[webbrowser][webbrowser] and `opam-format`. + +[fmt]: http://erratique.ch/software/fmt +[logs]: http://erratique.ch/software/logs +[bos]: http://erratique.ch/software/bos +[cmdliner]: http://erratique.ch/software/cmdliner +[webbrowser]: http://erratique.ch/software/webbrowser +""" +url { +archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.3.tbz" +checksum: "e285f7a296d77ee7d831ba9a6bfb396f" +} diff --git a/fs.esy.lock/opam/tyxml.4.4.0/opam b/fs.esy.lock/opam/tyxml.4.4.0/opam new file mode 100644 index 00000000..51532b53 --- /dev/null +++ b/fs.esy.lock/opam/tyxml.4.4.0/opam @@ -0,0 +1,47 @@ +opam-version: "2.0" +maintainer: "dev@ocsigen.org" +homepage: "https://github.com/ocsigen/tyxml/" +bug-reports: "https://github.com/ocsigen/tyxml/issues" +doc: "https://ocsigen.org/tyxml/manual/" +dev-repo: "git+https://github.com/ocsigen/tyxml.git" +license: "LGPL-2.1 with OCaml linking exception" + +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] + +depends: [ + "ocaml" {>= "4.02"} + "dune" + "alcotest" {with-test} + "seq" + "uutf" {>= "1.0.0"} + "re" {>= "1.5.0"} +] + +synopsis:"TyXML is a library for building correct HTML and SVG documents" +description:""" +TyXML provides a set of convenient combinators that uses the OCaml +type system to ensure the validity of the generated documents. TyXML +can be used with any representation of HTML and SVG: the textual one, +provided directly by this package, or DOM trees (`js_of_ocaml-tyxml`) +virtual DOM (`virtual-dom`) and reactive or replicated trees +(`eliom`). You can also create your own representation and use it to +instantiate a new set of combinators. + +```ocaml +open Tyxml +let to_ocaml = Html.(a ~a:[a_href "ocaml.org"] [txt "OCaml!"]) +``` +""" +authors: "The ocsigen team" +url { + src: + "https://github.com/ocsigen/tyxml/releases/download/4.4.0/tyxml-4.4.0.tbz" + checksum: [ + "sha256=516394dd4a5c31726997c51d66aa31cacb91e3c46d4e16c7699130e204042530" + "sha512=d5f2187f8410524cec7a14b28e8950837070eb0b6571b015dd06076c2841eb7ccaffa86d5d2307eaf1950ee62f9fb926477dac01c870d9c1a2f525853cb44d0c" + ] +} diff --git a/fs.esy.lock/opam/uchar.0.0.2/opam b/fs.esy.lock/opam/uchar.0.0.2/opam new file mode 100644 index 00000000..428d7aa6 --- /dev/null +++ b/fs.esy.lock/opam/uchar.0.0.2/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["Daniel Bünzli "] +homepage: "http://ocaml.org" +doc: "https://ocaml.github.io/uchar/" +dev-repo: "git+https://github.com/ocaml/uchar.git" +bug-reports: "https://github.com/ocaml/uchar/issues" +tags: [ "text" "character" "unicode" "compatibility" "org:ocaml.org" ] +license: "typeof OCaml system" +depends: [ + "ocaml" {>= "3.12.0"} + "ocamlbuild" {build} +] +build: [ + ["ocaml" "pkg/git.ml"] + [ + "ocaml" + "pkg/build.ml" + "native=%{ocaml:native}%" + "native-dynlink=%{ocaml:native-dynlink}%" + ] +] +synopsis: "Compatibility library for OCaml's Uchar module" +description: """ +The `uchar` package provides a compatibility library for the +[`Uchar`][1] module introduced in OCaml 4.03. + +The `uchar` package is distributed under the license of the OCaml +compiler. See [LICENSE](LICENSE) for details. + +[1]: http://caml.inria.fr/pub/docs/manual-ocaml/libref/Uchar.html""" +url { + src: + "https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz" + checksum: "md5=c9ba2c738d264c420c642f7bb1cf4a36" +} diff --git a/fs.esy.lock/opam/uutf.1.0.2/opam b/fs.esy.lock/opam/uutf.1.0.2/opam new file mode 100644 index 00000000..3a9f5678 --- /dev/null +++ b/fs.esy.lock/opam/uutf.1.0.2/opam @@ -0,0 +1,40 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["Daniel Bünzli "] +homepage: "http://erratique.ch/software/uutf" +doc: "http://erratique.ch/software/uutf/doc/Uutf" +dev-repo: "git+http://erratique.ch/repos/uutf.git" +bug-reports: "https://github.com/dbuenzli/uutf/issues" +tags: [ "unicode" "text" "utf-8" "utf-16" "codec" "org:erratique" ] +license: "ISC" +depends: [ + "ocaml" {>= "4.01.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build} + "uchar" +] +depopts: ["cmdliner"] +conflicts: ["cmdliner" { < "0.9.6"} ] +build: [[ + "ocaml" "pkg/pkg.ml" "build" + "--pinned" "%{pinned}%" + "--with-cmdliner" "%{cmdliner:installed}%" ]] +synopsis: """Non-blocking streaming Unicode codec for OCaml""" +description: """\ + +Uutf is a non-blocking streaming codec to decode and encode the UTF-8, +UTF-16, UTF-16LE and UTF-16BE encoding schemes. It can efficiently +work character by character without blocking on IO. Decoders perform +character position tracking and support newline normalization. + +Functions are also provided to fold over the characters of UTF encoded +OCaml string values and to directly encode characters in OCaml +Buffer.t values. + +Uutf has no dependency and is distributed under the ISC license. +""" +url { +archive: "http://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz" +checksum: "a7c542405a39630c689a82bd7ef2292c" +} diff --git a/fs.esy.lock/opam/yojson.1.7.0/opam b/fs.esy.lock/opam/yojson.1.7.0/opam new file mode 100644 index 00000000..ffef0682 --- /dev/null +++ b/fs.esy.lock/opam/yojson.1.7.0/opam @@ -0,0 +1,38 @@ +opam-version: "2.0" +maintainer: "martin@mjambon.com" +authors: ["Martin Jambon"] +homepage: "https://github.com/ocaml-community/yojson" +bug-reports: "https://github.com/ocaml-community/yojson/issues" +dev-repo: "git+https://github.com/ocaml-community/yojson.git" +doc: "https://ocaml-community.github.io/yojson/" +build: [ + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] +] +run-test: [["dune" "runtest" "-p" name "-j" jobs]] +depends: [ + "ocaml" {>= "4.02.3"} + "dune" + "cppo" {build} + "easy-format" + "biniou" {>= "1.2.0"} + "alcotest" {with-test & >= "0.8.5"} +] +synopsis: + "Yojson is an optimized parsing and printing library for the JSON format" +description: """ +Yojson is an optimized parsing and printing library for the JSON format. + +It addresses a few shortcomings of json-wheel including 2x speedup, +polymorphic variants and optional syntax for tuples and variants. + +ydump is a pretty-printing command-line program provided with the +yojson package. + +The program atdgen can be used to derive OCaml-JSON serializers and +deserializers from type definitions.""" +url { + src: + "https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz" + checksum: "md5=b89d39ca3f8c532abe5f547ad3b8f84d" +} diff --git a/fs.esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json b/fs.esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json new file mode 100644 index 00000000..ca6a373d --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__conf_m4_opam__c__1_opam_override/package.json @@ -0,0 +1,6 @@ +{ + "build": "true", + "dependencies": { + "esy-m4": "esy-packages/esy-m4#c7cf0ac9221be2b1f9d90e83559ca08397a629e7" + } +} diff --git a/fs.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh b/fs.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh new file mode 100644 index 00000000..b2a94f75 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/files/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +SECONDARY_CONF="$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf" + +if test -f $SECONDARY_CONF; then + export OCAMLFIND_CONF=$SECONDARY_CONF; +fi + +env -u OCAMLLIB ocaml bootstrap.ml +./dune.exe build -p dune --profile dune-bootstrap diff --git a/fs.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json b/fs.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json new file mode 100644 index 00000000..c7d77ab6 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__dune_opam__c__2.7.1_opam_override/package.json @@ -0,0 +1,8 @@ +{ + "buildsInSource": true, + "build": "bash build.sh", + "install": "esy-installer dune.install", + "buildEnv": { + "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" + } +} diff --git a/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll new file mode 100755 index 00000000..26301ddd --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll @@ -0,0 +1,16 @@ +#! /bin/sh + +# clone-flexdll +# +# Brings in flexdll, if necessary + +if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then + echo "[Flexdll] Already present, no need to clone." +else + echo "[Flexdll] Cloning..." + git clone https://github.com/esy-ocaml/flexdll.git + cd flexdll + git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff + cd .. + echo "[Flexdll] Clone successful!" +fi \ No newline at end of file diff --git a/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows new file mode 100755 index 00000000..4040b49e --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows @@ -0,0 +1,22 @@ +#! /bin/sh + +# configure-windows +# +# Creates a native Windows MingW build, based on: +# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc + + +export prefix=C:/ocamlmgw64 +while : ; do + case "$1" in + "") break;; + -prefix|--prefix) + prefix=$2; shift;; + esac + shift +done + +echo "[configure-windows] Setting up flexdll" +./clone-flexdll +./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix +make flexdll diff --git a/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build new file mode 100755 index 00000000..b95356a5 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build @@ -0,0 +1,24 @@ +#! /usr/bin/env bash + +# esy-build +# +# Wrapper to execute appropriate build strategy, based on platform + +set -u +set -e +set -o pipefail + +case "$(uname -s)" in + CYGWIN*|MINGW32*|MSYS*) + echo "[esy-build] Detected windows environment..." + make -j4 world.opt + make flexlink.opt + ;; + *) + echo "[esy-build] Detected OSX / Linux environment" + make -j4 world.opt + ;; +esac + +# Common build steps +make install \ No newline at end of file diff --git a/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure new file mode 100755 index 00000000..fd196c51 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure @@ -0,0 +1,29 @@ +#! /usr/bin/env bash + +# esy-configure +# +# Wrapper to delegate to configuration to the +# appropriate `configure` strategy based on the active platform. +# +# Today, OCaml has separate build strategies: +# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc +# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc +# +# We want `esy` to work cross-platform, so this is a shim script that will delegate to the +# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` +# that the `mingw` (native executable) strategy is desired. + +set -u +set -e +set -o pipefail + +case "$(uname -s)" in + CYGWIN*|MINGW32*|MSYS*) + echo "[esy-configure] Detected windows environment..." + ./configure-windows "$@" + ;; + *) + echo "[esy-configure] Detected OSX / Linux environment" + ./configure "$@" + ;; +esac \ No newline at end of file diff --git a/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json new file mode 100644 index 00000000..948455ca --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json @@ -0,0 +1,28 @@ +{ + "buildEnv": { + "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" + }, + "build": [ + [ + "env", + "-u", + "OCAMLLIB", + "bash", "./esy-configure", + "--disable-cfi", + "--prefix", "$cur__install/share/ocaml-secondary-compiler", + "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", + "--disable-debugger", + "--disable-installing-bytecode-programs", + "--disable-debug-runtime", + "--disable-instrumented-runtime", + "--disable-graph-lib" + ], + [ + "env", + "-u", + "OCAMLLIB", + "bash", "./esy-build" + ] + ], + "buildsInSource": true +} diff --git a/fs.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch b/fs.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch new file mode 100644 index 00000000..4d5bea0e --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/files/ocamlbuild-0.14.0.patch @@ -0,0 +1,463 @@ +--- ./Makefile ++++ ./Makefile +@@ -213,7 +213,7 @@ + rm -f man/ocamlbuild.1 + + man/options_man.byte: src/ocamlbuild_pack.cmo +- $(OCAMLC) $^ -I src man/options_man.ml -o man/options_man.byte ++ $(OCAMLC) -I +unix unix.cma $^ -I src man/options_man.ml -o man/options_man.byte + + clean:: + rm -f man/options_man.cm* +--- ./src/command.ml ++++ ./src/command.ml +@@ -148,9 +148,10 @@ + let self = string_of_command_spec_with_calls call_with_tags call_with_target resolve_virtuals in + let b = Buffer.create 256 in + (* The best way to prevent bash from switching to its windows-style +- * quote-handling is to prepend an empty string before the command name. *) ++ * quote-handling is to prepend an empty string before the command name. ++ * space seems to work, too - and the ouput is nicer *) + if Sys.os_type = "Win32" then +- Buffer.add_string b "''"; ++ Buffer.add_char b ' '; + let first = ref true in + let put_space () = + if !first then +@@ -260,7 +261,7 @@ + + let execute_many ?(quiet=false) ?(pretend=false) cmds = + add_parallel_stat (List.length cmds); +- let degraded = !*My_unix.is_degraded || Sys.os_type = "Win32" in ++ let degraded = !*My_unix.is_degraded in + let jobs = !jobs in + if jobs < 0 then invalid_arg "jobs < 0"; + let max_jobs = if jobs = 0 then None else Some jobs in +--- ./src/findlib.ml ++++ ./src/findlib.ml +@@ -66,9 +66,6 @@ + (fun command -> lexer & Lexing.from_string & run_and_read command) + command + +-let run_and_read command = +- Printf.ksprintf run_and_read command +- + let rec query name = + try + Hashtbl.find packages name +@@ -135,7 +132,8 @@ + with Not_found -> s + + let list () = +- List.map before_space (split_nl & run_and_read "%s list" ocamlfind) ++ let cmd = Shell.quote_filename_if_needed ocamlfind ^ " list" in ++ List.map before_space (split_nl & run_and_read cmd) + + (* The closure algorithm is easy because the dependencies are already closed + and sorted for each package. We only have to make the union. We could also +--- ./src/main.ml ++++ ./src/main.ml +@@ -162,6 +162,9 @@ + Tags.mem "traverse" tags + || List.exists (Pathname.is_prefix path_name) !Options.include_dirs + || List.exists (Pathname.is_prefix path_name) target_dirs) ++ && ((* beware: !Options.build_dir is an absolute directory *) ++ Pathname.normalize !Options.build_dir ++ <> Pathname.normalize (Pathname.pwd/path_name)) + end + end + end +--- ./src/my_std.ml ++++ ./src/my_std.ml +@@ -271,13 +271,107 @@ + try Array.iter (fun x -> if x = basename then raise Exit) a; false + with Exit -> true + ++let command_plain = function ++| [| |] -> 0 ++| margv -> ++ let rec waitpid a b = ++ match Unix.waitpid a b with ++ | exception (Unix.Unix_error(Unix.EINTR,_,_)) -> waitpid a b ++ | x -> x ++ in ++ let pid = Unix.(create_process margv.(0) margv stdin stdout stderr) in ++ let pid', process_status = waitpid [] pid in ++ assert (pid = pid'); ++ match process_status with ++ | Unix.WEXITED n -> n ++ | Unix.WSIGNALED _ -> 2 (* like OCaml's uncaught exceptions *) ++ | Unix.WSTOPPED _ -> 127 ++ ++(* can't use Lexers because of circular dependency *) ++let split_path_win str = ++ let rec aux pos = ++ try ++ let i = String.index_from str pos ';' in ++ let len = i - pos in ++ if len = 0 then ++ aux (succ i) ++ else ++ String.sub str pos (i - pos) :: aux (succ i) ++ with Not_found | Invalid_argument _ -> ++ let len = String.length str - pos in ++ if len = 0 then [] else [String.sub str pos len] ++ in ++ aux 0 ++ ++let windows_shell = lazy begin ++ let rec iter = function ++ | [] -> [| "bash.exe" ; "--norc" ; "--noprofile" |] ++ | hd::tl -> ++ let dash = Filename.concat hd "dash.exe" in ++ if Sys.file_exists dash then [|dash|] else ++ let bash = Filename.concat hd "bash.exe" in ++ if Sys.file_exists bash = false then iter tl else ++ (* if sh.exe and bash.exe exist in the same dir, choose sh.exe *) ++ let sh = Filename.concat hd "sh.exe" in ++ if Sys.file_exists sh then [|sh|] else [|bash ; "--norc" ; "--noprofile"|] ++ in ++ split_path_win (try Sys.getenv "PATH" with Not_found -> "") |> iter ++end ++ ++let prep_windows_cmd cmd = ++ (* workaround known ocaml bug, remove later *) ++ if String.contains cmd '\t' && String.contains cmd ' ' = false then ++ " " ^ cmd ++ else ++ cmd ++ ++let run_with_shell = function ++| "" -> 0 ++| cmd -> ++ let cmd = prep_windows_cmd cmd in ++ let shell = Lazy.force windows_shell in ++ let qlen = Filename.quote cmd |> String.length in ++ (* old versions of dash had problems with bs *) ++ try ++ if qlen < 7_900 then ++ command_plain (Array.append shell [| "-ec" ; cmd |]) ++ else begin ++ (* it can still work, if the called command is a cygwin tool *) ++ let ch_closed = ref false in ++ let file_deleted = ref false in ++ let fln,ch = ++ Filename.open_temp_file ++ ~mode:[Open_binary] ++ "ocamlbuildtmp" ++ ".sh" ++ in ++ try ++ let f_slash = String.map ( fun x -> if x = '\\' then '/' else x ) fln in ++ output_string ch cmd; ++ ch_closed:= true; ++ close_out ch; ++ let ret = command_plain (Array.append shell [| "-e" ; f_slash |]) in ++ file_deleted:= true; ++ Sys.remove fln; ++ ret ++ with ++ | x -> ++ if !ch_closed = false then ++ close_out_noerr ch; ++ if !file_deleted = false then ++ (try Sys.remove fln with _ -> ()); ++ raise x ++ end ++ with ++ | (Unix.Unix_error _) as x -> ++ (* Sys.command doesn't raise an exception, so run_with_shell also won't ++ raise *) ++ Printexc.to_string x ^ ":" ^ cmd |> prerr_endline; ++ 1 ++ + let sys_command = +- match Sys.os_type with +- | "Win32" -> fun cmd -> +- if cmd = "" then 0 else +- let cmd = "bash --norc -c " ^ Filename.quote cmd in +- Sys.command cmd +- | _ -> fun cmd -> if cmd = "" then 0 else Sys.command cmd ++ if Sys.win32 then run_with_shell ++ else fun cmd -> if cmd = "" then 0 else Sys.command cmd + + (* FIXME warning fix and use Filename.concat *) + let filename_concat x y = +--- ./src/my_std.mli ++++ ./src/my_std.mli +@@ -69,3 +69,6 @@ + + val split_ocaml_version : (int * int * int * string) option + (** (major, minor, patchlevel, rest) *) ++ ++val windows_shell : string array Lazy.t ++val prep_windows_cmd : string -> string +--- ./src/ocamlbuild_executor.ml ++++ ./src/ocamlbuild_executor.ml +@@ -34,6 +34,8 @@ + job_stdin : out_channel; + job_stderr : in_channel; + job_buffer : Buffer.t; ++ job_pid : int; ++ job_tmp_file: string option; + mutable job_dying : bool; + };; + +@@ -76,6 +78,61 @@ + in + loop 0 + ;; ++ ++let open_process_full_win cmd env = ++ let (in_read, in_write) = Unix.pipe () in ++ let (out_read, out_write) = Unix.pipe () in ++ let (err_read, err_write) = Unix.pipe () in ++ Unix.set_close_on_exec in_read; ++ Unix.set_close_on_exec out_write; ++ Unix.set_close_on_exec err_read; ++ let inchan = Unix.in_channel_of_descr in_read in ++ let outchan = Unix.out_channel_of_descr out_write in ++ let errchan = Unix.in_channel_of_descr err_read in ++ let shell = Lazy.force Ocamlbuild_pack.My_std.windows_shell in ++ let test_cmd = ++ String.concat " " (List.map Filename.quote (Array.to_list shell)) ^ ++ "-ec " ^ ++ Filename.quote (Ocamlbuild_pack.My_std.prep_windows_cmd cmd) in ++ let argv,tmp_file = ++ if String.length test_cmd < 7_900 then ++ Array.append ++ shell ++ [| "-ec" ; Ocamlbuild_pack.My_std.prep_windows_cmd cmd |],None ++ else ++ let fln,ch = Filename.open_temp_file ~mode:[Open_binary] "ocamlbuild" ".sh" in ++ output_string ch (Ocamlbuild_pack.My_std.prep_windows_cmd cmd); ++ close_out ch; ++ let fln' = String.map (function '\\' -> '/' | c -> c) fln in ++ Array.append ++ shell ++ [| "-c" ; fln' |], Some fln in ++ let pid = ++ Unix.create_process_env argv.(0) argv env out_read in_write err_write in ++ Unix.close out_read; ++ Unix.close in_write; ++ Unix.close err_write; ++ (pid, inchan, outchan, errchan,tmp_file) ++ ++let close_process_full_win (pid,inchan, outchan, errchan, tmp_file) = ++ let delete tmp_file = ++ match tmp_file with ++ | None -> () ++ | Some x -> try Sys.remove x with Sys_error _ -> () in ++ let tmp_file_deleted = ref false in ++ try ++ close_in inchan; ++ close_out outchan; ++ close_in errchan; ++ let res = snd(Unix.waitpid [] pid) in ++ tmp_file_deleted := true; ++ delete tmp_file; ++ res ++ with ++ | x when tmp_file <> None && !tmp_file_deleted = false -> ++ delete tmp_file; ++ raise x ++ + (* ***) + (*** execute *) + (* XXX: Add test for non reentrancy *) +@@ -130,10 +187,16 @@ + (*** add_job *) + let add_job cmd rest result id = + (*display begin fun oc -> fp oc "Job %a is %s\n%!" print_job_id id cmd; end;*) +- let (stdout', stdin', stderr') = open_process_full cmd env in ++ let (pid,stdout', stdin', stderr', tmp_file) = ++ if Sys.win32 then open_process_full_win cmd env else ++ let a,b,c = open_process_full cmd env in ++ -1,a,b,c,None ++ in + incr jobs_active; +- set_nonblock (doi stdout'); +- set_nonblock (doi stderr'); ++ if not Sys.win32 then ( ++ set_nonblock (doi stdout'); ++ set_nonblock (doi stderr'); ++ ); + let job = + { job_id = id; + job_command = cmd; +@@ -143,7 +206,9 @@ + job_stdin = stdin'; + job_stderr = stderr'; + job_buffer = Buffer.create 1024; +- job_dying = false } ++ job_dying = false; ++ job_tmp_file = tmp_file; ++ job_pid = pid } + in + outputs := FDM.add (doi stdout') job (FDM.add (doi stderr') job !outputs); + jobs := JS.add job !jobs; +@@ -199,6 +264,7 @@ + try + read fd u 0 (Bytes.length u) + with ++ | Unix.Unix_error(Unix.EPIPE,_,_) when Sys.win32 -> 0 + | Unix.Unix_error(e,_,_) -> + let msg = error_message e in + display (fun oc -> fp oc +@@ -241,14 +307,19 @@ + decr jobs_active; + + (* PR#5371: we would get EAGAIN below otherwise *) +- clear_nonblock (doi job.job_stdout); +- clear_nonblock (doi job.job_stderr); +- ++ if not Sys.win32 then ( ++ clear_nonblock (doi job.job_stdout); ++ clear_nonblock (doi job.job_stderr); ++ ); + do_read ~loop:true (doi job.job_stdout) job; + do_read ~loop:true (doi job.job_stderr) job; + outputs := FDM.remove (doi job.job_stdout) (FDM.remove (doi job.job_stderr) !outputs); + jobs := JS.remove job !jobs; +- let status = close_process_full (job.job_stdout, job.job_stdin, job.job_stderr) in ++ let status = ++ if Sys.win32 then ++ close_process_full_win (job.job_pid, job.job_stdout, job.job_stdin, job.job_stderr, job.job_tmp_file) ++ else ++ close_process_full (job.job_stdout, job.job_stdin, job.job_stderr) in + + let shown = ref false in + +--- ./src/ocamlbuild_unix_plugin.ml ++++ ./src/ocamlbuild_unix_plugin.ml +@@ -48,12 +48,22 @@ + end + + let run_and_open s kont = ++ let s_orig = s in ++ let s = ++ (* Be consistent! My_unix.run_and_open uses My_std.sys_command and ++ sys_command uses bash. *) ++ if Sys.win32 = false then s else ++ let l = match Lazy.force My_std.windows_shell |> Array.to_list with ++ | hd::tl -> (Filename.quote hd)::tl ++ | _ -> assert false in ++ "\"" ^ (String.concat " " l) ^ " -ec " ^ Filename.quote (" " ^ s) ^ "\"" ++ in + let ic = Unix.open_process_in s in + let close () = + match Unix.close_process_in ic with + | Unix.WEXITED 0 -> () + | Unix.WEXITED _ | Unix.WSIGNALED _ | Unix.WSTOPPED _ -> +- failwith (Printf.sprintf "Error while running: %s" s) in ++ failwith (Printf.sprintf "Error while running: %s" s_orig) in + let res = try + kont ic + with e -> (close (); raise e) +--- ./src/options.ml ++++ ./src/options.ml +@@ -174,11 +174,24 @@ + build_dir := Filename.concat (Sys.getcwd ()) s + else + build_dir := s ++ ++let slashify = ++ if Sys.win32 then fun p -> String.map (function '\\' -> '/' | x -> x) p ++ else fun p ->p ++ ++let sb () = ++ match Sys.os_type with ++ | "Win32" -> ++ (try set_binary_mode_out stdout true with _ -> ()); ++ | _ -> () ++ ++ + let spec = ref ( + let print_version () = ++ sb (); + Printf.printf "ocamlbuild %s\n%!" Ocamlbuild_config.version; raise Exit_OK + in +- let print_vnum () = print_endline Ocamlbuild_config.version; raise Exit_OK in ++ let print_vnum () = sb (); print_endline Ocamlbuild_config.version; raise Exit_OK in + Arg.align + [ + "-version", Unit print_version , " Display the version"; +@@ -257,8 +270,8 @@ + "-build-dir", String set_build_dir, " Set build directory (implies no-links)"; + "-install-lib-dir", Set_string Ocamlbuild_where.libdir, " Set the install library directory"; + "-install-bin-dir", Set_string Ocamlbuild_where.bindir, " Set the install binary directory"; +- "-where", Unit (fun () -> print_endline !Ocamlbuild_where.libdir; raise Exit_OK), " Display the install library directory"; +- "-which", String (fun cmd -> print_endline (find_tool cmd); raise Exit_OK), " Display path to the tool command"; ++ "-where", Unit (fun () -> sb (); print_endline (slashify !Ocamlbuild_where.libdir); raise Exit_OK), " Display the install library directory"; ++ "-which", String (fun cmd -> sb (); print_endline (slashify (find_tool cmd)); raise Exit_OK), " Display path to the tool command"; + "-ocamlc", set_cmd ocamlc, " Set the OCaml bytecode compiler"; + "-plugin-ocamlc", set_cmd plugin_ocamlc, " Set the OCaml bytecode compiler \ + used when building myocamlbuild.ml (only)"; +--- ./src/pathname.ml ++++ ./src/pathname.ml +@@ -84,6 +84,26 @@ + | x :: xs -> x :: normalize_list xs + + let normalize x = ++ let x = ++ if Sys.win32 = false then ++ x ++ else ++ let len = String.length x in ++ let b = Bytes.create len in ++ for i = 0 to pred len do ++ match x.[i] with ++ | '\\' -> Bytes.set b i '/' ++ | c -> Bytes.set b i c ++ done; ++ if len > 1 then ( ++ let c1 = Bytes.get b 0 in ++ let c2 = Bytes.get b 1 in ++ if c2 = ':' && c1 >= 'a' && c1 <= 'z' && ++ ( len = 2 || Bytes.get b 2 = '/') then ++ Bytes.set b 0 (Char.uppercase_ascii c1) ++ ); ++ Bytes.unsafe_to_string b ++ in + if Glob.eval not_normal_form_re x then + let root, paths = split x in + join root (normalize_list paths) +--- ./src/shell.ml ++++ ./src/shell.ml +@@ -24,12 +24,26 @@ + | 'a'..'z' | 'A'..'Z' | '0'..'9' | '.' | '-' | '/' | '_' | ':' | '@' | '+' | ',' -> loop (pos + 1) + | _ -> false in + loop 0 ++ ++let generic_quote quotequote s = ++ let l = String.length s in ++ let b = Buffer.create (l + 20) in ++ Buffer.add_char b '\''; ++ for i = 0 to l - 1 do ++ if s.[i] = '\'' ++ then Buffer.add_string b quotequote ++ else Buffer.add_char b s.[i] ++ done; ++ Buffer.add_char b '\''; ++ Buffer.contents b ++let unix_quote = generic_quote "'\\''" ++ + let quote_filename_if_needed s = + if is_simple_filename s then s + (* We should probably be using [Filename.unix_quote] except that function + * isn't exported. Users on Windows will have to live with not being able to + * install OCaml into c:\o'caml. Too bad. *) +- else if Sys.os_type = "Win32" then Printf.sprintf "'%s'" s ++ else if Sys.os_type = "Win32" then unix_quote s + else Filename.quote s + let chdir dir = + reset_filesys_cache (); +@@ -37,7 +51,7 @@ + let run args target = + reset_readdir_cache (); + let cmd = String.concat " " (List.map quote_filename_if_needed args) in +- if !*My_unix.is_degraded || Sys.os_type = "Win32" then ++ if !*My_unix.is_degraded then + begin + Log.event cmd target Tags.empty; + let st = sys_command cmd in diff --git a/fs.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json b/fs.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json new file mode 100644 index 00000000..b24be7b5 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override/package.json @@ -0,0 +1,27 @@ +{ + "build": [ + [ + "bash", + "-c", + "#{os == 'windows' ? 'patch -p1 < ocamlbuild-0.14.0.patch' : 'true'}" + ], + [ + "make", + "-f", + "configure.make", + "all", + "OCAMLBUILD_PREFIX=#{self.install}", + "OCAMLBUILD_BINDIR=#{self.bin}", + "OCAMLBUILD_LIBDIR=#{self.lib}", + "OCAMLBUILD_MANDIR=#{self.man}", + "OCAMLBUILD_NATIVE=true", + "OCAMLBUILD_NATIVE_TOOLS=true" + ], + [ + "make", + "check-if-preinstalled", + "all", + "#{os == 'windows' ? 'install' : 'opam-install'}" + ] + ] +} diff --git a/fs.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/fs.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch new file mode 100644 index 00000000..3e3ee5a2 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch @@ -0,0 +1,471 @@ +--- ./Makefile ++++ ./Makefile +@@ -57,16 +57,16 @@ + cat findlib.conf.in | \ + $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ +- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ ++ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamlopt; then \ +- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ ++ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldep; then \ +- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ ++ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldoc; then \ +- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ ++ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + + .PHONY: install-doc +--- ./src/findlib/findlib_config.mlp ++++ ./src/findlib/findlib_config.mlp +@@ -24,3 +24,5 @@ + | "MacOS" -> "" (* don't know *) + | _ -> failwith "Unknown Sys.os_type" + ;; ++ ++let exec_suffix = "@EXEC_SUFFIX@";; +--- ./src/findlib/findlib.ml ++++ ./src/findlib/findlib.ml +@@ -28,15 +28,20 @@ + let conf_ldconf = ref "";; + let conf_ignore_dups_in = ref ([] : string list);; + +-let ocamlc_default = "ocamlc";; +-let ocamlopt_default = "ocamlopt";; +-let ocamlcp_default = "ocamlcp";; +-let ocamloptp_default = "ocamloptp";; +-let ocamlmklib_default = "ocamlmklib";; +-let ocamlmktop_default = "ocamlmktop";; +-let ocamldep_default = "ocamldep";; +-let ocamlbrowser_default = "ocamlbrowser";; +-let ocamldoc_default = "ocamldoc";; ++let add_exec str = ++ match Findlib_config.exec_suffix with ++ | "" -> str ++ | a -> str ^ a ;; ++let ocamlc_default = add_exec "ocamlc";; ++let ocamlopt_default = add_exec "ocamlopt";; ++let ocamlcp_default = add_exec "ocamlcp";; ++let ocamloptp_default = add_exec "ocamloptp";; ++let ocamlmklib_default = add_exec "ocamlmklib";; ++let ocamlmktop_default = add_exec "ocamlmktop";; ++let ocamldep_default = add_exec "ocamldep";; ++let ocamlbrowser_default = add_exec "ocamlbrowser";; ++let ocamldoc_default = add_exec "ocamldoc";; ++ + + + let init_manually +--- ./src/findlib/fl_package_base.ml ++++ ./src/findlib/fl_package_base.ml +@@ -133,7 +133,15 @@ + List.find (fun def -> def.def_var = "exists_if") p.package_defs in + let files = Fl_split.in_words def.def_value in + List.exists +- (fun file -> Sys.file_exists (Filename.concat d' file)) ++ (fun file -> ++ let fln = Filename.concat d' file in ++ let e = Sys.file_exists fln in ++ (* necessary for ppx executables *) ++ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then ++ e ++ else ++ Sys.file_exists (fln ^ ".exe") ++ ) + files + with Not_found -> true in + +--- ./src/findlib/fl_split.ml ++++ ./src/findlib/fl_split.ml +@@ -126,10 +126,17 @@ + | '/' | '\\' -> true + | _ -> false in + let norm_dir_win() = +- if l >= 1 && s.[0] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; +- if l >= 2 && s.[1] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; ++ if l >= 1 then ( ++ if s.[0] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[0] ; ++ if l >= 2 then ++ if s.[1] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[1]; ++ ); + for k = 2 to l - 1 do + let c = s.[k] in + if is_slash c then ( +--- ./src/findlib/frontend.ml ++++ ./src/findlib/frontend.ml +@@ -31,10 +31,18 @@ + else + Sys_error (arg ^ ": " ^ Unix.error_message code) + ++let is_win = Sys.os_type = "Win32" ++ ++let () = ++ match Findlib_config.system with ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> ++ (try set_binary_mode_out stdout true with _ -> ()); ++ (try set_binary_mode_out stderr true with _ -> ()); ++ | _ -> () + + let slashify s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> + let b = Buffer.create 80 in + String.iter + (function +@@ -49,7 +57,7 @@ + + let out_path ?(prefix="") s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> + let u = slashify s in + prefix ^ + (if String.contains u ' ' then +@@ -273,11 +281,9 @@ + + + let identify_dir d = +- match Sys.os_type with +- | "Win32" -> +- failwith "identify_dir" (* not available *) +- | _ -> +- let s = Unix.stat d in ++ if is_win then ++ failwith "identify_dir"; (* not available *) ++ let s = Unix.stat d in + (s.Unix.st_dev, s.Unix.st_ino) + ;; + +@@ -459,6 +465,96 @@ + ) + packages + ++let rewrite_cmd s = ++ if s = "" || not is_win then ++ s ++ else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_cmd s = ++ if s = "" || not is_win then s else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_pp cmd = ++ if not is_win then cmd else ++ let module T = struct exception Keep end in ++ let is_whitespace = function ++ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true ++ | _ -> false in ++ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) ++ let is_unsafe_char = function ++ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true ++ | _ -> false in ++ let len = String.length cmd in ++ let buf = Buffer.create (len + 4) in ++ let buf_cmd = Buffer.create len in ++ let rec iter_ws i = ++ if i >= len then () else ++ let cur = cmd.[i] in ++ if is_whitespace cur then ( ++ Buffer.add_char buf cur; ++ iter_ws (succ i) ++ ) ++ else ++ iter_cmd i ++ and iter_cmd i = ++ if i >= len then add_buf_cmd () else ++ let cur = cmd.[i] in ++ if is_unsafe_char cur || cur = '"' || cur = '\'' then ++ raise T.Keep; ++ if is_whitespace cur then ( ++ add_buf_cmd (); ++ Buffer.add_substring buf cmd i (len - i) ++ ) ++ else ( ++ Buffer.add_char buf_cmd cur; ++ iter_cmd (succ i) ++ ) ++ and add_buf_cmd () = ++ if Buffer.length buf_cmd > 0 then ++ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) ++ in ++ try ++ iter_ws 0; ++ Buffer.contents buf ++ with ++ | T.Keep -> cmd + + let process_pp_spec syntax_preds packages pp_opts = + (* Returns: pp_command *) +@@ -549,7 +645,7 @@ + None -> [] + | Some cmd -> + ["-pp"; +- cmd ^ " " ^ ++ (rewrite_cmd cmd) ^ " " ^ + String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ + String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ + String.concat " " (List.map Filename.quote pp_opts)] +@@ -625,9 +721,11 @@ + in + try + let preprocessor = ++ rewrite_cmd ( + resolve_path + ~base ~explicit:true +- (package_property predicates pname "ppx") in ++ (package_property predicates pname "ppx") ) ++ in + ["-ppx"; String.concat " " (preprocessor :: options)] + with Not_found -> [] + ) +@@ -895,6 +993,14 @@ + switch (e.g. -L instead of -L ) + *) + ++(* We may need to remove files on which we do not have complete control. ++ On Windows, removing a read-only file fails so try to change the ++ mode of the file first. *) ++let remove_file fname = ++ try Sys.remove fname ++ with Sys_error _ when is_win -> ++ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); ++ Sys.remove fname + + let ocamlc which () = + +@@ -1022,9 +1128,12 @@ + + "-intf", + Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); +- ++ + "-pp", +- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); ++ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); ++ ++ "-ppx", ++ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); + + "-thread", + Arg.Unit (fun _ -> threads := threads_default); +@@ -1237,7 +1346,7 @@ + with + any -> + close_out initl; +- Sys.remove initl_file_name; ++ remove_file initl_file_name; + raise any + end; + +@@ -1245,9 +1354,9 @@ + at_exit + (fun () -> + let tr f x = try f x with _ -> () in +- tr Sys.remove initl_file_name; +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); ++ tr remove_file initl_file_name; ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); + ); + + let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in +@@ -1493,7 +1602,9 @@ + [ "-v", Arg.Unit (fun () -> verbose := Verbose); + "-pp", Arg.String (fun s -> + pp_specified := true; +- options := !options @ ["-pp"; s]); ++ options := !options @ ["-pp"; rewrite_pp s]); ++ "-ppx", Arg.String (fun s -> ++ options := !options @ ["-ppx"; rewrite_pp s]); + ] + ) + ) +@@ -1672,7 +1783,9 @@ + Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); + + "-pp", Arg.String (fun s -> pp_specified := true; +- add_spec_fn "-pp" s); ++ add_spec_fn "-pp" (rewrite_pp s)); ++ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); ++ + ] + ) + ) +@@ -1830,7 +1943,10 @@ + output_string ch_out append; + close_out ch_out; + close_in ch_in; +- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; ++ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime ++ with Unix.Unix_error(e,_,_) -> ++ prerr_endline("Warning: setting utimes for " ^ outpath ++ ^ ": " ^ Unix.error_message e)); + + prerr_endline("Installed " ^ outpath); + with +@@ -1882,6 +1998,8 @@ + Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in + let f = + Unix.in_channel_of_descr fd in ++ if is_win then ++ set_binary_mode_in f false; + try + let line = input_line f in + let is_my_file = (line = pkg) in +@@ -2208,7 +2326,7 @@ + let lines = read_ldconf !ldconf in + let dlldir_norm = Fl_split.norm_dir dlldir in + let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in +- let ci_filesys = (Sys.os_type = "Win32") in ++ let ci_filesys = is_win in + let check_dir d = + let d' = Fl_split.norm_dir d in + (d' = dlldir_norm) || +@@ -2356,7 +2474,7 @@ + List.iter + (fun file -> + let absfile = Filename.concat dlldir file in +- Sys.remove absfile; ++ remove_file absfile; + prerr_endline ("Removed " ^ absfile) + ) + dll_files +@@ -2365,7 +2483,7 @@ + (* Remove the files from the package directory: *) + if Sys.file_exists pkgdir then begin + let files = Sys.readdir pkgdir in +- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; ++ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; + Unix.rmdir pkgdir; + prerr_endline ("Removed " ^ pkgdir) + end +@@ -2415,7 +2533,9 @@ + + + let print_configuration() = ++ let sl = slashify in + let dir s = ++ let s = sl s in + if Sys.file_exists s then + s + else +@@ -2453,27 +2573,27 @@ + if md = "" then "the corresponding package directories" else dir md + ); + Printf.printf "The standard library is assumed to reside in:\n %s\n" +- (Findlib.ocaml_stdlib()); ++ (sl (Findlib.ocaml_stdlib())); + Printf.printf "The ld.conf file can be found here:\n %s\n" +- (Findlib.ocaml_ldconf()); ++ (sl (Findlib.ocaml_ldconf())); + flush stdout + | Some "conf" -> +- print_endline (Findlib.config_file()) ++ print_endline (sl (Findlib.config_file())) + | Some "path" -> +- List.iter print_endline (Findlib.search_path()) ++ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) + | Some "destdir" -> +- print_endline (Findlib.default_location()) ++ print_endline ( sl (Findlib.default_location())) + | Some "metadir" -> +- print_endline (Findlib.meta_directory()) ++ print_endline ( sl (Findlib.meta_directory())) + | Some "metapath" -> + let mdir = Findlib.meta_directory() in + let ddir = Findlib.default_location() in +- print_endline +- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") ++ print_endline ( sl ++ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) + | Some "stdlib" -> +- print_endline (Findlib.ocaml_stdlib()) ++ print_endline ( sl (Findlib.ocaml_stdlib())) + | Some "ldconf" -> +- print_endline (Findlib.ocaml_ldconf()) ++ print_endline ( sl (Findlib.ocaml_ldconf())) + | _ -> + assert false + ;; +@@ -2481,7 +2601,7 @@ + + let ocamlcall pkg cmd = + let dir = package_directory pkg in +- let path = Filename.concat dir cmd in ++ let path = rewrite_cmd (Filename.concat dir cmd) in + begin + try Unix.access path [ Unix.X_OK ] + with +@@ -2647,6 +2767,10 @@ + | Sys_error f -> + prerr_endline ("ocamlfind: " ^ f); + exit 2 ++ | Unix.Unix_error (e, fn, f) -> ++ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f ++ ^ ": " ^ Unix.error_message e); ++ exit 2 + | Findlib.No_such_package(pkg,info) -> + prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ + (if info <> "" then " - " ^ info else "")); +--- ./src/findlib/Makefile ++++ ./src/findlib/Makefile +@@ -90,6 +90,7 @@ + cat findlib_config.mlp | \ + $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ + $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ ++ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ + sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ + -e 's;@SYSTEM@;$(SYSTEM);g' \ + >findlib_config.ml diff --git a/fs.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json b/fs.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json new file mode 100644 index 00000000..9314f870 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json @@ -0,0 +1,61 @@ +{ + "build": [ + [ + "bash", + "-c", + "#{os == 'windows' ? 'patch -p1 < findlib-1.8.1.patch' : 'true'}" + ], + [ + "./configure", + "-bindir", + "#{self.bin}", + "-sitelib", + "#{self.lib}", + "-mandir", + "#{self.man}", + "-config", + "#{self.lib}/findlib.conf", + "-no-custom", + "-no-topfind" + ], + [ + "make", + "all" + ], + [ + "make", + "opt" + ] + ], + "install": [ + [ + "make", + "install" + ], + [ + "install", + "-m", + "0755", + "ocaml-stub", + "#{self.bin}/ocaml" + ], + [ + "mkdir", + "-p", + "#{self.toplevel}" + ], + [ + "install", + "-m", + "0644", + "src/findlib/topfind", + "#{self.toplevel}/topfind" + ] + ], + "exportedEnv": { + "OCAML_TOPLEVEL_PATH": { + "val": "#{self.toplevel}", + "scope": "global" + } + } +} diff --git a/fs.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/fs.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch new file mode 100644 index 00000000..3e3ee5a2 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch @@ -0,0 +1,471 @@ +--- ./Makefile ++++ ./Makefile +@@ -57,16 +57,16 @@ + cat findlib.conf.in | \ + $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ +- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ ++ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamlopt; then \ +- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ ++ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldep; then \ +- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ ++ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldoc; then \ +- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ ++ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + + .PHONY: install-doc +--- ./src/findlib/findlib_config.mlp ++++ ./src/findlib/findlib_config.mlp +@@ -24,3 +24,5 @@ + | "MacOS" -> "" (* don't know *) + | _ -> failwith "Unknown Sys.os_type" + ;; ++ ++let exec_suffix = "@EXEC_SUFFIX@";; +--- ./src/findlib/findlib.ml ++++ ./src/findlib/findlib.ml +@@ -28,15 +28,20 @@ + let conf_ldconf = ref "";; + let conf_ignore_dups_in = ref ([] : string list);; + +-let ocamlc_default = "ocamlc";; +-let ocamlopt_default = "ocamlopt";; +-let ocamlcp_default = "ocamlcp";; +-let ocamloptp_default = "ocamloptp";; +-let ocamlmklib_default = "ocamlmklib";; +-let ocamlmktop_default = "ocamlmktop";; +-let ocamldep_default = "ocamldep";; +-let ocamlbrowser_default = "ocamlbrowser";; +-let ocamldoc_default = "ocamldoc";; ++let add_exec str = ++ match Findlib_config.exec_suffix with ++ | "" -> str ++ | a -> str ^ a ;; ++let ocamlc_default = add_exec "ocamlc";; ++let ocamlopt_default = add_exec "ocamlopt";; ++let ocamlcp_default = add_exec "ocamlcp";; ++let ocamloptp_default = add_exec "ocamloptp";; ++let ocamlmklib_default = add_exec "ocamlmklib";; ++let ocamlmktop_default = add_exec "ocamlmktop";; ++let ocamldep_default = add_exec "ocamldep";; ++let ocamlbrowser_default = add_exec "ocamlbrowser";; ++let ocamldoc_default = add_exec "ocamldoc";; ++ + + + let init_manually +--- ./src/findlib/fl_package_base.ml ++++ ./src/findlib/fl_package_base.ml +@@ -133,7 +133,15 @@ + List.find (fun def -> def.def_var = "exists_if") p.package_defs in + let files = Fl_split.in_words def.def_value in + List.exists +- (fun file -> Sys.file_exists (Filename.concat d' file)) ++ (fun file -> ++ let fln = Filename.concat d' file in ++ let e = Sys.file_exists fln in ++ (* necessary for ppx executables *) ++ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then ++ e ++ else ++ Sys.file_exists (fln ^ ".exe") ++ ) + files + with Not_found -> true in + +--- ./src/findlib/fl_split.ml ++++ ./src/findlib/fl_split.ml +@@ -126,10 +126,17 @@ + | '/' | '\\' -> true + | _ -> false in + let norm_dir_win() = +- if l >= 1 && s.[0] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; +- if l >= 2 && s.[1] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; ++ if l >= 1 then ( ++ if s.[0] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[0] ; ++ if l >= 2 then ++ if s.[1] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[1]; ++ ); + for k = 2 to l - 1 do + let c = s.[k] in + if is_slash c then ( +--- ./src/findlib/frontend.ml ++++ ./src/findlib/frontend.ml +@@ -31,10 +31,18 @@ + else + Sys_error (arg ^ ": " ^ Unix.error_message code) + ++let is_win = Sys.os_type = "Win32" ++ ++let () = ++ match Findlib_config.system with ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> ++ (try set_binary_mode_out stdout true with _ -> ()); ++ (try set_binary_mode_out stderr true with _ -> ()); ++ | _ -> () + + let slashify s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> + let b = Buffer.create 80 in + String.iter + (function +@@ -49,7 +57,7 @@ + + let out_path ?(prefix="") s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> + let u = slashify s in + prefix ^ + (if String.contains u ' ' then +@@ -273,11 +281,9 @@ + + + let identify_dir d = +- match Sys.os_type with +- | "Win32" -> +- failwith "identify_dir" (* not available *) +- | _ -> +- let s = Unix.stat d in ++ if is_win then ++ failwith "identify_dir"; (* not available *) ++ let s = Unix.stat d in + (s.Unix.st_dev, s.Unix.st_ino) + ;; + +@@ -459,6 +465,96 @@ + ) + packages + ++let rewrite_cmd s = ++ if s = "" || not is_win then ++ s ++ else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_cmd s = ++ if s = "" || not is_win then s else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_pp cmd = ++ if not is_win then cmd else ++ let module T = struct exception Keep end in ++ let is_whitespace = function ++ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true ++ | _ -> false in ++ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) ++ let is_unsafe_char = function ++ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true ++ | _ -> false in ++ let len = String.length cmd in ++ let buf = Buffer.create (len + 4) in ++ let buf_cmd = Buffer.create len in ++ let rec iter_ws i = ++ if i >= len then () else ++ let cur = cmd.[i] in ++ if is_whitespace cur then ( ++ Buffer.add_char buf cur; ++ iter_ws (succ i) ++ ) ++ else ++ iter_cmd i ++ and iter_cmd i = ++ if i >= len then add_buf_cmd () else ++ let cur = cmd.[i] in ++ if is_unsafe_char cur || cur = '"' || cur = '\'' then ++ raise T.Keep; ++ if is_whitespace cur then ( ++ add_buf_cmd (); ++ Buffer.add_substring buf cmd i (len - i) ++ ) ++ else ( ++ Buffer.add_char buf_cmd cur; ++ iter_cmd (succ i) ++ ) ++ and add_buf_cmd () = ++ if Buffer.length buf_cmd > 0 then ++ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) ++ in ++ try ++ iter_ws 0; ++ Buffer.contents buf ++ with ++ | T.Keep -> cmd + + let process_pp_spec syntax_preds packages pp_opts = + (* Returns: pp_command *) +@@ -549,7 +645,7 @@ + None -> [] + | Some cmd -> + ["-pp"; +- cmd ^ " " ^ ++ (rewrite_cmd cmd) ^ " " ^ + String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ + String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ + String.concat " " (List.map Filename.quote pp_opts)] +@@ -625,9 +721,11 @@ + in + try + let preprocessor = ++ rewrite_cmd ( + resolve_path + ~base ~explicit:true +- (package_property predicates pname "ppx") in ++ (package_property predicates pname "ppx") ) ++ in + ["-ppx"; String.concat " " (preprocessor :: options)] + with Not_found -> [] + ) +@@ -895,6 +993,14 @@ + switch (e.g. -L instead of -L ) + *) + ++(* We may need to remove files on which we do not have complete control. ++ On Windows, removing a read-only file fails so try to change the ++ mode of the file first. *) ++let remove_file fname = ++ try Sys.remove fname ++ with Sys_error _ when is_win -> ++ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); ++ Sys.remove fname + + let ocamlc which () = + +@@ -1022,9 +1128,12 @@ + + "-intf", + Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); +- ++ + "-pp", +- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); ++ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); ++ ++ "-ppx", ++ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); + + "-thread", + Arg.Unit (fun _ -> threads := threads_default); +@@ -1237,7 +1346,7 @@ + with + any -> + close_out initl; +- Sys.remove initl_file_name; ++ remove_file initl_file_name; + raise any + end; + +@@ -1245,9 +1354,9 @@ + at_exit + (fun () -> + let tr f x = try f x with _ -> () in +- tr Sys.remove initl_file_name; +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); ++ tr remove_file initl_file_name; ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); + ); + + let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in +@@ -1493,7 +1602,9 @@ + [ "-v", Arg.Unit (fun () -> verbose := Verbose); + "-pp", Arg.String (fun s -> + pp_specified := true; +- options := !options @ ["-pp"; s]); ++ options := !options @ ["-pp"; rewrite_pp s]); ++ "-ppx", Arg.String (fun s -> ++ options := !options @ ["-ppx"; rewrite_pp s]); + ] + ) + ) +@@ -1672,7 +1783,9 @@ + Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); + + "-pp", Arg.String (fun s -> pp_specified := true; +- add_spec_fn "-pp" s); ++ add_spec_fn "-pp" (rewrite_pp s)); ++ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); ++ + ] + ) + ) +@@ -1830,7 +1943,10 @@ + output_string ch_out append; + close_out ch_out; + close_in ch_in; +- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; ++ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime ++ with Unix.Unix_error(e,_,_) -> ++ prerr_endline("Warning: setting utimes for " ^ outpath ++ ^ ": " ^ Unix.error_message e)); + + prerr_endline("Installed " ^ outpath); + with +@@ -1882,6 +1998,8 @@ + Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in + let f = + Unix.in_channel_of_descr fd in ++ if is_win then ++ set_binary_mode_in f false; + try + let line = input_line f in + let is_my_file = (line = pkg) in +@@ -2208,7 +2326,7 @@ + let lines = read_ldconf !ldconf in + let dlldir_norm = Fl_split.norm_dir dlldir in + let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in +- let ci_filesys = (Sys.os_type = "Win32") in ++ let ci_filesys = is_win in + let check_dir d = + let d' = Fl_split.norm_dir d in + (d' = dlldir_norm) || +@@ -2356,7 +2474,7 @@ + List.iter + (fun file -> + let absfile = Filename.concat dlldir file in +- Sys.remove absfile; ++ remove_file absfile; + prerr_endline ("Removed " ^ absfile) + ) + dll_files +@@ -2365,7 +2483,7 @@ + (* Remove the files from the package directory: *) + if Sys.file_exists pkgdir then begin + let files = Sys.readdir pkgdir in +- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; ++ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; + Unix.rmdir pkgdir; + prerr_endline ("Removed " ^ pkgdir) + end +@@ -2415,7 +2533,9 @@ + + + let print_configuration() = ++ let sl = slashify in + let dir s = ++ let s = sl s in + if Sys.file_exists s then + s + else +@@ -2453,27 +2573,27 @@ + if md = "" then "the corresponding package directories" else dir md + ); + Printf.printf "The standard library is assumed to reside in:\n %s\n" +- (Findlib.ocaml_stdlib()); ++ (sl (Findlib.ocaml_stdlib())); + Printf.printf "The ld.conf file can be found here:\n %s\n" +- (Findlib.ocaml_ldconf()); ++ (sl (Findlib.ocaml_ldconf())); + flush stdout + | Some "conf" -> +- print_endline (Findlib.config_file()) ++ print_endline (sl (Findlib.config_file())) + | Some "path" -> +- List.iter print_endline (Findlib.search_path()) ++ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) + | Some "destdir" -> +- print_endline (Findlib.default_location()) ++ print_endline ( sl (Findlib.default_location())) + | Some "metadir" -> +- print_endline (Findlib.meta_directory()) ++ print_endline ( sl (Findlib.meta_directory())) + | Some "metapath" -> + let mdir = Findlib.meta_directory() in + let ddir = Findlib.default_location() in +- print_endline +- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") ++ print_endline ( sl ++ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) + | Some "stdlib" -> +- print_endline (Findlib.ocaml_stdlib()) ++ print_endline ( sl (Findlib.ocaml_stdlib())) + | Some "ldconf" -> +- print_endline (Findlib.ocaml_ldconf()) ++ print_endline ( sl (Findlib.ocaml_ldconf())) + | _ -> + assert false + ;; +@@ -2481,7 +2601,7 @@ + + let ocamlcall pkg cmd = + let dir = package_directory pkg in +- let path = Filename.concat dir cmd in ++ let path = rewrite_cmd (Filename.concat dir cmd) in + begin + try Unix.access path [ Unix.X_OK ] + with +@@ -2647,6 +2767,10 @@ + | Sys_error f -> + prerr_endline ("ocamlfind: " ^ f); + exit 2 ++ | Unix.Unix_error (e, fn, f) -> ++ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f ++ ^ ": " ^ Unix.error_message e); ++ exit 2 + | Findlib.No_such_package(pkg,info) -> + prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ + (if info <> "" then " - " ^ info else "")); +--- ./src/findlib/Makefile ++++ ./src/findlib/Makefile +@@ -90,6 +90,7 @@ + cat findlib_config.mlp | \ + $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ + $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ ++ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ + sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ + -e 's;@SYSTEM@;$(SYSTEM);g' \ + >findlib_config.ml diff --git a/fs.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/fs.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh new file mode 100644 index 00000000..c923ef49 --- /dev/null +++ b/fs.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh @@ -0,0 +1,14 @@ +OCAML_SECONDARY_COMPILER=$1 + +cat >ocaml-secondary-compiler.conf <META <= 0.0.0 < 1.0.0", - "@opam/dune": "*", - "@esy-ocaml/reason": "< 4.0.0", - "ocaml": "^4.2.0" + "ocaml": " >= 4.2.0 < 4.11.0", + "@opam/dune": "< 2.8.0", + "@esy-ocaml/reason": "< 4.0.0" }, "devDependencies": { "@opam/merlin": "*", diff --git a/src/rely/TestSuiteRunner.re b/src/rely/TestSuiteRunner.re index 48c93d52..d6d86c1f 100644 --- a/src/rely/TestSuiteRunner.re +++ b/src/rely/TestSuiteRunner.re @@ -22,7 +22,7 @@ module SnapshotModuleSet = Set.Make({ type t = (TestSuite.contextId, module Snapshot.Sig); let compare = ((contextId1, module1), (contextId2, module2)) => - Pervasives.compare(contextId1, contextId2); + compare(contextId1, contextId2); }); module type TestSuiteRunnerConfig = {