From 78aba639995375fc2b688b0b0fa5b164043504b5 Mon Sep 17 00:00:00 2001 From: glennsl Date: Mon, 27 Jan 2020 09:08:34 +0100 Subject: [PATCH 1/4] add constraint on OCaml dependency and pin to 4.9 during development --- esy.lock/.gitattributes | 2 +- esy.lock/index.json | 539 ++++++++++-------- esy.lock/opam/atd.2.0.0/opam | 2 +- esy.lock/opam/atdgen-runtime.2.0.0/opam | 2 +- esy.lock/opam/atdgen.2.0.0/opam | 2 +- esy.lock/opam/charInfo_width.1.1.0/opam | 2 +- esy.lock/opam/dune-configurator.1.0.0/opam | 9 - esy.lock/opam/dune-configurator.2.1.3/opam | 43 ++ esy.lock/opam/dune-private-libs.2.1.3/opam | 42 ++ .../opam/{dune.1.11.3 => dune.2.1.3}/opam | 24 +- esy.lock/opam/jbuilder.1.0+beta20.2/opam | 39 ++ esy.lock/opam/jbuilder.transition/opam | 15 - .../opam | 6 +- esy.lock/opam/{lwt.4.3.1 => lwt.5.1.1}/opam | 10 +- esy.lock/opam/menhir.20190924/opam | 29 - esy.lock/opam/menhir.20200123/opam | 27 + esy.lock/opam/menhirLib.20200123/opam | 25 + esy.lock/opam/menhirSdk.20200123/opam | 25 + .../opam/{merlin.3.3.2 => merlin.3.3.3}/opam | 13 +- .../opam | 8 +- esy.lock/opam/{zed.2.0.3 => zed.2.0.4}/opam | 4 +- .../package.json | 14 - package.json | 5 +- 23 files changed, 553 insertions(+), 334 deletions(-) delete mode 100644 esy.lock/opam/dune-configurator.1.0.0/opam create mode 100644 esy.lock/opam/dune-configurator.2.1.3/opam create mode 100644 esy.lock/opam/dune-private-libs.2.1.3/opam rename esy.lock/opam/{dune.1.11.3 => dune.2.1.3}/opam (61%) create mode 100644 esy.lock/opam/jbuilder.1.0+beta20.2/opam delete mode 100644 esy.lock/opam/jbuilder.transition/opam rename esy.lock/opam/{lambda-term.2.0.2 => lambda-term.2.0.3}/opam (91%) rename esy.lock/opam/{lwt.4.3.1 => lwt.5.1.1}/opam (85%) delete mode 100644 esy.lock/opam/menhir.20190924/opam create mode 100644 esy.lock/opam/menhir.20200123/opam create mode 100644 esy.lock/opam/menhirLib.20200123/opam create mode 100644 esy.lock/opam/menhirSdk.20200123/opam rename esy.lock/opam/{merlin.3.3.2 => merlin.3.3.3}/opam (82%) rename esy.lock/opam/{ocaml-migrate-parsetree.1.4.0 => ocaml-migrate-parsetree.1.5.0}/opam (75%) rename esy.lock/opam/{zed.2.0.3 => zed.2.0.4}/opam (94%) delete mode 100644 esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json diff --git a/esy.lock/.gitattributes b/esy.lock/.gitattributes index 25366ae..e0b4e26 100644 --- a/esy.lock/.gitattributes +++ b/esy.lock/.gitattributes @@ -1,3 +1,3 @@ # Set eol to LF so files aren't converted to CRLF-eol on Windows. -* text eol=lf +* text eol=lf linguist-generated diff --git a/esy.lock/index.json b/esy.lock/index.json index 695aac9..414f3a8 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "73bbd6a5aa3406b8dbeec341c512125b", + "checksum": "c6d5ed3f2a71927425c881907e3113ef", "root": "rench@link-dev:./package.json", "node": { "rench@link-dev:./package.json": { @@ -13,46 +13,47 @@ }, "overrides": [], "dependencies": [ - "refmterr@3.2.2@d41d8cd9", "@reason-native/rely@3.1.0@d41d8cd9", + "refmterr@3.3.0@d41d8cd9", "ocaml@4.9.0@d41d8cd9", + "@reason-native/rely@3.1.0@d41d8cd9", "@reason-native/console@0.1.0@d41d8cd9", - "@opam/lwt@opam:4.3.1@14b6a62e", - "@opam/lambda-term@opam:2.0.2@119fb081", - "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:1.11.3@9894df55", + "@opam/lwt@opam:5.1.1@6f0a0b20", + "@opam/lambda-term@opam:2.0.3@9465cf1c", + "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/merlin@opam:3.3.2@7a364181", - "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/merlin@opam:3.3.3@d653b06a", + "@opam/dune@opam:2.1.3@8a848ab8" ] }, - "refmterr@3.2.2@d41d8cd9": { - "id": "refmterr@3.2.2@d41d8cd9", + "refmterr@3.3.0@d41d8cd9": { + "id": "refmterr@3.3.0@d41d8cd9", "name": "refmterr", - "version": "3.2.2", + "version": "3.3.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.2.2.tgz#sha1:b7d6c5df6a37633ec82d339dc609b1867e54e55e" + "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.3.0.tgz#sha1:45adde80205093c201b491b3c37dd7740c9b036b" ] }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.2.1@d41d8cd9", + "ocaml@4.9.0@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.11.3@9894df55", - "@opam/atdgen@opam:2.0.0@5d912e07", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.1.3@8a848ab8", + "@opam/atdgen@opam:2.0.0@46af0360", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, - "ocaml@4.8.1000@d41d8cd9": { - "id": "ocaml@4.8.1000@d41d8cd9", + "ocaml@4.9.0@d41d8cd9": { + "id": "ocaml@4.9.0@d41d8cd9", "name": "ocaml", - "version": "4.8.1000", + "version": "4.9.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.8.1000.tgz#sha1:abc435b5d4ddea2acba8b2df7efb81e2d1690db1" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.9.0.tgz#sha1:96d91599d28c6721ea5804f357268da247963683" ] }, "overrides": [], @@ -71,28 +72,28 @@ }, "overrides": [], "dependencies": [ - "refmterr@3.2.2@d41d8cd9", "ocaml@4.8.1000@d41d8cd9", - "@reason-native/pastel@0.2.1@d41d8cd9", + "refmterr@3.3.0@d41d8cd9", "ocaml@4.9.0@d41d8cd9", + "@reason-native/pastel@0.3.0@d41d8cd9", "@reason-native/file-context-printer@0.0.3@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.1@1b4d302c", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/reason@3.5.2@d41d8cd9" + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, - "@reason-native/pastel@0.2.1@d41d8cd9": { - "id": "@reason-native/pastel@0.2.1@d41d8cd9", + "@reason-native/pastel@0.3.0@d41d8cd9": { + "id": "@reason-native/pastel@0.3.0@d41d8cd9", "name": "@reason-native/pastel", - "version": "0.2.1", + "version": "0.3.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.2.1.tgz#sha1:c790b51e963ac94a0de141be0a8e4d077905978b" + "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.3.0.tgz#sha1:07da3c5a0933e61bc3b353bc85aa71ac7c0f311c" ] }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", - "@esy-ocaml/reason@3.5.2@d41d8cd9" + "ocaml@4.9.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, @@ -108,8 +109,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.2.1@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] @@ -126,40 +127,40 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, - "@opam/zed@opam:2.0.3@62853a38": { - "id": "@opam/zed@opam:2.0.3@62853a38", + "@opam/zed@opam:2.0.4@f9f7c80f": { + "id": "@opam/zed@opam:2.0.4@f9f7c80f", "name": "@opam/zed", - "version": "opam:2.0.3", + "version": "opam:2.0.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/87/878123c9114bf3c0bd18a19fb1af73cd#md5:878123c9114bf3c0bd18a19fb1af73cd", - "archive:https://github.com/ocaml-community/zed/releases/download/2.0.3/zed-2.0.3.tbz#md5:878123c9114bf3c0bd18a19fb1af73cd" + "archive:https://opam.ocaml.org/cache/md5/c6/c65b4de9f1374e72a8f80cc9cf752d90#md5:c65b4de9f1374e72a8f80cc9cf752d90", + "archive:https://github.com/ocaml-community/zed/releases/download/2.0.4/zed-2.0.4.tbz#md5:c65b4de9f1374e72a8f80cc9cf752d90" ], "opam": { "name": "zed", - "version": "2.0.3", - "path": "esy.lock/opam/zed.2.0.3" + "version": "2.0.4", + "path": "esy.lock/opam/zed.2.0.4" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/dune@opam:1.11.3@9894df55", - "@opam/charInfo_width@opam:1.1.0@a2633e77", + "ocaml@4.9.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "@opam/dune@opam:2.1.3@8a848ab8", + "@opam/charInfo_width@opam:1.1.0@9d8d61b2", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/dune@opam:1.11.3@9894df55", - "@opam/charInfo_width@opam:1.1.0@a2633e77", + "ocaml@4.9.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "@opam/dune@opam:2.1.3@8a848ab8", + "@opam/charInfo_width@opam:1.1.0@9d8d61b2", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -182,14 +183,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.3@9894df55", "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.9.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.1.3@8a848ab8", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.3@9894df55", "@opam/biniou@opam:1.2.1@d7570399" + "ocaml@4.9.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.1.3@8a848ab8", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -210,14 +211,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "ocaml@4.9.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", "@opam/topkg@opam:1.0.1@a42c631e", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + "ocaml@4.9.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, "@opam/uchar@opam:0.0.2@c8218eea": { @@ -238,10 +239,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.9.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.9.0@d41d8cd9" ] }, "@opam/tyxml@opam:4.3.0@c1da25f1": { "id": "@opam/tyxml@opam:4.3.0@c1da25f1", @@ -261,14 +262,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.9.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.9.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/topkg@opam:1.0.1@a42c631e": { @@ -289,12 +290,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.9.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + "ocaml@4.9.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -312,9 +313,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.9.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.9.0@d41d8cd9" ] }, "@opam/result@opam:1.4@dc720aef": { "id": "@opam/result@opam:1.4@dc720aef", @@ -334,11 +335,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/react@opam:1.2.1@0e11855f": { @@ -359,12 +360,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.9.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.9.0@d41d8cd9" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { "id": "@opam/re@opam:1.9.0@d4d5e13d", @@ -384,12 +385,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.9.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/ptime@opam:0.8.5@0051d642": { @@ -410,14 +411,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.9.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", "@opam/result@opam:1.4@dc720aef", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef" + "ocaml@4.9.0@d41d8cd9", "@opam/result@opam:1.4@dc720aef" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -438,11 +439,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/ocplib-endian@opam:1.0@aa720242": { @@ -468,14 +469,14 @@ } ], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.9.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.9.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -504,10 +505,10 @@ } ], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", + "ocaml@4.9.0@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.9.0@d41d8cd9" ] }, "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -532,36 +533,36 @@ } ], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.9.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ "ocaml@4.9.0@d41d8cd9" ] }, - "@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d": { - "id": "@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d", + "@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.4.0", + "version": "opam:1.5.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/23/231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8#sha256:231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8", - "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz#sha256:231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8" + "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" ], "opam": { "name": "ocaml-migrate-parsetree", - "version": "1.4.0", - "path": "esy.lock/opam/ocaml-migrate-parsetree.1.4.0" + "version": "1.5.0", + "path": "esy.lock/opam/ocaml-migrate-parsetree.1.5.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.9.0@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.9.0@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/mmap@opam:1.1.0@b85334ff": { @@ -582,11 +583,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/merlin-extend@opam:0.5@a5dd7d4b": { @@ -607,64 +608,118 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" ] }, - "@opam/merlin@opam:3.3.2@7a364181": { - "id": "@opam/merlin@opam:3.3.2@7a364181", + "@opam/merlin@opam:3.3.3@d653b06a": { + "id": "@opam/merlin@opam:3.3.3@d653b06a", "name": "@opam/merlin", - "version": "opam:3.3.2", + "version": "opam:3.3.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/1d/1d1c71e663b1e58acf19069cebd1e8d18f7dbe513c6065347d162cdd2c2de801#sha256:1d1c71e663b1e58acf19069cebd1e8d18f7dbe513c6065347d162cdd2c2de801", - "archive:https://github.com/ocaml/merlin/releases/download/v3.3.2/merlin-v3.3.2.tbz#sha256:1d1c71e663b1e58acf19069cebd1e8d18f7dbe513c6065347d162cdd2c2de801" + "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" ], "opam": { "name": "merlin", - "version": "3.3.2", - "path": "esy.lock/opam/merlin.3.3.2" + "version": "3.3.3", + "path": "esy.lock/opam/merlin.3.3.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.9.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.9.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/dune@opam:2.1.3@8a848ab8" + ] + }, + "@opam/menhirSdk@opam:20200123@b2300eb1": { + "id": "@opam/menhirSdk@opam:20200123@b2300eb1", + "name": "@opam/menhirSdk", + "version": "opam:20200123", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/91/91aeae45fbf781e82ec3fe636be6ad49#md5:91aeae45fbf781e82ec3fe636be6ad49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200123/archive.tar.gz#md5:91aeae45fbf781e82ec3fe636be6ad49" + ], + "opam": { + "name": "menhirSdk", + "version": "20200123", + "path": "esy.lock/opam/menhirSdk.20200123" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" ] }, - "@opam/menhir@opam:20190924@004407ff": { - "id": "@opam/menhir@opam:20190924@004407ff", + "@opam/menhirLib@opam:20200123@aac9ddb2": { + "id": "@opam/menhirLib@opam:20200123@aac9ddb2", + "name": "@opam/menhirLib", + "version": "opam:20200123", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/91/91aeae45fbf781e82ec3fe636be6ad49#md5:91aeae45fbf781e82ec3fe636be6ad49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200123/archive.tar.gz#md5:91aeae45fbf781e82ec3fe636be6ad49" + ], + "opam": { + "name": "menhirLib", + "version": "20200123", + "path": "esy.lock/opam/menhirLib.20200123" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" + ] + }, + "@opam/menhir@opam:20200123@fdbafd0c": { + "id": "@opam/menhir@opam:20200123@fdbafd0c", "name": "@opam/menhir", - "version": "opam:20190924", + "version": "opam:20200123", "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/91/91aeae45fbf781e82ec3fe636be6ad49#md5:91aeae45fbf781e82ec3fe636be6ad49", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200123/archive.tar.gz#md5:91aeae45fbf781e82ec3fe636be6ad49" ], "opam": { "name": "menhir", - "version": "20190924", - "path": "esy.lock/opam/menhir.20190924" + "version": "20200123", + "path": "esy.lock/opam/menhir.20200123" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.9.0@d41d8cd9", "@opam/menhirSdk@opam:20200123@b2300eb1", + "@opam/menhirLib@opam:20200123@aac9ddb2", + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + "devDependencies": [ + "ocaml@4.9.0@d41d8cd9", "@opam/menhirSdk@opam:20200123@b2300eb1", + "@opam/menhirLib@opam:20200123@aac9ddb2", + "@opam/dune@opam:2.1.3@8a848ab8" + ] }, "@opam/lwt_react@opam:1.1.3@72987fcf": { "id": "@opam/lwt_react@opam:1.1.3@72987fcf", @@ -684,13 +739,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.3.1@14b6a62e", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "@opam/lwt@opam:5.1.1@6f0a0b20", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.3.1@14b6a62e", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "@opam/lwt@opam:5.1.1@6f0a0b20", "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/lwt_log@opam:1.1.1@2d7a797f": { @@ -711,82 +766,82 @@ }, "overrides": [], "dependencies": [ - "@opam/lwt@opam:4.3.1@14b6a62e", "@opam/dune@opam:1.11.3@9894df55", + "@opam/lwt@opam:5.1.1@6f0a0b20", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/lwt@opam:4.3.1@14b6a62e", "@opam/dune@opam:1.11.3@9894df55" + "@opam/lwt@opam:5.1.1@6f0a0b20", "@opam/dune@opam:2.1.3@8a848ab8" ] }, - "@opam/lwt@opam:4.3.1@14b6a62e": { - "id": "@opam/lwt@opam:4.3.1@14b6a62e", + "@opam/lwt@opam:5.1.1@6f0a0b20": { + "id": "@opam/lwt@opam:5.1.1@6f0a0b20", "name": "@opam/lwt", - "version": "opam:4.3.1", + "version": "opam:5.1.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/92/926936860087c5819d6ca04241bc894a#md5:926936860087c5819d6ca04241bc894a", - "archive:https://github.com/ocsigen/lwt/archive/4.3.1.tar.gz#md5:926936860087c5819d6ca04241bc894a" + "archive:https://opam.ocaml.org/cache/md5/4d/4ddec0f42b7aa4a310175a14c47c60a3#md5:4ddec0f42b7aa4a310175a14c47c60a3", + "archive:https://github.com/ocsigen/lwt/archive/5.1.1.tar.gz#md5:4ddec0f42b7aa4a310175a14c47c60a3" ], "opam": { "name": "lwt", - "version": "4.3.1", - "path": "esy.lock/opam/lwt.4.3.1" + "version": "5.1.1", + "path": "esy.lock/opam/lwt.5.1.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.9.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.4@dc720aef", "@opam/ocplib-endian@opam:1.0@aa720242", "@opam/mmap@opam:1.1.0@b85334ff", - "@opam/dune-configurator@opam:1.0.0@4873acd8", - "@opam/dune@opam:1.11.3@9894df55", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune-configurator@opam:2.1.3@25ad9b47", + "@opam/dune@opam:2.1.3@8a848ab8", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.9.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.4@dc720aef", "@opam/ocplib-endian@opam:1.0@aa720242", "@opam/mmap@opam:1.1.0@b85334ff", - "@opam/dune-configurator@opam:1.0.0@4873acd8", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/dune-configurator@opam:2.1.3@25ad9b47", + "@opam/dune@opam:2.1.3@8a848ab8" ] }, - "@opam/lambda-term@opam:2.0.2@119fb081": { - "id": "@opam/lambda-term@opam:2.0.2@119fb081", + "@opam/lambda-term@opam:2.0.3@9465cf1c": { + "id": "@opam/lambda-term@opam:2.0.3@9465cf1c", "name": "@opam/lambda-term", - "version": "opam:2.0.2", + "version": "opam:2.0.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/46/4602aa4355705909e406513322b4b27e#md5:4602aa4355705909e406513322b4b27e", - "archive:https://github.com/ocaml-community/lambda-term/releases/download/2.0.2/lambda-term-2.0.2.tbz#md5:4602aa4355705909e406513322b4b27e" + "archive:https://opam.ocaml.org/cache/md5/90/903b6cc234598d67c7c905dfb5230209#md5:903b6cc234598d67c7c905dfb5230209", + "archive:https://github.com/ocaml-community/lambda-term/releases/download/2.0.3/lambda-term-2.0.3.tbz#md5:903b6cc234598d67c7c905dfb5230209" ], "opam": { "name": "lambda-term", - "version": "2.0.2", - "path": "esy.lock/opam/lambda-term.2.0.2" + "version": "2.0.3", + "path": "esy.lock/opam/lambda-term.2.0.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.3@62853a38", + "ocaml@4.9.0@d41d8cd9", "@opam/zed@opam:2.0.4@f9f7c80f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", - "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.3.1@14b6a62e", - "@opam/dune@opam:1.11.3@9894df55", + "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:5.1.1@6f0a0b20", + "@opam/dune@opam:2.1.3@8a848ab8", "@opam/camomile@opam:1.0.2@51b42ad8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.3@62853a38", + "ocaml@4.9.0@d41d8cd9", "@opam/zed@opam:2.0.4@f9f7c80f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", - "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.3.1@14b6a62e", - "@opam/dune@opam:1.11.3@9894df55", + "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:5.1.1@6f0a0b20", + "@opam/dune@opam:2.1.3@8a848ab8", "@opam/camomile@opam:1.0.2@51b42ad8" ] }, @@ -809,34 +864,34 @@ "overrides": [], "dependencies": [ "@opam/tyxml@opam:4.3.0@c1da25f1", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.1.3@8a848ab8", "@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.11.3@9894df55" + "@opam/dune@opam:2.1.3@8a848ab8" ] }, - "@opam/jbuilder@opam:transition@58bdfe0a": { - "id": "@opam/jbuilder@opam:transition@58bdfe0a", + "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2": { + "id": "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "name": "@opam/jbuilder", - "version": "opam:transition", + "version": "opam:1.0+beta20.2", "source": { "type": "install", - "source": [ "no-source:" ], + "source": [ + "archive:https://opam.ocaml.org/cache/md5/fb/fbe8c3b1facb206cac3fb8932b5dd5d9#md5:fbe8c3b1facb206cac3fb8932b5dd5d9", + "archive:https://github.com/ocaml/dune/releases/download/1.0%2Bbeta20.2/jbuilder-1.0+beta20.2.tbz#md5:fbe8c3b1facb206cac3fb8932b5dd5d9" + ], "opam": { "name": "jbuilder", - "version": "transition", - "path": "esy.lock/opam/jbuilder.transition" + "version": "1.0+beta20.2", + "path": "esy.lock/opam/jbuilder.1.0+beta20.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.9.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" - ] + "devDependencies": [ "ocaml@4.9.0@d41d8cd9" ] }, "@opam/fpath@opam:0.7.2@45477b93": { "id": "@opam/fpath@opam:0.7.2@45477b93", @@ -856,7 +911,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.9.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", "@opam/result@opam:1.4@dc720aef", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -864,7 +919,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.9.0@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/astring@opam:0.8.3@4e5e17d5" ] }, @@ -886,61 +941,88 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" + ] + }, + "@opam/dune-private-libs@opam:2.1.3@057b6b15": { + "id": "@opam/dune-private-libs@opam:2.1.3@057b6b15", + "name": "@opam/dune-private-libs", + "version": "opam:2.1.3", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/1e/1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3#sha256:1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3", + "archive:https://github.com/ocaml/dune/releases/download/2.1.3/dune-2.1.3.tbz#sha256:1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3" + ], + "opam": { + "name": "dune-private-libs", + "version": "2.1.3", + "path": "esy.lock/opam/dune-private-libs.2.1.3" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" ] }, - "@opam/dune-configurator@opam:1.0.0@4873acd8": { - "id": "@opam/dune-configurator@opam:1.0.0@4873acd8", + "@opam/dune-configurator@opam:2.1.3@25ad9b47": { + "id": "@opam/dune-configurator@opam:2.1.3@25ad9b47", "name": "@opam/dune-configurator", - "version": "opam:1.0.0", + "version": "opam:2.1.3", "source": { "type": "install", - "source": [ "no-source:" ], + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/1e/1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3#sha256:1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3", + "archive:https://github.com/ocaml/dune/releases/download/2.1.3/dune-2.1.3.tbz#sha256:1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3" + ], "opam": { "name": "dune-configurator", - "version": "1.0.0", - "path": "esy.lock/opam/dune-configurator.1.0.0" + "version": "2.1.3", + "path": "esy.lock/opam/dune-configurator.2.1.3" } }, "overrides": [], "dependencies": [ - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-private-libs@opam:2.1.3@057b6b15", + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:1.11.3@9894df55" ] + "devDependencies": [ + "@opam/dune-private-libs@opam:2.1.3@057b6b15", + "@opam/dune@opam:2.1.3@8a848ab8" + ] }, - "@opam/dune@opam:1.11.3@9894df55": { - "id": "@opam/dune@opam:1.11.3@9894df55", + "@opam/dune@opam:2.1.3@8a848ab8": { + "id": "@opam/dune@opam:2.1.3@8a848ab8", "name": "@opam/dune", - "version": "opam:1.11.3", + "version": "opam:2.1.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c8/c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2#sha256:c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2", - "archive:https://github.com/ocaml/dune/releases/download/1.11.3/dune-build-info-1.11.3.tbz#sha256:c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2" + "archive:https://opam.ocaml.org/cache/sha256/1e/1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3#sha256:1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3", + "archive:https://github.com/ocaml/dune/releases/download/2.1.3/dune-2.1.3.tbz#sha256:1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3" ], "opam": { "name": "dune", - "version": "1.11.3", - "path": "esy.lock/opam/dune.1.11.3" + "version": "2.1.3", + "path": "esy.lock/opam/dune.2.1.3" } }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.9.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.9.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, @@ -962,12 +1044,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -988,8 +1070,8 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/charInfo_width@opam:1.1.0@a2633e77": { - "id": "@opam/charInfo_width@opam:1.1.0@a2633e77", + "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { + "id": "@opam/charInfo_width@opam:1.1.0@9d8d61b2", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { @@ -1006,14 +1088,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "@opam/dune@opam:2.1.3@8a848ab8", "@opam/camomile@opam:1.0.2@51b42ad8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "@opam/dune@opam:2.1.3@8a848ab8", "@opam/camomile@opam:1.0.2@51b42ad8" ] }, @@ -1035,11 +1117,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -1060,12 +1142,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.9.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.1.3@8a848ab8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.9.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.1.3@8a848ab8" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -1117,15 +1199,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.9.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" + "ocaml@4.9.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" ] }, - "@opam/atdgen-runtime@opam:2.0.0@8a75c3bb": { - "id": "@opam/atdgen-runtime@opam:2.0.0@8a75c3bb", + "@opam/atdgen-runtime@opam:2.0.0@60f6faab": { + "id": "@opam/atdgen-runtime@opam:2.0.0@60f6faab", "name": "@opam/atdgen-runtime", "version": "opam:2.0.0", "source": { @@ -1142,18 +1224,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@58bdfe0a", + "ocaml@4.9.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.9.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/biniou@opam:1.2.1@d7570399" ] }, - "@opam/atdgen@opam:2.0.0@5d912e07": { - "id": "@opam/atdgen@opam:2.0.0@5d912e07", + "@opam/atdgen@opam:2.0.0@46af0360": { + "id": "@opam/atdgen@opam:2.0.0@46af0360", "name": "@opam/atdgen", "version": "opam:2.0.0", "source": { @@ -1170,21 +1253,22 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/jbuilder@opam:transition@58bdfe0a", + "ocaml@4.9.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/biniou@opam:1.2.1@d7570399", - "@opam/atdgen-runtime@opam:2.0.0@8a75c3bb", - "@opam/atd@opam:2.0.0@087614b7", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/atdgen-runtime@opam:2.0.0@60f6faab", + "@opam/atd@opam:2.0.0@e0ddd12f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.9.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/biniou@opam:1.2.1@d7570399", - "@opam/atdgen-runtime@opam:2.0.0@8a75c3bb", - "@opam/atd@opam:2.0.0@087614b7" + "@opam/atdgen-runtime@opam:2.0.0@60f6faab", + "@opam/atd@opam:2.0.0@e0ddd12f" ] }, - "@opam/atd@opam:2.0.0@087614b7": { - "id": "@opam/atd@opam:2.0.0@087614b7", + "@opam/atd@opam:2.0.0@e0ddd12f": { + "id": "@opam/atd@opam:2.0.0@e0ddd12f", "name": "@opam/atd", "version": "opam:2.0.0", "source": { @@ -1201,13 +1285,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20190924@004407ff", - "@opam/jbuilder@opam:transition@58bdfe0a", + "ocaml@4.9.0@d41d8cd9", "@opam/menhir@opam:20200123@fdbafd0c", + "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/easy-format@opam:1.3.2@0484b3c4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4" + "ocaml@4.9.0@d41d8cd9", "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", + "@opam/easy-format@opam:1.3.2@0484b3c4" ] }, "@opam/astring@opam:0.8.3@4e5e17d5": { @@ -1228,14 +1313,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.9.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", "@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.8.1000@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" + "ocaml@4.9.0@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { @@ -1264,12 +1349,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", + "ocaml@4.9.0@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.4.0@0c4ec62d", + "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc", "@opam/merlin-extend@opam:0.5@a5dd7d4b", - "@opam/menhir@opam:20190924@004407ff", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/menhir@opam:20200123@fdbafd0c", + "@opam/dune@opam:2.1.3@8a848ab8" ], "devDependencies": [] } diff --git a/esy.lock/opam/atd.2.0.0/opam b/esy.lock/opam/atd.2.0.0/opam index 5d81d26..2808354 100644 --- a/esy.lock/opam/atd.2.0.0/opam +++ b/esy.lock/opam/atd.2.0.0/opam @@ -18,7 +18,7 @@ build: [ depends: [ "ocaml" {>= "4.03.0"} - "jbuilder" {build} + "jbuilder" "menhir" {build} "easy-format" ] diff --git a/esy.lock/opam/atdgen-runtime.2.0.0/opam b/esy.lock/opam/atdgen-runtime.2.0.0/opam index fea05c9..7236d93 100644 --- a/esy.lock/opam/atdgen-runtime.2.0.0/opam +++ b/esy.lock/opam/atdgen-runtime.2.0.0/opam @@ -18,7 +18,7 @@ build: [ depends: [ "ocaml" {>= "4.02.3"} - "jbuilder" {build} + "jbuilder" "biniou" {>= "1.0.6"} "yojson" {>= "1.2.1"} ] diff --git a/esy.lock/opam/atdgen.2.0.0/opam b/esy.lock/opam/atdgen.2.0.0/opam index 8f42598..d71d304 100644 --- a/esy.lock/opam/atdgen.2.0.0/opam +++ b/esy.lock/opam/atdgen.2.0.0/opam @@ -18,7 +18,7 @@ build: [ depends: [ "ocaml" {>= "4.03.0"} - "jbuilder" {build} + "jbuilder" "atd" {>= "2.0.0"} "atdgen-runtime" {>= "2.0.0"} "biniou" {>= "1.0.6"} diff --git a/esy.lock/opam/charInfo_width.1.1.0/opam b/esy.lock/opam/charInfo_width.1.1.0/opam index 7375d47..7c17c98 100644 --- a/esy.lock/opam/charInfo_width.1.1.0/opam +++ b/esy.lock/opam/charInfo_width.1.1.0/opam @@ -14,7 +14,7 @@ depends: [ "result" "camomile" {>= "1.0.0" & < "2.0~"} "dune" - "ppx_expect" {with-test & < "v0.13"} + "ppx_expect" {with-test & < "v0.14"} ] synopsis: "Determine column width for a character" diff --git a/esy.lock/opam/dune-configurator.1.0.0/opam b/esy.lock/opam/dune-configurator.1.0.0/opam deleted file mode 100644 index 6e2b712..0000000 --- a/esy.lock/opam/dune-configurator.1.0.0/opam +++ /dev/null @@ -1,9 +0,0 @@ -opam-version: "2.0" -authors: ["Jérémie Dimino"] -homepage: "https://github.com/ocaml/dune" -bug-reports: "https://github.com/ocaml/dune/issues" -maintainer: "Jérémie Dimino" -description: """ -dune.configurator library distributed with Dune 1.x -""" -depends: ["dune" {<"2.0.0"}] diff --git a/esy.lock/opam/dune-configurator.2.1.3/opam b/esy.lock/opam/dune-configurator.2.1.3/opam new file mode 100644 index 0000000..84bc058 --- /dev/null +++ b/esy.lock/opam/dune-configurator.2.1.3/opam @@ -0,0 +1,43 @@ +opam-version: "2.0" +synopsis: "Helper library for gathering system configuration" +description: """ +dune-configurator is a small library that helps writing OCaml scripts that +test features available on the system, in order to generate config.h +files for instance. +Among other things, dune-configurator allows one to: +- test if a C program compiles +- query pkg-config +- import #define from OCaml header files +- generate config.h file +""" +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" +depends: [ + "dune" {>= "2.0"} + "dune-private-libs" {= version} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.1.3/dune-2.1.3.tbz" + checksum: [ + "sha256=1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3" + "sha512=31e179bc4aaf6cd84f3a0ce42870f44f7d86c1016600f053767e68779a9a074bdae718237bd9ec63ace088c11967311bf990c17e2db4c1bee02dfd23cafaeecd" + ] +} diff --git a/esy.lock/opam/dune-private-libs.2.1.3/opam b/esy.lock/opam/dune-private-libs.2.1.3/opam new file mode 100644 index 0000000..4352157 --- /dev/null +++ b/esy.lock/opam/dune-private-libs.2.1.3/opam @@ -0,0 +1,42 @@ +opam-version: "2.0" +synopsis: "Private libraries of Dune" +description: """ +!!!!!!!!!!!!!!!!!!!!!! +!!!!! DO NOT USE !!!!! +!!!!!!!!!!!!!!!!!!!!!! + +This package contains code that is shared between various dune-xxx +packages. However, it is not meant for public consumption and provides +no stability guarantee. +""" +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" +depends: [ + "dune" {>= "2.0"} + "ocaml" {>= "4.07"} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {pinned} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.1.3/dune-2.1.3.tbz" + checksum: [ + "sha256=1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3" + "sha512=31e179bc4aaf6cd84f3a0ce42870f44f7d86c1016600f053767e68779a9a074bdae718237bd9ec63ace088c11967311bf990c17e2db4c1bee02dfd23cafaeecd" + ] +} diff --git a/esy.lock/opam/dune.1.11.3/opam b/esy.lock/opam/dune.2.1.3/opam similarity index 61% rename from esy.lock/opam/dune.1.11.3/opam rename to esy.lock/opam/dune.2.1.3/opam index af3286b..03309a9 100644 --- a/esy.lock/opam/dune.1.11.3/opam +++ b/esy.lock/opam/dune.2.1.3/opam @@ -1,14 +1,14 @@ opam-version: "2.0" -synopsis: "Fast, portable and opinionated build system" +synopsis: "Fast, portable, and opinionated build system" description: """ dune is a build system that was designed to simplify the release of Jane Street packages. It reads metadata from "dune" files following a very simple s-expression syntax. -dune is fast, it has very low-overhead and support parallel builds on -all platforms. It has no system dependencies, all you need to build -dune and packages using dune is OCaml. You don't need or make or bash +dune is fast, has very low-overhead, and supports parallel builds on +all platforms. It has no system dependencies; all you need to build +dune or packages using dune is OCaml. You don't need make or bash as long as the packages themselves don't use bash explicitly. dune supports multi-package development by simply dropping multiple @@ -26,28 +26,26 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "ocaml" {>= "4.02"} + "ocaml" {>= "4.07"} "base-unix" "base-threads" ] conflicts: [ - "jbuilder" {!= "transition"} "odoc" {< "1.3.0"} "dune-release" {< "1.3.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] ] url { - src: - "https://github.com/ocaml/dune/releases/download/1.11.3/dune-build-info-1.11.3.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.1.3/dune-2.1.3.tbz" checksum: [ - "sha256=c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2" - "sha512=2c1532b91d223e6ea0628c5f5174792c1bb4113a464f6d8b878b3c58be1136beb84ba2d9883a330fa20e550367588aa923ba06ffb9b615a098a21374a9377e81" + "sha256=1e8e3b55a9fae02c4b8137e2134a6cc163df5cddcd1d52cdacf2343ac53baeb3" + "sha512=31e179bc4aaf6cd84f3a0ce42870f44f7d86c1016600f053767e68779a9a074bdae718237bd9ec63ace088c11967311bf990c17e2db4c1bee02dfd23cafaeecd" ] } diff --git a/esy.lock/opam/jbuilder.1.0+beta20.2/opam b/esy.lock/opam/jbuilder.1.0+beta20.2/opam new file mode 100644 index 0000000..2e411c9 --- /dev/null +++ b/esy.lock/opam/jbuilder.1.0+beta20.2/opam @@ -0,0 +1,39 @@ +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: "Apache-2.0" +build: [ + ["ocaml" "configure.ml" "--libdir" lib] + ["ocaml" "bootstrap.ml"] + ["./boot.exe" "--subst"] {pinned} + ["./boot.exe" "-j" jobs] +] +synopsis: "Fast, portable and opinionated build system" +description: """ +jbuilder is a build system that was designed to simplify the release +of Jane Street packages. It reads metadata from "jbuild" files +following a very simple s-expression syntax. + +jbuilder is fast, it has very low-overhead and support parallel builds +on all platforms. It has no system dependencies, all you need to build +jbuilder and packages using jbuilder is OCaml. You don't need or make +or bash as long as the packages themselves don't use bash explicitely. + +jbuilder 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.""" +depends: [ + "ocaml" {>= "4.02.3"} +] +url { + src: + "https://github.com/ocaml/dune/releases/download/1.0%2Bbeta20.2/jbuilder-1.0+beta20.2.tbz" + checksum: "md5=fbe8c3b1facb206cac3fb8932b5dd5d9" +} diff --git a/esy.lock/opam/jbuilder.transition/opam b/esy.lock/opam/jbuilder.transition/opam deleted file mode 100644 index 3e3174a..0000000 --- a/esy.lock/opam/jbuilder.transition/opam +++ /dev/null @@ -1,15 +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"] -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/lambda-term.2.0.2/opam b/esy.lock/opam/lambda-term.2.0.3/opam similarity index 91% rename from esy.lock/opam/lambda-term.2.0.2/opam rename to esy.lock/opam/lambda-term.2.0.3/opam index c805e10..18c4901 100644 --- a/esy.lock/opam/lambda-term.2.0.2/opam +++ b/esy.lock/opam/lambda-term.2.0.3/opam @@ -17,7 +17,7 @@ depends: [ "zed" {>= "2.0.3" & < "3.0"} "camomile" {>= "1.0.1"} "lwt_react" - "dune" {>= "1.0.0"} + "dune" {>= "1.1.0"} ] synopsis: "Terminal manipulation library for OCaml" description: """ @@ -29,6 +29,6 @@ for example, ncurses, by providing a native OCaml interface instead of bindings to a C library. Lambda-term integrates with zed to provide text edition facilities in console applications.""" url { - src: "https://github.com/ocaml-community/lambda-term/releases/download/2.0.2/lambda-term-2.0.2.tbz" - checksum: "md5=4602aa4355705909e406513322b4b27e" + src: "https://github.com/ocaml-community/lambda-term/releases/download/2.0.3/lambda-term-2.0.3.tbz" + checksum: "md5=903b6cc234598d67c7c905dfb5230209" } diff --git a/esy.lock/opam/lwt.4.3.1/opam b/esy.lock/opam/lwt.5.1.1/opam similarity index 85% rename from esy.lock/opam/lwt.4.3.1/opam rename to esy.lock/opam/lwt.5.1.1/opam index 61ce2d7..5eaf079 100644 --- a/esy.lock/opam/lwt.4.3.1/opam +++ b/esy.lock/opam/lwt.5.1.1/opam @@ -2,10 +2,10 @@ opam-version: "2.0" synopsis: "Promises and event-driven I/O" -version: "4.3.1" +version: "5.1.1" license: "MIT" homepage: "https://github.com/ocsigen/lwt" -doc: "https://ocsigen.org/lwt/manual/" +doc: "https://ocsigen.org/lwt" bug-reports: "https://github.com/ocsigen/lwt/issues" authors: [ @@ -42,7 +42,7 @@ conflicts: [ ] post-messages: [ - "Lwt 5.0.0 will make some breaking changes in November 2019. See + "Lwt 5.0.0 has made some minor breaking changes. See https://github.com/ocsigen/lwt/issues/584" ] @@ -60,6 +60,6 @@ a single thread by default. This reduces the need for locks or other synchronization primitives. Code can be run in parallel on an opt-in basis." url { - src: "https://github.com/ocsigen/lwt/archive/4.3.1.tar.gz" - checksum: "md5=926936860087c5819d6ca04241bc894a" + src: "https://github.com/ocsigen/lwt/archive/5.1.1.tar.gz" + checksum: "md5=4ddec0f42b7aa4a310175a14c47c60a3" } diff --git a/esy.lock/opam/menhir.20190924/opam b/esy.lock/opam/menhir.20190924/opam deleted file mode 100644 index 348967a..0000000 --- a/esy.lock/opam/menhir.20190924/opam +++ /dev/null @@ -1,29 +0,0 @@ -opam-version: "2.0" -maintainer: "francois.pottier@inria.fr" -authors: [ - "François Pottier " - "Yann Régis-Gianas " -] -homepage: "http://gitlab.inria.fr/fpottier/menhir" -dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" -bug-reports: "menhir@inria.fr" -build: [ - [make "-f" "Makefile" "PREFIX=%{prefix}%" "USE_OCAMLFIND=true" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] -] -install: [ - [make "-f" "Makefile" "install" "PREFIX=%{prefix}%" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"] -] -depends: [ - "ocaml" {>= "4.02"} - "ocamlfind" {build} - "ocamlbuild" {build} -] -synopsis: "An LR(1) parser generator" -url { - src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz" - checksum: [ - "md5=677f1997fb73177d5a00fa1b8d61c3ef" - "sha512=ea8a9a6d773529cf6ac05e4c6c4532770fbb8e574c9b646efcefe90d9f24544741e3e8cfd94c8afea0447e34059a8c79c2829b46764ce3a3d6dcb3e7f75980fc" - ] -} diff --git a/esy.lock/opam/menhir.20200123/opam b/esy.lock/opam/menhir.20200123/opam new file mode 100644 index 0000000..356699e --- /dev/null +++ b/esy.lock/opam/menhir.20200123/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.0.0"} + "menhirLib" {= version} + "menhirSdk" {= version} +] +synopsis: "An LR(1) parser generator" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20200123/archive.tar.gz" + checksum: [ + "md5=91aeae45fbf781e82ec3fe636be6ad49" + "sha512=4a7c4a72d4437940a0f62d402f783efcf357dde6f0a9e9f164c315148776e4642a822b6472f1e6e641164d110bc1ee05a6c1ad4a733f5defe4603b6072c1a34f" + ] +} diff --git a/esy.lock/opam/menhirLib.20200123/opam b/esy.lock/opam/menhirLib.20200123/opam new file mode 100644 index 0000000..8df3579 --- /dev/null +++ b/esy.lock/opam/menhirLib.20200123/opam @@ -0,0 +1,25 @@ +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"} +] +synopsis: "Runtime support library for parsers generated by Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20200123/archive.tar.gz" + checksum: [ + "md5=91aeae45fbf781e82ec3fe636be6ad49" + "sha512=4a7c4a72d4437940a0f62d402f783efcf357dde6f0a9e9f164c315148776e4642a822b6472f1e6e641164d110bc1ee05a6c1ad4a733f5defe4603b6072c1a34f" + ] +} diff --git a/esy.lock/opam/menhirSdk.20200123/opam b/esy.lock/opam/menhirSdk.20200123/opam new file mode 100644 index 0000000..1d46a24 --- /dev/null +++ b/esy.lock/opam/menhirSdk.20200123/opam @@ -0,0 +1,25 @@ +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"} +] +synopsis: "Compile-time library for auxiliary tools related to Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/repository/20200123/archive.tar.gz" + checksum: [ + "md5=91aeae45fbf781e82ec3fe636be6ad49" + "sha512=4a7c4a72d4437940a0f62d402f783efcf357dde6f0a9e9f164c315148776e4642a822b6472f1e6e641164d110bc1ee05a6c1ad4a733f5defe4603b6072c1a34f" + ] +} diff --git a/esy.lock/opam/merlin.3.3.2/opam b/esy.lock/opam/merlin.3.3.3/opam similarity index 82% rename from esy.lock/opam/merlin.3.3.2/opam rename to esy.lock/opam/merlin.3.3.3/opam index 47fb8f5..f0db8e9 100644 --- a/esy.lock/opam/merlin.3.3.2/opam +++ b/esy.lock/opam/merlin.3.3.3/opam @@ -1,5 +1,4 @@ opam-version: "2.0" -name: "merlin" maintainer: "defree@gmail.com" authors: "The Merlin team" homepage: "https://github.com/ocaml/merlin" @@ -8,13 +7,15 @@ 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} ] depends: [ - "ocaml" {>= "4.02.1" & < "4.09"} + "ocaml" {>= "4.02.1" & < "4.10"} "dune" {>= "1.8.0"} "ocamlfind" {>= "1.5.2"} - "yojson" + "yojson" {>= "1.6.0"} "mdx" {with-test & >= "1.3.0"} + "conf-jq" {with-test} ] synopsis: "Editor helper, provides completion, typing and source browsing in Vim and Emacs" @@ -62,9 +63,9 @@ See https://github.com/OCamlPro/opam-user-setup ] url { src: - "https://github.com/ocaml/merlin/releases/download/v3.3.2/merlin-v3.3.2.tbz" + "https://github.com/ocaml/merlin/releases/download/v3.3.3/merlin-v3.3.3.tbz" checksum: [ - "sha256=1d1c71e663b1e58acf19069cebd1e8d18f7dbe513c6065347d162cdd2c2de801" - "sha512=3ae021669808a40b4449f1cbdaca40b605ea5779a6204addd8b0ee4af9f14f528d55ca43a8dd3c7d547fb8e4cb256c09a9151d5559ef24dad83b5ab05aa146a2" + "sha256=72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15" + "sha512=2a5f39d966be56c1322982effc05bc98fd5f66cd12f1f76953f8daa9eca74a58c92a186854f4e601e2f0bb038720691446e7591b4613982accded3e579fedb23" ] } diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam b/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam similarity index 75% rename from esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam rename to esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam index 66d40ba..aa41104 100644 --- a/esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam +++ b/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam @@ -4,7 +4,7 @@ authors: [ "Frédéric Bour " "Jérémie Dimino " ] -license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" +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" @@ -29,9 +29,9 @@ rewriters independent of a compiler version. """ url { src: - "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz" + "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz" checksum: [ - "sha256=231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8" - "sha512=61ee91d2d146cc2d2ff2d5dc4ef5dea4dc4d3c8dbd8b4c9586d64b6ad7302327ab35547aa0a5b0103c3f07b66b13d416a1bee6d4d117293cd3cabe44113ec6d4" + "sha256=7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0" + "sha512=87fdccafae83b0437f1ccd4f3cfbc49e699bc0804596480e0df88510ba33410f31d48c7f677fe72800ed3f442a3a586d82d86aee1d12a964f79892833847b16a" ] } diff --git a/esy.lock/opam/zed.2.0.3/opam b/esy.lock/opam/zed.2.0.4/opam similarity index 94% rename from esy.lock/opam/zed.2.0.3/opam rename to esy.lock/opam/zed.2.0.4/opam index f6622b5..4ccdf48 100644 --- a/esy.lock/opam/zed.2.0.3/opam +++ b/esy.lock/opam/zed.2.0.4/opam @@ -27,6 +27,6 @@ Unicode buffers. Zed also features a regular expression search on ropes. To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.""" url { - src: "https://github.com/ocaml-community/zed/releases/download/2.0.3/zed-2.0.3.tbz" - checksum: "878123c9114bf3c0bd18a19fb1af73cd" + src: "https://github.com/ocaml-community/zed/releases/download/2.0.4/zed-2.0.4.tbz" + checksum: "c65b4de9f1374e72a8f80cc9cf752d90" } diff --git a/esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json deleted file mode 100644 index 064c7e3..0000000 --- a/esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "build": [ - [ - "ocaml", - "bootstrap.ml" - ], - [ - "./boot.exe", - "--release", - "-j", - "4" - ] - ] -} diff --git a/package.json b/package.json index f66cedd..b9047d3 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,11 @@ "@esy-ocaml/reason": "*", "refmterr": "*", "@reason-native/console": "*", - "@reason-native/rely": "*" + "@reason-native/rely": "*", + "ocaml": ">=4.6.0 <4.10.0" }, "devDependencies": { - "ocaml": ">=4.6.0 <4.9.0", + "ocaml": "~4.9", "@opam/merlin": "*", "@opam/dune": "*" } From 7631531a1903716bb9dca1fa1907d8af246f6091 Mon Sep 17 00:00:00 2001 From: glennsl Date: Mon, 27 Jan 2020 09:08:58 +0100 Subject: [PATCH 2/4] clean up Event --- src/Event.re | 16 ++++++++-------- src/Event.rei | 7 +++++++ 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 src/Event.rei diff --git a/src/Event.re b/src/Event.re index 1355690..6628aa8 100644 --- a/src/Event.re +++ b/src/Event.re @@ -1,17 +1,17 @@ /* Event.re */ -type cb('a) = 'a => unit; +type unsubscribe = unit => unit; -type t('a) = ref(list(cb('a))); +type t('a) = ref(list('a => unit)); let create = () => ref([]); -let subscribe = (evt: t('a), f: cb('a)) => { - evt := List.append(evt^, [f]); - let unsubscribe = () => { - evt := List.filter(f => f !== f, evt^); - }; +let subscribe = (event, callback) => { + event := List.append(event^, [f]); + + let unsubscribe = () => + event := List.filter(cb => cb !== callback, event^); unsubscribe; }; -let dispatch = (evt: t('a), v: 'a) => List.iter(c => c(v), evt^); +let dispatch = (event, message) => List.iter(cb => cb(message), event^); diff --git a/src/Event.rei b/src/Event.rei new file mode 100644 index 0000000..3017104 --- /dev/null +++ b/src/Event.rei @@ -0,0 +1,7 @@ +type unsubscribe = unit => unit; + +type t(_); + +let create: unit => t(_); +let subscribe: (t('a), 'a => unit) => unsubscribe; +let dispatch: (t('a), 'a) => unit; From 090e26ad95e1473e227b276f50ccbbfbf0d4d26e Mon Sep 17 00:00:00 2001 From: glennsl Date: Mon, 27 Jan 2020 09:09:33 +0100 Subject: [PATCH 3/4] add proper type annotations to ignored return values --- test/Rench_Test/ChildProcessSpawnTest.re | 4 ++-- test/Rench_Test/EventTest.re | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/Rench_Test/ChildProcessSpawnTest.re b/test/Rench_Test/ChildProcessSpawnTest.re index de930c1..8a7a8a2 100644 --- a/test/Rench_Test/ChildProcessSpawnTest.re +++ b/test/Rench_Test/ChildProcessSpawnTest.re @@ -31,7 +31,7 @@ describe("ChildProcess", ({describe, _}) => { let proc = ChildProcess.spawn("node", [|"-e", script|]); let data = ref(""); - let _event = + let _: Event.unsubscribe = Event.subscribe(proc.stdout.onData, str => { data := data^ ++ Bytes.to_string(str) }); @@ -90,7 +90,7 @@ describe("ChildProcess", ({describe, _}) => { let proc = ChildProcess.spawn("node", [|"-e", script|]); let data = ref(""); - let _event = + let _: Event.unsubscribe = Event.subscribe(proc.stderr.onData, str => data := data^ ++ Bytes.to_string(str) ); diff --git a/test/Rench_Test/EventTest.re b/test/Rench_Test/EventTest.re index adf5a16..7b64290 100644 --- a/test/Rench_Test/EventTest.re +++ b/test/Rench_Test/EventTest.re @@ -9,10 +9,9 @@ describe("Event", ({test, _}) => { let c = ref(0); let f = v => { c := v; - (); }; - let _unsubscribe = Event.subscribe(evt, f); + let _: Event.unsubscribe = Event.subscribe(evt, f); Event.dispatch(evt, 1); expect.int(c^).toBe(1); From 6a9cb63af4efe053af6d40fd82fadd311af9da1a Mon Sep 17 00:00:00 2001 From: glennsl Date: Mon, 27 Jan 2020 09:25:45 +0100 Subject: [PATCH 4/4] formatting --- src/ChildProcess.re | 12 ++++++++---- src/Event.re | 5 ++--- test/Rench_Test/PathTest.re | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/ChildProcess.re b/src/ChildProcess.re index 9fc6e7b..1df0ca8 100644 --- a/src/ChildProcess.re +++ b/src/ChildProcess.re @@ -217,10 +217,14 @@ let _spawn = _errThread: errThread, }; - let _unsubscribe = Event.subscribe(onClose, code => { - ret.exitCode := Some(code); - (); - }); + let _unsubscribe = + Event.subscribe( + onClose, + code => { + ret.exitCode := Some(code); + (); + }, + ); ret; }; diff --git a/src/Event.re b/src/Event.re index 6628aa8..b045776 100644 --- a/src/Event.re +++ b/src/Event.re @@ -7,10 +7,9 @@ type t('a) = ref(list('a => unit)); let create = () => ref([]); let subscribe = (event, callback) => { - event := List.append(event^, [f]); + event := List.append(event^, [callback]); - let unsubscribe = () => - event := List.filter(cb => cb !== callback, event^); + let unsubscribe = () => event := List.filter(cb => cb !== callback, event^); unsubscribe; }; diff --git a/test/Rench_Test/PathTest.re b/test/Rench_Test/PathTest.re index 7cf27a0..9f2e45b 100644 --- a/test/Rench_Test/PathTest.re +++ b/test/Rench_Test/PathTest.re @@ -62,7 +62,7 @@ describe("Path", ({describe, _}) => { expect.bool(Path.isAbsolute("test/test.txt")).toBe(false) ); } else { - test("home path", ({expect, _}) => + test("home path", ({expect, _}) => expect.bool(Path.isAbsolute("~/test.txt")).toBe(true) ); test("root path", ({expect, _}) =>