From 094266c1b5df50e390d66854e8526102fe2ba8bf Mon Sep 17 00:00:00 2001 From: Glenn Slotte Date: Fri, 12 Jun 2020 10:37:40 +0200 Subject: [PATCH] chore: fix build failure with dune-configurator 2.6.0(#909) --- bench.esy.lock/index.json | 90 +++++++++---------- .../opam | 8 +- .../opam/menhir.20200525}/opam | 8 +- .../opam/menhirLib.20200525}/opam | 10 +-- .../opam/menhirSdk.20200525}/opam | 10 +-- .../package.json | 5 -- doc.esy.lock/index.json | 90 +++++++++---------- .../opam | 8 +- .../opam/menhir.20200525}/opam | 8 +- .../opam/menhirLib.20200525}/opam | 10 +-- .../opam | 10 +-- .../package.json | 5 -- esy.lock/index.json | 90 +++++++++---------- .../opam | 8 +- .../{menhir.20200211 => menhir.20200525}/opam | 8 +- .../opam/menhirLib.20200525}/opam | 10 +-- .../opam/menhirSdk.20200525}/opam | 10 +-- .../package.json | 5 -- examples.esy.lock/index.json | 90 +++++++++---------- .../opam | 8 +- .../{menhir.20200211 => menhir.20200525}/opam | 8 +- .../opam | 10 +-- .../opam/menhirSdk.20200525}/opam | 10 +-- .../package.json | 5 -- js.esy.lock/index.json | 90 +++++++++---------- js.esy.lock/opam/dune-build-info.2.5.1/opam | 40 --------- js.esy.lock/opam/dune-build-info.2.6.0/opam | 40 +++++++++ js.esy.lock/opam/menhir.20200211/opam | 27 ------ js.esy.lock/opam/menhir.20200525/opam | 27 ++++++ js.esy.lock/opam/menhirLib.20200211/opam | 28 ------ js.esy.lock/opam/menhirLib.20200525/opam | 28 ++++++ js.esy.lock/opam/menhirSdk.20200211/opam | 28 ------ js.esy.lock/opam/menhirSdk.20200525/opam | 28 ++++++ .../package.json | 5 -- package.json | 4 +- test.esy.lock/index.json | 90 +++++++++---------- test.esy.lock/opam/dune-build-info.2.5.1/opam | 40 --------- test.esy.lock/opam/dune-build-info.2.6.0/opam | 40 +++++++++ test.esy.lock/opam/menhir.20200211/opam | 27 ------ test.esy.lock/opam/menhir.20200525/opam | 27 ++++++ test.esy.lock/opam/menhirLib.20200211/opam | 28 ------ test.esy.lock/opam/menhirLib.20200525/opam | 28 ++++++ test.esy.lock/opam/menhirSdk.20200211/opam | 28 ------ test.esy.lock/opam/menhirSdk.20200525/opam | 28 ++++++ .../package.json | 5 -- 45 files changed, 573 insertions(+), 637 deletions(-) rename bench.esy.lock/opam/{dune-build-info.2.5.1 => dune-build-info.2.6.0}/opam (75%) rename {doc.esy.lock/opam/menhir.20200211 => bench.esy.lock/opam/menhir.20200525}/opam (66%) rename {doc.esy.lock/opam/menhirLib.20200211 => bench.esy.lock/opam/menhirLib.20200525}/opam (64%) rename {esy.lock/opam/menhirSdk.20200211 => bench.esy.lock/opam/menhirSdk.20200525}/opam (64%) delete mode 100644 bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json rename doc.esy.lock/opam/{dune-build-info.2.5.1 => dune-build-info.2.6.0}/opam (75%) rename {bench.esy.lock/opam/menhir.20200211 => doc.esy.lock/opam/menhir.20200525}/opam (66%) rename {esy.lock/opam/menhirLib.20200211 => doc.esy.lock/opam/menhirLib.20200525}/opam (64%) rename doc.esy.lock/opam/{menhirSdk.20200211 => menhirSdk.20200525}/opam (64%) delete mode 100644 doc.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json rename esy.lock/opam/{dune-build-info.2.5.1 => dune-build-info.2.6.0}/opam (75%) rename esy.lock/opam/{menhir.20200211 => menhir.20200525}/opam (66%) rename {bench.esy.lock/opam/menhirLib.20200211 => esy.lock/opam/menhirLib.20200525}/opam (64%) rename {examples.esy.lock/opam/menhirSdk.20200211 => esy.lock/opam/menhirSdk.20200525}/opam (64%) delete mode 100644 esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json rename examples.esy.lock/opam/{dune-build-info.2.5.1 => dune-build-info.2.6.0}/opam (75%) rename examples.esy.lock/opam/{menhir.20200211 => menhir.20200525}/opam (66%) rename examples.esy.lock/opam/{menhirLib.20200211 => menhirLib.20200525}/opam (64%) rename {bench.esy.lock/opam/menhirSdk.20200211 => examples.esy.lock/opam/menhirSdk.20200525}/opam (64%) delete mode 100644 examples.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json delete mode 100644 js.esy.lock/opam/dune-build-info.2.5.1/opam create mode 100644 js.esy.lock/opam/dune-build-info.2.6.0/opam delete mode 100644 js.esy.lock/opam/menhir.20200211/opam create mode 100644 js.esy.lock/opam/menhir.20200525/opam delete mode 100644 js.esy.lock/opam/menhirLib.20200211/opam create mode 100644 js.esy.lock/opam/menhirLib.20200525/opam delete mode 100644 js.esy.lock/opam/menhirSdk.20200211/opam create mode 100644 js.esy.lock/opam/menhirSdk.20200525/opam delete mode 100644 js.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json delete mode 100644 test.esy.lock/opam/dune-build-info.2.5.1/opam create mode 100644 test.esy.lock/opam/dune-build-info.2.6.0/opam delete mode 100644 test.esy.lock/opam/menhir.20200211/opam create mode 100644 test.esy.lock/opam/menhir.20200525/opam delete mode 100644 test.esy.lock/opam/menhirLib.20200211/opam create mode 100644 test.esy.lock/opam/menhirLib.20200525/opam delete mode 100644 test.esy.lock/opam/menhirSdk.20200211/opam create mode 100644 test.esy.lock/opam/menhirSdk.20200525/opam delete mode 100644 test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json index fdd2115e1..92bc61af8 100644 --- a/bench.esy.lock/index.json +++ b/bench.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "e1f9a327c7a8829965c9b84f337ae943", + "checksum": "371e2a35be083b27fd6babd762a05c29", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -1630,8 +1630,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -1639,8 +1639,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -1773,20 +1773,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200211@b2a79ec0": { - "id": "@opam/menhirSdk@opam:20200211@b2a79ec0", + "@opam/menhirSdk@opam:20200525@6baf7403": { + "id": "@opam/menhirSdk@opam:20200525@6baf7403", "name": "@opam/menhirSdk", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirSdk", - "version": "20200211", - "path": "bench.esy.lock/opam/menhirSdk.20200211" + "version": "20200525", + "path": "bench.esy.lock/opam/menhirSdk.20200525" } }, "overrides": [], @@ -1798,20 +1798,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200211@93d0f001": { - "id": "@opam/menhirLib@opam:20200211@93d0f001", + "@opam/menhirLib@opam:20200525@f9abf308": { + "id": "@opam/menhirLib@opam:20200525@f9abf308", "name": "@opam/menhirLib", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirLib", - "version": "20200211", - "path": "bench.esy.lock/opam/menhirLib.20200211" + "version": "20200525", + "path": "bench.esy.lock/opam/menhirLib.20200525" } }, "overrides": [], @@ -1823,37 +1823,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200211@26571604": { - "id": "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337": { + "id": "@opam/menhir@opam:20200525@f6934337", "name": "@opam/menhir", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhir", - "version": "20200211", - "path": "bench.esy.lock/opam/menhir.20200211" + "version": "20200525", + "path": "bench.esy.lock/opam/menhir.20200525" } }, - "overrides": [ - { - "opamoverride": - "bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2410,20 +2404,20 @@ "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/dune-build-info@opam:2.5.1@921e5578": { - "id": "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/dune-build-info@opam:2.6.0@5e86a779": { + "id": "@opam/dune-build-info@opam:2.6.0@5e86a779", "name": "@opam/dune-build-info", - "version": "opam:2.5.1", + "version": "opam:2.6.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/8f/8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b", - "archive:https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" + "archive:https://opam.ocaml.org/cache/sha256/12/12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3", + "archive:https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" ], "opam": { "name": "dune-build-info", - "version": "2.5.1", - "path": "bench.esy.lock/opam/dune-build-info.2.5.1" + "version": "2.6.0", + "path": "bench.esy.lock/opam/dune-build-info.2.6.0" } }, "overrides": [], @@ -2965,13 +2959,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -3081,7 +3075,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.5@675b1611", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/bench.esy.lock/opam/dune-build-info.2.5.1/opam b/bench.esy.lock/opam/dune-build-info.2.6.0/opam similarity index 75% rename from bench.esy.lock/opam/dune-build-info.2.5.1/opam rename to bench.esy.lock/opam/dune-build-info.2.6.0/opam index c833ebbbb..bdb96f0b2 100644 --- a/bench.esy.lock/opam/dune-build-info.2.5.1/opam +++ b/bench.esy.lock/opam/dune-build-info.2.6.0/opam @@ -15,7 +15,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.3"} + "dune" {>= "2.6"} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ @@ -32,9 +32,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz" checksum: [ - "sha256=8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" - "sha512=f209f12ced10c1abf8782bdb0143f4cec77795f7174d2cc75130afb1e01550b01f2f77b9e3ec4888efdad83d2f9878d179b39126f824f4e522f3ef4da34bf27e" + "sha256=12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" + "sha512=de808537e471ef5a4ca49f68bfaf99d36441b5d30bc66712467a636e7bf69ea825e30286d882dac4e18a36c3eae45a80c3407d86255484c76570f771d84ce8b5" ] } diff --git a/doc.esy.lock/opam/menhir.20200211/opam b/bench.esy.lock/opam/menhir.20200525/opam similarity index 66% rename from doc.esy.lock/opam/menhir.20200211/opam rename to bench.esy.lock/opam/menhir.20200525/opam index f1f18fcf4..64b0d86ab 100644 --- a/doc.esy.lock/opam/menhir.20200211/opam +++ b/bench.esy.lock/opam/menhir.20200525/opam @@ -12,16 +12,16 @@ build: [ ] depends: [ "ocaml" {>= "4.02.3"} - "dune" {>= "2.2.0"} + "dune" { >= "2.2.0"} "menhirLib" {= version} "menhirSdk" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/doc.esy.lock/opam/menhirLib.20200211/opam b/bench.esy.lock/opam/menhirLib.20200525/opam similarity index 64% rename from doc.esy.lock/opam/menhirLib.20200211/opam rename to bench.esy.lock/opam/menhirLib.20200525/opam index a65ef4458..42f6fcd92 100644 --- a/doc.esy.lock/opam/menhirLib.20200211/opam +++ b/bench.esy.lock/opam/menhirLib.20200525/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/esy.lock/opam/menhirSdk.20200211/opam b/bench.esy.lock/opam/menhirSdk.20200525/opam similarity index 64% rename from esy.lock/opam/menhirSdk.20200211/opam rename to bench.esy.lock/opam/menhirSdk.20200525/opam index d82cffe48..a28801d70 100644 --- a/esy.lock/opam/menhirSdk.20200211/opam +++ b/bench.esy.lock/opam/menhirSdk.20200525/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json deleted file mode 100644 index 6882a3853..000000000 --- a/bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@opam/fix": "*" - } -} diff --git a/doc.esy.lock/index.json b/doc.esy.lock/index.json index 46cb5361b..311a45dfe 100644 --- a/doc.esy.lock/index.json +++ b/doc.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "6f573c3f4b6c7575290c21aae811b57c", + "checksum": "c35a6a46f1c29c16b615c135c324b047", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -2003,8 +2003,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -2012,8 +2012,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2146,20 +2146,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200211@b2a79ec0": { - "id": "@opam/menhirSdk@opam:20200211@b2a79ec0", + "@opam/menhirSdk@opam:20200525@6baf7403": { + "id": "@opam/menhirSdk@opam:20200525@6baf7403", "name": "@opam/menhirSdk", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirSdk", - "version": "20200211", - "path": "doc.esy.lock/opam/menhirSdk.20200211" + "version": "20200525", + "path": "doc.esy.lock/opam/menhirSdk.20200525" } }, "overrides": [], @@ -2171,20 +2171,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200211@93d0f001": { - "id": "@opam/menhirLib@opam:20200211@93d0f001", + "@opam/menhirLib@opam:20200525@f9abf308": { + "id": "@opam/menhirLib@opam:20200525@f9abf308", "name": "@opam/menhirLib", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirLib", - "version": "20200211", - "path": "doc.esy.lock/opam/menhirLib.20200211" + "version": "20200525", + "path": "doc.esy.lock/opam/menhirLib.20200525" } }, "overrides": [], @@ -2196,37 +2196,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200211@26571604": { - "id": "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337": { + "id": "@opam/menhir@opam:20200525@f6934337", "name": "@opam/menhir", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhir", - "version": "20200211", - "path": "doc.esy.lock/opam/menhir.20200211" + "version": "20200525", + "path": "doc.esy.lock/opam/menhir.20200525" } }, - "overrides": [ - { - "opamoverride": - "doc.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2785,20 +2779,20 @@ "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/dune-build-info@opam:2.5.1@921e5578": { - "id": "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/dune-build-info@opam:2.6.0@5e86a779": { + "id": "@opam/dune-build-info@opam:2.6.0@5e86a779", "name": "@opam/dune-build-info", - "version": "opam:2.5.1", + "version": "opam:2.6.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/8f/8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b", - "archive:https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" + "archive:https://opam.ocaml.org/cache/sha256/12/12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3", + "archive:https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" ], "opam": { "name": "dune-build-info", - "version": "2.5.1", - "path": "doc.esy.lock/opam/dune-build-info.2.5.1" + "version": "2.6.0", + "path": "doc.esy.lock/opam/dune-build-info.2.6.0" } }, "overrides": [], @@ -3362,13 +3356,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -3478,7 +3472,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.5@675b1611", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/doc.esy.lock/opam/dune-build-info.2.5.1/opam b/doc.esy.lock/opam/dune-build-info.2.6.0/opam similarity index 75% rename from doc.esy.lock/opam/dune-build-info.2.5.1/opam rename to doc.esy.lock/opam/dune-build-info.2.6.0/opam index c833ebbbb..bdb96f0b2 100644 --- a/doc.esy.lock/opam/dune-build-info.2.5.1/opam +++ b/doc.esy.lock/opam/dune-build-info.2.6.0/opam @@ -15,7 +15,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.3"} + "dune" {>= "2.6"} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ @@ -32,9 +32,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz" checksum: [ - "sha256=8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" - "sha512=f209f12ced10c1abf8782bdb0143f4cec77795f7174d2cc75130afb1e01550b01f2f77b9e3ec4888efdad83d2f9878d179b39126f824f4e522f3ef4da34bf27e" + "sha256=12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" + "sha512=de808537e471ef5a4ca49f68bfaf99d36441b5d30bc66712467a636e7bf69ea825e30286d882dac4e18a36c3eae45a80c3407d86255484c76570f771d84ce8b5" ] } diff --git a/bench.esy.lock/opam/menhir.20200211/opam b/doc.esy.lock/opam/menhir.20200525/opam similarity index 66% rename from bench.esy.lock/opam/menhir.20200211/opam rename to doc.esy.lock/opam/menhir.20200525/opam index f1f18fcf4..64b0d86ab 100644 --- a/bench.esy.lock/opam/menhir.20200211/opam +++ b/doc.esy.lock/opam/menhir.20200525/opam @@ -12,16 +12,16 @@ build: [ ] depends: [ "ocaml" {>= "4.02.3"} - "dune" {>= "2.2.0"} + "dune" { >= "2.2.0"} "menhirLib" {= version} "menhirSdk" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/esy.lock/opam/menhirLib.20200211/opam b/doc.esy.lock/opam/menhirLib.20200525/opam similarity index 64% rename from esy.lock/opam/menhirLib.20200211/opam rename to doc.esy.lock/opam/menhirLib.20200525/opam index a65ef4458..42f6fcd92 100644 --- a/esy.lock/opam/menhirLib.20200211/opam +++ b/doc.esy.lock/opam/menhirLib.20200525/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/doc.esy.lock/opam/menhirSdk.20200211/opam b/doc.esy.lock/opam/menhirSdk.20200525/opam similarity index 64% rename from doc.esy.lock/opam/menhirSdk.20200211/opam rename to doc.esy.lock/opam/menhirSdk.20200525/opam index d82cffe48..a28801d70 100644 --- a/doc.esy.lock/opam/menhirSdk.20200211/opam +++ b/doc.esy.lock/opam/menhirSdk.20200525/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/doc.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/doc.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json deleted file mode 100644 index 6882a3853..000000000 --- a/doc.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@opam/fix": "*" - } -} diff --git a/esy.lock/index.json b/esy.lock/index.json index 1a37d6b15..76bbb1ca9 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "e1f9a327c7a8829965c9b84f337ae943", + "checksum": "371e2a35be083b27fd6babd762a05c29", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -1630,8 +1630,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -1639,8 +1639,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -1773,20 +1773,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200211@b2a79ec0": { - "id": "@opam/menhirSdk@opam:20200211@b2a79ec0", + "@opam/menhirSdk@opam:20200525@6baf7403": { + "id": "@opam/menhirSdk@opam:20200525@6baf7403", "name": "@opam/menhirSdk", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirSdk", - "version": "20200211", - "path": "esy.lock/opam/menhirSdk.20200211" + "version": "20200525", + "path": "esy.lock/opam/menhirSdk.20200525" } }, "overrides": [], @@ -1798,20 +1798,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200211@93d0f001": { - "id": "@opam/menhirLib@opam:20200211@93d0f001", + "@opam/menhirLib@opam:20200525@f9abf308": { + "id": "@opam/menhirLib@opam:20200525@f9abf308", "name": "@opam/menhirLib", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirLib", - "version": "20200211", - "path": "esy.lock/opam/menhirLib.20200211" + "version": "20200525", + "path": "esy.lock/opam/menhirLib.20200525" } }, "overrides": [], @@ -1823,37 +1823,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200211@26571604": { - "id": "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337": { + "id": "@opam/menhir@opam:20200525@f6934337", "name": "@opam/menhir", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhir", - "version": "20200211", - "path": "esy.lock/opam/menhir.20200211" + "version": "20200525", + "path": "esy.lock/opam/menhir.20200525" } }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2410,20 +2404,20 @@ "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/dune-build-info@opam:2.5.1@921e5578": { - "id": "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/dune-build-info@opam:2.6.0@5e86a779": { + "id": "@opam/dune-build-info@opam:2.6.0@5e86a779", "name": "@opam/dune-build-info", - "version": "opam:2.5.1", + "version": "opam:2.6.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/8f/8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b", - "archive:https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" + "archive:https://opam.ocaml.org/cache/sha256/12/12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3", + "archive:https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" ], "opam": { "name": "dune-build-info", - "version": "2.5.1", - "path": "esy.lock/opam/dune-build-info.2.5.1" + "version": "2.6.0", + "path": "esy.lock/opam/dune-build-info.2.6.0" } }, "overrides": [], @@ -2965,13 +2959,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -3081,7 +3075,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.5@675b1611", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/esy.lock/opam/dune-build-info.2.5.1/opam b/esy.lock/opam/dune-build-info.2.6.0/opam similarity index 75% rename from esy.lock/opam/dune-build-info.2.5.1/opam rename to esy.lock/opam/dune-build-info.2.6.0/opam index c833ebbbb..bdb96f0b2 100644 --- a/esy.lock/opam/dune-build-info.2.5.1/opam +++ b/esy.lock/opam/dune-build-info.2.6.0/opam @@ -15,7 +15,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.3"} + "dune" {>= "2.6"} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ @@ -32,9 +32,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz" checksum: [ - "sha256=8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" - "sha512=f209f12ced10c1abf8782bdb0143f4cec77795f7174d2cc75130afb1e01550b01f2f77b9e3ec4888efdad83d2f9878d179b39126f824f4e522f3ef4da34bf27e" + "sha256=12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" + "sha512=de808537e471ef5a4ca49f68bfaf99d36441b5d30bc66712467a636e7bf69ea825e30286d882dac4e18a36c3eae45a80c3407d86255484c76570f771d84ce8b5" ] } diff --git a/esy.lock/opam/menhir.20200211/opam b/esy.lock/opam/menhir.20200525/opam similarity index 66% rename from esy.lock/opam/menhir.20200211/opam rename to esy.lock/opam/menhir.20200525/opam index f1f18fcf4..64b0d86ab 100644 --- a/esy.lock/opam/menhir.20200211/opam +++ b/esy.lock/opam/menhir.20200525/opam @@ -12,16 +12,16 @@ build: [ ] depends: [ "ocaml" {>= "4.02.3"} - "dune" {>= "2.2.0"} + "dune" { >= "2.2.0"} "menhirLib" {= version} "menhirSdk" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/bench.esy.lock/opam/menhirLib.20200211/opam b/esy.lock/opam/menhirLib.20200525/opam similarity index 64% rename from bench.esy.lock/opam/menhirLib.20200211/opam rename to esy.lock/opam/menhirLib.20200525/opam index a65ef4458..42f6fcd92 100644 --- a/bench.esy.lock/opam/menhirLib.20200211/opam +++ b/esy.lock/opam/menhirLib.20200525/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/examples.esy.lock/opam/menhirSdk.20200211/opam b/esy.lock/opam/menhirSdk.20200525/opam similarity index 64% rename from examples.esy.lock/opam/menhirSdk.20200211/opam rename to esy.lock/opam/menhirSdk.20200525/opam index d82cffe48..a28801d70 100644 --- a/examples.esy.lock/opam/menhirSdk.20200211/opam +++ b/esy.lock/opam/menhirSdk.20200525/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json deleted file mode 100644 index 6882a3853..000000000 --- a/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@opam/fix": "*" - } -} diff --git a/examples.esy.lock/index.json b/examples.esy.lock/index.json index da84a2f56..cda6d9e53 100644 --- a/examples.esy.lock/index.json +++ b/examples.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "e1f9a327c7a8829965c9b84f337ae943", + "checksum": "371e2a35be083b27fd6babd762a05c29", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -1630,8 +1630,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -1639,8 +1639,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -1773,20 +1773,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200211@b2a79ec0": { - "id": "@opam/menhirSdk@opam:20200211@b2a79ec0", + "@opam/menhirSdk@opam:20200525@6baf7403": { + "id": "@opam/menhirSdk@opam:20200525@6baf7403", "name": "@opam/menhirSdk", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirSdk", - "version": "20200211", - "path": "examples.esy.lock/opam/menhirSdk.20200211" + "version": "20200525", + "path": "examples.esy.lock/opam/menhirSdk.20200525" } }, "overrides": [], @@ -1798,20 +1798,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200211@93d0f001": { - "id": "@opam/menhirLib@opam:20200211@93d0f001", + "@opam/menhirLib@opam:20200525@f9abf308": { + "id": "@opam/menhirLib@opam:20200525@f9abf308", "name": "@opam/menhirLib", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirLib", - "version": "20200211", - "path": "examples.esy.lock/opam/menhirLib.20200211" + "version": "20200525", + "path": "examples.esy.lock/opam/menhirLib.20200525" } }, "overrides": [], @@ -1823,37 +1823,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200211@26571604": { - "id": "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337": { + "id": "@opam/menhir@opam:20200525@f6934337", "name": "@opam/menhir", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhir", - "version": "20200211", - "path": "examples.esy.lock/opam/menhir.20200211" + "version": "20200525", + "path": "examples.esy.lock/opam/menhir.20200525" } }, - "overrides": [ - { - "opamoverride": - "examples.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2410,20 +2404,20 @@ "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/dune-build-info@opam:2.5.1@921e5578": { - "id": "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/dune-build-info@opam:2.6.0@5e86a779": { + "id": "@opam/dune-build-info@opam:2.6.0@5e86a779", "name": "@opam/dune-build-info", - "version": "opam:2.5.1", + "version": "opam:2.6.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/8f/8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b", - "archive:https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" + "archive:https://opam.ocaml.org/cache/sha256/12/12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3", + "archive:https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" ], "opam": { "name": "dune-build-info", - "version": "2.5.1", - "path": "examples.esy.lock/opam/dune-build-info.2.5.1" + "version": "2.6.0", + "path": "examples.esy.lock/opam/dune-build-info.2.6.0" } }, "overrides": [], @@ -2965,13 +2959,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -3081,7 +3075,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.5@675b1611", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/examples.esy.lock/opam/dune-build-info.2.5.1/opam b/examples.esy.lock/opam/dune-build-info.2.6.0/opam similarity index 75% rename from examples.esy.lock/opam/dune-build-info.2.5.1/opam rename to examples.esy.lock/opam/dune-build-info.2.6.0/opam index c833ebbbb..bdb96f0b2 100644 --- a/examples.esy.lock/opam/dune-build-info.2.5.1/opam +++ b/examples.esy.lock/opam/dune-build-info.2.6.0/opam @@ -15,7 +15,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.3"} + "dune" {>= "2.6"} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ @@ -32,9 +32,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz" checksum: [ - "sha256=8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" - "sha512=f209f12ced10c1abf8782bdb0143f4cec77795f7174d2cc75130afb1e01550b01f2f77b9e3ec4888efdad83d2f9878d179b39126f824f4e522f3ef4da34bf27e" + "sha256=12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" + "sha512=de808537e471ef5a4ca49f68bfaf99d36441b5d30bc66712467a636e7bf69ea825e30286d882dac4e18a36c3eae45a80c3407d86255484c76570f771d84ce8b5" ] } diff --git a/examples.esy.lock/opam/menhir.20200211/opam b/examples.esy.lock/opam/menhir.20200525/opam similarity index 66% rename from examples.esy.lock/opam/menhir.20200211/opam rename to examples.esy.lock/opam/menhir.20200525/opam index f1f18fcf4..64b0d86ab 100644 --- a/examples.esy.lock/opam/menhir.20200211/opam +++ b/examples.esy.lock/opam/menhir.20200525/opam @@ -12,16 +12,16 @@ build: [ ] depends: [ "ocaml" {>= "4.02.3"} - "dune" {>= "2.2.0"} + "dune" { >= "2.2.0"} "menhirLib" {= version} "menhirSdk" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/examples.esy.lock/opam/menhirLib.20200211/opam b/examples.esy.lock/opam/menhirLib.20200525/opam similarity index 64% rename from examples.esy.lock/opam/menhirLib.20200211/opam rename to examples.esy.lock/opam/menhirLib.20200525/opam index a65ef4458..42f6fcd92 100644 --- a/examples.esy.lock/opam/menhirLib.20200211/opam +++ b/examples.esy.lock/opam/menhirLib.20200525/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/bench.esy.lock/opam/menhirSdk.20200211/opam b/examples.esy.lock/opam/menhirSdk.20200525/opam similarity index 64% rename from bench.esy.lock/opam/menhirSdk.20200211/opam rename to examples.esy.lock/opam/menhirSdk.20200525/opam index d82cffe48..a28801d70 100644 --- a/bench.esy.lock/opam/menhirSdk.20200211/opam +++ b/examples.esy.lock/opam/menhirSdk.20200525/opam @@ -11,8 +11,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.0.0"} + "ocaml" { >= "4.02.3" } + "dune" { >= "2.0.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" ] } diff --git a/examples.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/examples.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json deleted file mode 100644 index 6882a3853..000000000 --- a/examples.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@opam/fix": "*" - } -} diff --git a/js.esy.lock/index.json b/js.esy.lock/index.json index be24f73bb..f8fb78a41 100644 --- a/js.esy.lock/index.json +++ b/js.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "9af1052ed8ac4356f28e022f71263c09", + "checksum": "4b32afb80ac0bb90df0619e33bb7a556", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -1974,8 +1974,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -1983,8 +1983,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2117,20 +2117,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200211@b2a79ec0": { - "id": "@opam/menhirSdk@opam:20200211@b2a79ec0", + "@opam/menhirSdk@opam:20200525@6baf7403": { + "id": "@opam/menhirSdk@opam:20200525@6baf7403", "name": "@opam/menhirSdk", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirSdk", - "version": "20200211", - "path": "js.esy.lock/opam/menhirSdk.20200211" + "version": "20200525", + "path": "js.esy.lock/opam/menhirSdk.20200525" } }, "overrides": [], @@ -2142,20 +2142,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200211@93d0f001": { - "id": "@opam/menhirLib@opam:20200211@93d0f001", + "@opam/menhirLib@opam:20200525@f9abf308": { + "id": "@opam/menhirLib@opam:20200525@f9abf308", "name": "@opam/menhirLib", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirLib", - "version": "20200211", - "path": "js.esy.lock/opam/menhirLib.20200211" + "version": "20200525", + "path": "js.esy.lock/opam/menhirLib.20200525" } }, "overrides": [], @@ -2167,37 +2167,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200211@26571604": { - "id": "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337": { + "id": "@opam/menhir@opam:20200525@f6934337", "name": "@opam/menhir", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhir", - "version": "20200211", - "path": "js.esy.lock/opam/menhir.20200211" + "version": "20200525", + "path": "js.esy.lock/opam/menhir.20200525" } }, - "overrides": [ - { - "opamoverride": - "js.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2885,20 +2879,20 @@ "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/dune-build-info@opam:2.5.1@921e5578": { - "id": "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/dune-build-info@opam:2.6.0@5e86a779": { + "id": "@opam/dune-build-info@opam:2.6.0@5e86a779", "name": "@opam/dune-build-info", - "version": "opam:2.5.1", + "version": "opam:2.6.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/8f/8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b", - "archive:https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" + "archive:https://opam.ocaml.org/cache/sha256/12/12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3", + "archive:https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" ], "opam": { "name": "dune-build-info", - "version": "2.5.1", - "path": "js.esy.lock/opam/dune-build-info.2.5.1" + "version": "2.6.0", + "path": "js.esy.lock/opam/dune-build-info.2.6.0" } }, "overrides": [], @@ -3462,13 +3456,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -3578,7 +3572,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.4@b8e822d0", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/js.esy.lock/opam/dune-build-info.2.5.1/opam b/js.esy.lock/opam/dune-build-info.2.5.1/opam deleted file mode 100644 index c833ebbbb..000000000 --- a/js.esy.lock/opam/dune-build-info.2.5.1/opam +++ /dev/null @@ -1,40 +0,0 @@ -opam-version: "2.0" -synopsis: "Embed build informations inside executable" -description: """ -The build-info library allows to access information about how the -executable was built, such as the version of the project at which it -was built or the list of statically linked libraries with their -versions. It supports reporting the version from the version control -system during development to get an precise reference of when the -executable was built. -""" -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.3"} -] -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.5.1/dune-2.5.1.tbz" - checksum: [ - "sha256=8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" - "sha512=f209f12ced10c1abf8782bdb0143f4cec77795f7174d2cc75130afb1e01550b01f2f77b9e3ec4888efdad83d2f9878d179b39126f824f4e522f3ef4da34bf27e" - ] -} diff --git a/js.esy.lock/opam/dune-build-info.2.6.0/opam b/js.esy.lock/opam/dune-build-info.2.6.0/opam new file mode 100644 index 000000000..bdb96f0b2 --- /dev/null +++ b/js.esy.lock/opam/dune-build-info.2.6.0/opam @@ -0,0 +1,40 @@ +opam-version: "2.0" +synopsis: "Embed build informations inside executable" +description: """ +The build-info library allows to access information about how the +executable was built, such as the version of the project at which it +was built or the list of statically linked libraries with their +versions. It supports reporting the version from the version control +system during development to get an precise reference of when the +executable was built. +""" +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.6"} +] +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.6.0/dune-2.6.0.tbz" + checksum: [ + "sha256=12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" + "sha512=de808537e471ef5a4ca49f68bfaf99d36441b5d30bc66712467a636e7bf69ea825e30286d882dac4e18a36c3eae45a80c3407d86255484c76570f771d84ce8b5" + ] +} diff --git a/js.esy.lock/opam/menhir.20200211/opam b/js.esy.lock/opam/menhir.20200211/opam deleted file mode 100644 index f1f18fcf4..000000000 --- a/js.esy.lock/opam/menhir.20200211/opam +++ /dev/null @@ -1,27 +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: [ - ["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/20200211/archive.tar.gz" - checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" - ] -} diff --git a/js.esy.lock/opam/menhir.20200525/opam b/js.esy.lock/opam/menhir.20200525/opam new file mode 100644 index 000000000..64b0d86ab --- /dev/null +++ b/js.esy.lock/opam/menhir.20200525/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/20200525/archive.tar.gz" + checksum: [ + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + ] +} diff --git a/js.esy.lock/opam/menhirLib.20200211/opam b/js.esy.lock/opam/menhirLib.20200211/opam deleted file mode 100644 index a65ef4458..000000000 --- a/js.esy.lock/opam/menhirLib.20200211/opam +++ /dev/null @@ -1,28 +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: [ - ["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/20200211/archive.tar.gz" - checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" - ] -} diff --git a/js.esy.lock/opam/menhirLib.20200525/opam b/js.esy.lock/opam/menhirLib.20200525/opam new file mode 100644 index 000000000..42f6fcd92 --- /dev/null +++ b/js.esy.lock/opam/menhirLib.20200525/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/20200525/archive.tar.gz" + checksum: [ + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + ] +} diff --git a/js.esy.lock/opam/menhirSdk.20200211/opam b/js.esy.lock/opam/menhirSdk.20200211/opam deleted file mode 100644 index d82cffe48..000000000 --- a/js.esy.lock/opam/menhirSdk.20200211/opam +++ /dev/null @@ -1,28 +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: [ - ["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/20200211/archive.tar.gz" - checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" - ] -} diff --git a/js.esy.lock/opam/menhirSdk.20200525/opam b/js.esy.lock/opam/menhirSdk.20200525/opam new file mode 100644 index 000000000..a28801d70 --- /dev/null +++ b/js.esy.lock/opam/menhirSdk.20200525/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/20200525/archive.tar.gz" + checksum: [ + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + ] +} diff --git a/js.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/js.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json deleted file mode 100644 index 6882a3853..000000000 --- a/js.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@opam/fix": "*" - } -} diff --git a/package.json b/package.json index 0e7225e91..55aefae3f 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,9 @@ "@glennsl/timber": "^1.2.0" }, "resolutions": { - "@opam/dune": "2.5.0" + "@opam/dune": "2.5.0", + "@opam/dune-configurator": "2.5.1", + "@opam/dune-private-libs": "2.5.1" }, "devDependencies": { "ocaml": "~4.10", diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json index 10f8d493b..eb69220f8 100644 --- a/test.esy.lock/index.json +++ b/test.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "ab12d1c94c35171a025b62be292c431f", + "checksum": "5815cc86de284bfb0af1f7162e796f93", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -1631,8 +1631,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -1640,8 +1640,8 @@ "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/menhir@opam:20200211@26571604", - "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/menhir@opam:20200525@f6934337", + "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -1774,20 +1774,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200211@b2a79ec0": { - "id": "@opam/menhirSdk@opam:20200211@b2a79ec0", + "@opam/menhirSdk@opam:20200525@6baf7403": { + "id": "@opam/menhirSdk@opam:20200525@6baf7403", "name": "@opam/menhirSdk", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirSdk", - "version": "20200211", - "path": "test.esy.lock/opam/menhirSdk.20200211" + "version": "20200525", + "path": "test.esy.lock/opam/menhirSdk.20200525" } }, "overrides": [], @@ -1799,20 +1799,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200211@93d0f001": { - "id": "@opam/menhirLib@opam:20200211@93d0f001", + "@opam/menhirLib@opam:20200525@f9abf308": { + "id": "@opam/menhirLib@opam:20200525@f9abf308", "name": "@opam/menhirLib", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhirLib", - "version": "20200211", - "path": "test.esy.lock/opam/menhirLib.20200211" + "version": "20200525", + "path": "test.esy.lock/opam/menhirLib.20200525" } }, "overrides": [], @@ -1824,37 +1824,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200211@26571604": { - "id": "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337": { + "id": "@opam/menhir@opam:20200525@f6934337", "name": "@opam/menhir", - "version": "opam:20200211", + "version": "opam:20200525", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/01/01577e5f15380c35bdaa8fd818204560#md5:01577e5f15380c35bdaa8fd818204560", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200211/archive.tar.gz#md5:01577e5f15380c35bdaa8fd818204560" + "archive:https://opam.ocaml.org/cache/md5/38/382b76757ae8343f42bca7de3bd70efb#md5:382b76757ae8343f42bca7de3bd70efb", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz#md5:382b76757ae8343f42bca7de3bd70efb" ], "opam": { "name": "menhir", - "version": "20200211", - "path": "test.esy.lock/opam/menhir.20200211" + "version": "20200525", + "path": "test.esy.lock/opam/menhir.20200525" } }, - "overrides": [ - { - "opamoverride": - "test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", - "@opam/menhirLib@opam:20200211@93d0f001", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirLib@opam:20200525@f9abf308", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2411,20 +2405,20 @@ "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/dune-build-info@opam:2.5.1@921e5578": { - "id": "@opam/dune-build-info@opam:2.5.1@921e5578", + "@opam/dune-build-info@opam:2.6.0@5e86a779": { + "id": "@opam/dune-build-info@opam:2.6.0@5e86a779", "name": "@opam/dune-build-info", - "version": "opam:2.5.1", + "version": "opam:2.6.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/8f/8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b", - "archive:https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" + "archive:https://opam.ocaml.org/cache/sha256/12/12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3", + "archive:https://github.com/ocaml/dune/releases/download/2.6.0/dune-2.6.0.tbz#sha256:12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" ], "opam": { "name": "dune-build-info", - "version": "2.5.1", - "path": "test.esy.lock/opam/dune-build-info.2.5.1" + "version": "2.6.0", + "path": "test.esy.lock/opam/dune-build-info.2.6.0" } }, "overrides": [], @@ -2966,13 +2960,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -3082,7 +3076,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.5@675b1611", - "@opam/menhir@opam:20200211@26571604", + "@opam/menhir@opam:20200525@f6934337", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/test.esy.lock/opam/dune-build-info.2.5.1/opam b/test.esy.lock/opam/dune-build-info.2.5.1/opam deleted file mode 100644 index c833ebbbb..000000000 --- a/test.esy.lock/opam/dune-build-info.2.5.1/opam +++ /dev/null @@ -1,40 +0,0 @@ -opam-version: "2.0" -synopsis: "Embed build informations inside executable" -description: """ -The build-info library allows to access information about how the -executable was built, such as the version of the project at which it -was built or the list of statically linked libraries with their -versions. It supports reporting the version from the version control -system during development to get an precise reference of when the -executable was built. -""" -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.3"} -] -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.5.1/dune-2.5.1.tbz" - checksum: [ - "sha256=8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" - "sha512=f209f12ced10c1abf8782bdb0143f4cec77795f7174d2cc75130afb1e01550b01f2f77b9e3ec4888efdad83d2f9878d179b39126f824f4e522f3ef4da34bf27e" - ] -} diff --git a/test.esy.lock/opam/dune-build-info.2.6.0/opam b/test.esy.lock/opam/dune-build-info.2.6.0/opam new file mode 100644 index 000000000..bdb96f0b2 --- /dev/null +++ b/test.esy.lock/opam/dune-build-info.2.6.0/opam @@ -0,0 +1,40 @@ +opam-version: "2.0" +synopsis: "Embed build informations inside executable" +description: """ +The build-info library allows to access information about how the +executable was built, such as the version of the project at which it +was built or the list of statically linked libraries with their +versions. It supports reporting the version from the version control +system during development to get an precise reference of when the +executable was built. +""" +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.6"} +] +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.6.0/dune-2.6.0.tbz" + checksum: [ + "sha256=12c9d849fbc5f202f99e9f8ed13fdff7de85ae9c5206cb1b821763dcd1916fc3" + "sha512=de808537e471ef5a4ca49f68bfaf99d36441b5d30bc66712467a636e7bf69ea825e30286d882dac4e18a36c3eae45a80c3407d86255484c76570f771d84ce8b5" + ] +} diff --git a/test.esy.lock/opam/menhir.20200211/opam b/test.esy.lock/opam/menhir.20200211/opam deleted file mode 100644 index f1f18fcf4..000000000 --- a/test.esy.lock/opam/menhir.20200211/opam +++ /dev/null @@ -1,27 +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: [ - ["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/20200211/archive.tar.gz" - checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" - ] -} diff --git a/test.esy.lock/opam/menhir.20200525/opam b/test.esy.lock/opam/menhir.20200525/opam new file mode 100644 index 000000000..64b0d86ab --- /dev/null +++ b/test.esy.lock/opam/menhir.20200525/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/20200525/archive.tar.gz" + checksum: [ + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + ] +} diff --git a/test.esy.lock/opam/menhirLib.20200211/opam b/test.esy.lock/opam/menhirLib.20200211/opam deleted file mode 100644 index a65ef4458..000000000 --- a/test.esy.lock/opam/menhirLib.20200211/opam +++ /dev/null @@ -1,28 +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: [ - ["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/20200211/archive.tar.gz" - checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" - ] -} diff --git a/test.esy.lock/opam/menhirLib.20200525/opam b/test.esy.lock/opam/menhirLib.20200525/opam new file mode 100644 index 000000000..42f6fcd92 --- /dev/null +++ b/test.esy.lock/opam/menhirLib.20200525/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/20200525/archive.tar.gz" + checksum: [ + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + ] +} diff --git a/test.esy.lock/opam/menhirSdk.20200211/opam b/test.esy.lock/opam/menhirSdk.20200211/opam deleted file mode 100644 index d82cffe48..000000000 --- a/test.esy.lock/opam/menhirSdk.20200211/opam +++ /dev/null @@ -1,28 +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: [ - ["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/20200211/archive.tar.gz" - checksum: [ - "md5=01577e5f15380c35bdaa8fd818204560" - "sha512=a686c4b047d5236c425afcd7f179964191268ff448b8d18510579d742a7256855049bc4fe568bb8f1b0d6cbfb758d95cd05e621e3410b75245bb799d623725d6" - ] -} diff --git a/test.esy.lock/opam/menhirSdk.20200525/opam b/test.esy.lock/opam/menhirSdk.20200525/opam new file mode 100644 index 000000000..a28801d70 --- /dev/null +++ b/test.esy.lock/opam/menhirSdk.20200525/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/20200525/archive.tar.gz" + checksum: [ + "md5=382b76757ae8343f42bca7de3bd70efb" + "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + ] +} diff --git a/test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json deleted file mode 100644 index 6882a3853..000000000 --- a/test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@opam/fix": "*" - } -}