From 5ad4a29dfe7ae8ca247cef334af0d664bf69a0aa Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Thu, 25 Jun 2020 19:14:47 +0200 Subject: [PATCH 1/9] build(dep): Update skia. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c3c382bc..a4d243e64 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "esy-freetype2": "^2.9.1007", "esy-harfbuzz": "^1.9.1008", "esy-sdl2": "^2.0.10008", - "esy-skia": "revery-ui/esy-skia#d60e5fe", + "esy-skia": "Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", "fetch-native-lwt": "0.1.0-alpha.5", "flex": "1.2.3", "reperf": "^1.4.0", From 862b0f07e139fe8b8888c67a14040f2b49fc0f25 Mon Sep 17 00:00:00 2001 From: Github Runner Date: Thu, 25 Jun 2020 22:15:25 +0000 Subject: [PATCH 2/9] Update lockdir, --- bench.esy.lock/index.json | 117 +++++++------- .../{astring.0.8.3 => astring.0.8.4}/opam | 29 ++-- bench.esy.lock/opam/charInfo_width.1.1.0/opam | 2 +- .../opam/menhir.20200624}/opam | 6 +- .../opam/menhirLib.20200624}/opam | 6 +- .../opam/menhirSdk.20200624}/opam | 6 +- bench.esy.lock/opam/uri.3.1.0/opam | 2 +- doc.esy.lock/index.json | 149 +++++++++--------- .../{astring.0.8.3 => astring.0.8.4}/opam | 29 ++-- doc.esy.lock/opam/charInfo_width.1.1.0/opam | 2 +- .../opam/menhir.20200624}/opam | 6 +- .../opam/menhirLib.20200624}/opam | 6 +- .../opam | 6 +- .../opam/{odoc.1.5.0 => odoc.1.5.1}/opam | 12 +- doc.esy.lock/opam/uri.3.1.0/opam | 2 +- esy.lock/index.json | 117 +++++++------- .../opam/astring.0.8.4}/opam | 29 ++-- esy.lock/opam/charInfo_width.1.1.0/opam | 2 +- .../{menhir.20200525 => menhir.20200624}/opam | 6 +- .../opam/menhirLib.20200624}/opam | 6 +- .../opam/menhirSdk.20200624}/opam | 6 +- esy.lock/opam/uri.3.1.0/opam | 2 +- examples.esy.lock/index.json | 117 +++++++------- .../opam/astring.0.8.4}/opam | 29 ++-- .../opam/charInfo_width.1.1.0/opam | 2 +- .../{menhir.20200525 => menhir.20200624}/opam | 6 +- .../opam | 6 +- .../opam/menhirSdk.20200624}/opam | 6 +- examples.esy.lock/opam/uri.3.1.0/opam | 2 +- js.esy.lock/index.json | 139 ++++++++-------- js.esy.lock/opam/astring.0.8.3/opam | 38 ----- js.esy.lock/opam/astring.0.8.4/opam | 37 +++++ js.esy.lock/opam/charInfo_width.1.1.0/opam | 2 +- .../opam/js_of_ocaml-compiler.3.6.0/opam | 2 +- js.esy.lock/opam/menhir.20200525/opam | 27 ---- js.esy.lock/opam/menhir.20200624/opam | 27 ++++ js.esy.lock/opam/menhirLib.20200525/opam | 28 ---- js.esy.lock/opam/menhirLib.20200624/opam | 28 ++++ js.esy.lock/opam/menhirSdk.20200525/opam | 28 ---- js.esy.lock/opam/menhirSdk.20200624/opam | 28 ++++ js.esy.lock/opam/uri.3.1.0/opam | 2 +- test.esy.lock/index.json | 117 +++++++------- test.esy.lock/opam/astring.0.8.3/opam | 38 ----- test.esy.lock/opam/astring.0.8.4/opam | 37 +++++ test.esy.lock/opam/charInfo_width.1.1.0/opam | 2 +- test.esy.lock/opam/menhir.20200525/opam | 27 ---- test.esy.lock/opam/menhir.20200624/opam | 27 ++++ test.esy.lock/opam/menhirLib.20200525/opam | 28 ---- test.esy.lock/opam/menhirLib.20200624/opam | 28 ++++ test.esy.lock/opam/menhirSdk.20200525/opam | 28 ---- test.esy.lock/opam/menhirSdk.20200624/opam | 28 ++++ test.esy.lock/opam/uri.3.1.0/opam | 2 +- 52 files changed, 732 insertions(+), 732 deletions(-) rename bench.esy.lock/opam/{astring.0.8.3 => astring.0.8.4}/opam (64%) rename {doc.esy.lock/opam/menhir.20200525 => bench.esy.lock/opam/menhir.20200624}/opam (69%) rename {doc.esy.lock/opam/menhirLib.20200525 => bench.esy.lock/opam/menhirLib.20200624}/opam (70%) rename {esy.lock/opam/menhirSdk.20200525 => bench.esy.lock/opam/menhirSdk.20200624}/opam (70%) rename doc.esy.lock/opam/{astring.0.8.3 => astring.0.8.4}/opam (64%) rename {bench.esy.lock/opam/menhir.20200525 => doc.esy.lock/opam/menhir.20200624}/opam (69%) rename {esy.lock/opam/menhirLib.20200525 => doc.esy.lock/opam/menhirLib.20200624}/opam (70%) rename doc.esy.lock/opam/{menhirSdk.20200525 => menhirSdk.20200624}/opam (70%) rename doc.esy.lock/opam/{odoc.1.5.0 => odoc.1.5.1}/opam (68%) rename {examples.esy.lock/opam/astring.0.8.3 => esy.lock/opam/astring.0.8.4}/opam (64%) rename esy.lock/opam/{menhir.20200525 => menhir.20200624}/opam (69%) rename {bench.esy.lock/opam/menhirLib.20200525 => esy.lock/opam/menhirLib.20200624}/opam (70%) rename {examples.esy.lock/opam/menhirSdk.20200525 => esy.lock/opam/menhirSdk.20200624}/opam (70%) rename {esy.lock/opam/astring.0.8.3 => examples.esy.lock/opam/astring.0.8.4}/opam (64%) rename examples.esy.lock/opam/{menhir.20200525 => menhir.20200624}/opam (69%) rename examples.esy.lock/opam/{menhirLib.20200525 => menhirLib.20200624}/opam (70%) rename {bench.esy.lock/opam/menhirSdk.20200525 => examples.esy.lock/opam/menhirSdk.20200624}/opam (70%) delete mode 100644 js.esy.lock/opam/astring.0.8.3/opam create mode 100644 js.esy.lock/opam/astring.0.8.4/opam delete mode 100644 js.esy.lock/opam/menhir.20200525/opam create mode 100644 js.esy.lock/opam/menhir.20200624/opam delete mode 100644 js.esy.lock/opam/menhirLib.20200525/opam create mode 100644 js.esy.lock/opam/menhirLib.20200624/opam delete mode 100644 js.esy.lock/opam/menhirSdk.20200525/opam create mode 100644 js.esy.lock/opam/menhirSdk.20200624/opam delete mode 100644 test.esy.lock/opam/astring.0.8.3/opam create mode 100644 test.esy.lock/opam/astring.0.8.4/opam delete mode 100644 test.esy.lock/opam/menhir.20200525/opam create mode 100644 test.esy.lock/opam/menhir.20200624/opam delete mode 100644 test.esy.lock/opam/menhirLib.20200525/opam create mode 100644 test.esy.lock/opam/menhirLib.20200624/opam delete mode 100644 test.esy.lock/opam/menhirSdk.20200525/opam create mode 100644 test.esy.lock/opam/menhirSdk.20200624/opam diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json index 3a68c03fe..20bf6332f 100644 --- a/bench.esy.lock/index.json +++ b/bench.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "f20af0222b49c7515aa58b9d48bd1026", + "checksum": "ce311cc411ea1b9846c68a24031a2c9a", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -47,7 +47,7 @@ "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -225,13 +225,17 @@ ], "devDependencies": [] }, - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9": { - "id": "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "id": + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "name": "esy-skia", - "version": "github:revery-ui/esy-skia#d60e5fe", + "version": + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", "source": { "type": "install", - "source": [ "github:revery-ui/esy-skia#d60e5fe" ] + "source": [ + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + ] }, "overrides": [], "dependencies": [ @@ -509,7 +513,7 @@ "@reason-native-web/h2-lwt-unix@0.6.1001@d41d8cd9", "@reason-native-web/h1-lwt-unix@1.2.1001@d41d8cd9", "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7", "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", "@opam/magic-mime@opam:1.1.2@980f82fb", "@opam/lwt@opam:4.5.0@677655b4", "@opam/logs@opam:0.7.0@1d03143e", @@ -749,7 +753,7 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -757,7 +761,7 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -818,8 +822,8 @@ "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, - "@opam/uri@opam:3.1.0@faef85a4": { - "id": "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7": { + "id": "@opam/uri@opam:3.1.0@826aaae7", "name": "@opam/uri", "version": "opam:3.1.0", "source": { @@ -1631,7 +1635,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1640,7 +1644,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -1774,20 +1778,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200525@6baf7403": { - "id": "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirSdk@opam:20200624@2a05b5a7": { + "id": "@opam/menhirSdk@opam:20200624@2a05b5a7", "name": "@opam/menhirSdk", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirSdk", - "version": "20200525", - "path": "bench.esy.lock/opam/menhirSdk.20200525" + "version": "20200624", + "path": "bench.esy.lock/opam/menhirSdk.20200624" } }, "overrides": [], @@ -1799,20 +1803,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200525@f9abf308": { - "id": "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/menhirLib@opam:20200624@8bdd2b0e": { + "id": "@opam/menhirLib@opam:20200624@8bdd2b0e", "name": "@opam/menhirLib", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirLib", - "version": "20200525", - "path": "bench.esy.lock/opam/menhirLib.20200525" + "version": "20200624", + "path": "bench.esy.lock/opam/menhirLib.20200624" } }, "overrides": [], @@ -1824,31 +1828,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200525@f6934337": { - "id": "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13": { + "id": "@opam/menhir@opam:20200624@8629ff13", "name": "@opam/menhir", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhir", - "version": "20200525", - "path": "bench.esy.lock/opam/menhir.20200525" + "version": "20200624", + "path": "bench.esy.lock/opam/menhir.20200624" } }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2207,12 +2211,12 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/fmt@opam:0.8.8@01c3a23c": { @@ -2609,8 +2613,8 @@ ], "devDependencies": [] }, - "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { - "id": "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29": { + "id": "@opam/charInfo_width@opam:1.1.0@b400bb29", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { @@ -2688,7 +2692,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -2696,7 +2700,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -2987,31 +2991,31 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/astring@opam:0.8.3@4e5e17d5": { - "id": "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d": { + "id": "@opam/astring@opam:0.8.4@1215f84d", "name": "@opam/astring", - "version": "opam:0.8.3", + "version": "opam:0.8.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c5/c5bf6352b9ac27fbeab342740f4fa870#md5:c5bf6352b9ac27fbeab342740f4fa870", - "archive:http://erratique.ch/software/astring/releases/astring-0.8.3.tbz#md5:c5bf6352b9ac27fbeab342740f4fa870" + "archive:https://opam.ocaml.org/cache/md5/54/548fcbf501ca4cb816d219ca4f25f660#md5:548fcbf501ca4cb816d219ca4f25f660", + "archive:https://erratique.ch/software/astring/releases/astring-0.8.4.tbz#md5:548fcbf501ca4cb816d219ca4f25f660" ], "opam": { "name": "astring", - "version": "0.8.3", - "path": "bench.esy.lock/opam/astring.0.8.3" + "version": "0.8.4", + "path": "bench.esy.lock/opam/astring.0.8.4" } }, "overrides": [], @@ -3019,12 +3023,9 @@ "ocaml@4.10.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.10.0@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" - ] + "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, "@opam/angstrom@opam:0.14.1@07e286b0": { "id": "@opam/angstrom@opam:0.14.1@07e286b0", @@ -3103,7 +3104,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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/bench.esy.lock/opam/astring.0.8.3/opam b/bench.esy.lock/opam/astring.0.8.4/opam similarity index 64% rename from bench.esy.lock/opam/astring.0.8.3/opam rename to bench.esy.lock/opam/astring.0.8.4/opam index 578ba1fae..7d9ee8e6b 100644 --- a/bench.esy.lock/opam/astring.0.8.3/opam +++ b/bench.esy.lock/opam/astring.0.8.4/opam @@ -1,24 +1,22 @@ opam-version: "2.0" maintainer: "Daniel Bünzli " -authors: ["Daniel Bünzli "] -homepage: "http://erratique.ch/software/astring" -doc: "http://erratique.ch/software/astring/doc" +authors: ["The astring programmers"] +homepage: "https://erratique.ch/software/astring" +doc: "https://erratique.ch/software/astring/doc" dev-repo: "git+http://erratique.ch/repos/astring.git" bug-reports: "https://github.com/dbuenzli/astring/issues" tags: [ "string" "org:erratique" ] license: "ISC" depends: [ - "ocaml" {>= "4.01.0"} + "ocaml" {>= "4.05.0"} "ocamlfind" {build} "ocamlbuild" {build} - "topkg" {build} - "base-bytes" -] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" ]] -synopsis: "Alternative String module for OCaml" -description: """ + "topkg" {build} ] +build: [[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]] + +synopsis: """Alternative String module for OCaml""" +description: """\ + Astring exposes an alternative `String` module for OCaml. This module tries to balance minimality and expressiveness for basic, index-free, string processing and provides types and functions for substrings, @@ -31,8 +29,9 @@ and names, adds a few missing functions and fully exploits OCaml's newfound string immutability. Astring depends only on the OCaml standard library. It is distributed -under the ISC license.""" +under the ISC license. +""" url { - src: "http://erratique.ch/software/astring/releases/astring-0.8.3.tbz" - checksum: "md5=c5bf6352b9ac27fbeab342740f4fa870" +archive: "https://erratique.ch/software/astring/releases/astring-0.8.4.tbz" +checksum: "548fcbf501ca4cb816d219ca4f25f660" } diff --git a/bench.esy.lock/opam/charInfo_width.1.1.0/opam b/bench.esy.lock/opam/charInfo_width.1.1.0/opam index 7c17c9816..dee626092 100644 --- a/bench.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/bench.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.14"} + "ppx_expect" {with-test & < "v0.15"} ] synopsis: "Determine column width for a character" diff --git a/doc.esy.lock/opam/menhir.20200525/opam b/bench.esy.lock/opam/menhir.20200624/opam similarity index 69% rename from doc.esy.lock/opam/menhir.20200525/opam rename to bench.esy.lock/opam/menhir.20200624/opam index 64b0d86ab..37637fcf6 100644 --- a/doc.esy.lock/opam/menhir.20200525/opam +++ b/bench.esy.lock/opam/menhir.20200624/opam @@ -19,9 +19,9 @@ depends: [ synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/doc.esy.lock/opam/menhirLib.20200525/opam b/bench.esy.lock/opam/menhirLib.20200624/opam similarity index 70% rename from doc.esy.lock/opam/menhirLib.20200525/opam rename to bench.esy.lock/opam/menhirLib.20200624/opam index 42f6fcd92..afcbe5d5e 100644 --- a/doc.esy.lock/opam/menhirLib.20200525/opam +++ b/bench.esy.lock/opam/menhirLib.20200624/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/esy.lock/opam/menhirSdk.20200525/opam b/bench.esy.lock/opam/menhirSdk.20200624/opam similarity index 70% rename from esy.lock/opam/menhirSdk.20200525/opam rename to bench.esy.lock/opam/menhirSdk.20200624/opam index a28801d70..af1221633 100644 --- a/esy.lock/opam/menhirSdk.20200525/opam +++ b/bench.esy.lock/opam/menhirSdk.20200624/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/bench.esy.lock/opam/uri.3.1.0/opam b/bench.esy.lock/opam/uri.3.1.0/opam index ba9e9808d..45406b00a 100644 --- a/bench.esy.lock/opam/uri.3.1.0/opam +++ b/bench.esy.lock/opam/uri.3.1.0/opam @@ -16,7 +16,7 @@ depends: [ "ocaml" {>= "4.04.0"} "dune" {>= "1.2.0"} "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.14"} + "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} "re" {>= "1.9.0"} "stringext" {>= "1.4.0"} ] diff --git a/doc.esy.lock/index.json b/doc.esy.lock/index.json index 42ad8575b..847716806 100644 --- a/doc.esy.lock/index.json +++ b/doc.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "64beb0b692f1e2dd5c7cba92a3781686", + "checksum": "b0f0ab63325c9923015999637ea67ae1", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -90,12 +90,12 @@ "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "http-server@0.12.3@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/omd@github:ocaml/omd:omd.opam#1535e3c@d41d8cd9", - "@opam/odoc@opam:1.5.0@27d69a99", "@opam/markup@opam:0.8.2@87975241", + "@opam/odoc@opam:1.5.1@dae60787", "@opam/markup@opam:0.8.2@87975241", "@opam/lwt_ppx@opam:2.0.1@ab0debb8", "@opam/lwt@opam:4.5.0@677655b4", "@opam/lru@github:bryphe/lru:lru.opam#2708c70@d41d8cd9", "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", @@ -377,7 +377,7 @@ }, "overrides": [], "dependencies": [ - "requires-port@1.0.0@d41d8cd9", "follow-redirects@1.11.0@d41d8cd9", + "requires-port@1.0.0@d41d8cd9", "follow-redirects@1.12.1@d41d8cd9", "eventemitter3@4.0.4@d41d8cd9" ], "devDependencies": [] @@ -396,18 +396,18 @@ "dependencies": [], "devDependencies": [] }, - "follow-redirects@1.11.0@d41d8cd9": { - "id": "follow-redirects@1.11.0@d41d8cd9", + "follow-redirects@1.12.1@d41d8cd9": { + "id": "follow-redirects@1.12.1@d41d8cd9", "name": "follow-redirects", - "version": "1.11.0", + "version": "1.12.1", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz#sha1:afa14f08ba12a52963140fe43212658897bc0ecb" + "archive:https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz#sha1:de54a6205311b93d60398ebc01cf7015682312b6" ] }, "overrides": [], - "dependencies": [ "debug@3.2.6@d41d8cd9" ], + "dependencies": [], "devDependencies": [] }, "flex@1.2.3@d41d8cd9": { @@ -476,13 +476,17 @@ "dependencies": [], "devDependencies": [] }, - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9": { - "id": "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "id": + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "name": "esy-skia", - "version": "github:revery-ui/esy-skia#d60e5fe", + "version": + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", "source": { "type": "install", - "source": [ "github:revery-ui/esy-skia#d60e5fe" ] + "source": [ + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + ] }, "overrides": [], "dependencies": [ @@ -847,7 +851,7 @@ "@reason-native-web/h2-lwt-unix@0.6.1001@d41d8cd9", "@reason-native-web/h1-lwt-unix@1.2.1001@d41d8cd9", "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7", "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", "@opam/magic-mime@opam:1.1.2@980f82fb", "@opam/lwt@opam:4.5.0@677655b4", "@opam/logs@opam:0.7.0@1d03143e", @@ -1087,7 +1091,7 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1095,7 +1099,7 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -1157,8 +1161,8 @@ "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, - "@opam/uri@opam:3.1.0@faef85a4": { - "id": "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7": { + "id": "@opam/uri@opam:3.1.0@826aaae7", "name": "@opam/uri", "version": "opam:3.1.0", "source": { @@ -1815,20 +1819,20 @@ "@opam/base-bigarray@opam:base@b03491b0" ] }, - "@opam/odoc@opam:1.5.0@27d69a99": { - "id": "@opam/odoc@opam:1.5.0@27d69a99", + "@opam/odoc@opam:1.5.1@dae60787": { + "id": "@opam/odoc@opam:1.5.1@dae60787", "name": "@opam/odoc", - "version": "opam:1.5.0", + "version": "opam:1.5.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/85/857759be968070bfda208add3ae2c2bc87826ca2bfc39cebab1cc1e13db7a140#sha256:857759be968070bfda208add3ae2c2bc87826ca2bfc39cebab1cc1e13db7a140", - "archive:https://github.com/ocaml/odoc/releases/download/1.5.0/odoc-1.5.0.tbz#sha256:857759be968070bfda208add3ae2c2bc87826ca2bfc39cebab1cc1e13db7a140" + "archive:https://opam.ocaml.org/cache/sha256/ea/ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f", + "archive:https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f" ], "opam": { "name": "odoc", - "version": "1.5.0", - "path": "doc.esy.lock/opam/odoc.1.5.0" + "version": "1.5.1", + "path": "doc.esy.lock/opam/odoc.1.5.1" } }, "overrides": [], @@ -1837,7 +1841,7 @@ "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/cmdliner@opam:1.0.4@93208aac", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -1845,7 +1849,7 @@ "@opam/result@opam:1.5@6b753c82", "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.5.0@aef1678b", "@opam/cmdliner@opam:1.0.4@93208aac", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/ocplib-endian@opam:1.1@84c1ca88": { @@ -2003,7 +2007,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -2012,7 +2016,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -2146,20 +2150,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200525@6baf7403": { - "id": "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirSdk@opam:20200624@2a05b5a7": { + "id": "@opam/menhirSdk@opam:20200624@2a05b5a7", "name": "@opam/menhirSdk", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirSdk", - "version": "20200525", - "path": "doc.esy.lock/opam/menhirSdk.20200525" + "version": "20200624", + "path": "doc.esy.lock/opam/menhirSdk.20200624" } }, "overrides": [], @@ -2171,20 +2175,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200525@f9abf308": { - "id": "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/menhirLib@opam:20200624@8bdd2b0e": { + "id": "@opam/menhirLib@opam:20200624@8bdd2b0e", "name": "@opam/menhirLib", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirLib", - "version": "20200525", - "path": "doc.esy.lock/opam/menhirLib.20200525" + "version": "20200624", + "path": "doc.esy.lock/opam/menhirLib.20200624" } }, "overrides": [], @@ -2196,31 +2200,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200525@f6934337": { - "id": "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13": { + "id": "@opam/menhir@opam:20200624@8629ff13", "name": "@opam/menhir", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhir", - "version": "20200525", - "path": "doc.esy.lock/opam/menhir.20200525" + "version": "20200624", + "path": "doc.esy.lock/opam/menhir.20200624" } }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2580,12 +2584,12 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/fmt@opam:0.8.8@01c3a23c": { @@ -3005,8 +3009,8 @@ ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, - "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { - "id": "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29": { + "id": "@opam/charInfo_width@opam:1.1.0@b400bb29", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { @@ -3084,7 +3088,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -3092,7 +3096,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -3383,31 +3387,31 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/astring@opam:0.8.3@4e5e17d5": { - "id": "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d": { + "id": "@opam/astring@opam:0.8.4@1215f84d", "name": "@opam/astring", - "version": "opam:0.8.3", + "version": "opam:0.8.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c5/c5bf6352b9ac27fbeab342740f4fa870#md5:c5bf6352b9ac27fbeab342740f4fa870", - "archive:http://erratique.ch/software/astring/releases/astring-0.8.3.tbz#md5:c5bf6352b9ac27fbeab342740f4fa870" + "archive:https://opam.ocaml.org/cache/md5/54/548fcbf501ca4cb816d219ca4f25f660#md5:548fcbf501ca4cb816d219ca4f25f660", + "archive:https://erratique.ch/software/astring/releases/astring-0.8.4.tbz#md5:548fcbf501ca4cb816d219ca4f25f660" ], "opam": { "name": "astring", - "version": "0.8.3", - "path": "doc.esy.lock/opam/astring.0.8.3" + "version": "0.8.4", + "path": "doc.esy.lock/opam/astring.0.8.4" } }, "overrides": [], @@ -3415,12 +3419,9 @@ "ocaml@4.10.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.10.0@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" - ] + "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, "@opam/angstrom@opam:0.14.1@07e286b0": { "id": "@opam/angstrom@opam:0.14.1@07e286b0", @@ -3499,7 +3500,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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/doc.esy.lock/opam/astring.0.8.3/opam b/doc.esy.lock/opam/astring.0.8.4/opam similarity index 64% rename from doc.esy.lock/opam/astring.0.8.3/opam rename to doc.esy.lock/opam/astring.0.8.4/opam index 578ba1fae..7d9ee8e6b 100644 --- a/doc.esy.lock/opam/astring.0.8.3/opam +++ b/doc.esy.lock/opam/astring.0.8.4/opam @@ -1,24 +1,22 @@ opam-version: "2.0" maintainer: "Daniel Bünzli " -authors: ["Daniel Bünzli "] -homepage: "http://erratique.ch/software/astring" -doc: "http://erratique.ch/software/astring/doc" +authors: ["The astring programmers"] +homepage: "https://erratique.ch/software/astring" +doc: "https://erratique.ch/software/astring/doc" dev-repo: "git+http://erratique.ch/repos/astring.git" bug-reports: "https://github.com/dbuenzli/astring/issues" tags: [ "string" "org:erratique" ] license: "ISC" depends: [ - "ocaml" {>= "4.01.0"} + "ocaml" {>= "4.05.0"} "ocamlfind" {build} "ocamlbuild" {build} - "topkg" {build} - "base-bytes" -] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" ]] -synopsis: "Alternative String module for OCaml" -description: """ + "topkg" {build} ] +build: [[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]] + +synopsis: """Alternative String module for OCaml""" +description: """\ + Astring exposes an alternative `String` module for OCaml. This module tries to balance minimality and expressiveness for basic, index-free, string processing and provides types and functions for substrings, @@ -31,8 +29,9 @@ and names, adds a few missing functions and fully exploits OCaml's newfound string immutability. Astring depends only on the OCaml standard library. It is distributed -under the ISC license.""" +under the ISC license. +""" url { - src: "http://erratique.ch/software/astring/releases/astring-0.8.3.tbz" - checksum: "md5=c5bf6352b9ac27fbeab342740f4fa870" +archive: "https://erratique.ch/software/astring/releases/astring-0.8.4.tbz" +checksum: "548fcbf501ca4cb816d219ca4f25f660" } diff --git a/doc.esy.lock/opam/charInfo_width.1.1.0/opam b/doc.esy.lock/opam/charInfo_width.1.1.0/opam index 7c17c9816..dee626092 100644 --- a/doc.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/doc.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.14"} + "ppx_expect" {with-test & < "v0.15"} ] synopsis: "Determine column width for a character" diff --git a/bench.esy.lock/opam/menhir.20200525/opam b/doc.esy.lock/opam/menhir.20200624/opam similarity index 69% rename from bench.esy.lock/opam/menhir.20200525/opam rename to doc.esy.lock/opam/menhir.20200624/opam index 64b0d86ab..37637fcf6 100644 --- a/bench.esy.lock/opam/menhir.20200525/opam +++ b/doc.esy.lock/opam/menhir.20200624/opam @@ -19,9 +19,9 @@ depends: [ synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/esy.lock/opam/menhirLib.20200525/opam b/doc.esy.lock/opam/menhirLib.20200624/opam similarity index 70% rename from esy.lock/opam/menhirLib.20200525/opam rename to doc.esy.lock/opam/menhirLib.20200624/opam index 42f6fcd92..afcbe5d5e 100644 --- a/esy.lock/opam/menhirLib.20200525/opam +++ b/doc.esy.lock/opam/menhirLib.20200624/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/doc.esy.lock/opam/menhirSdk.20200525/opam b/doc.esy.lock/opam/menhirSdk.20200624/opam similarity index 70% rename from doc.esy.lock/opam/menhirSdk.20200525/opam rename to doc.esy.lock/opam/menhirSdk.20200624/opam index a28801d70..af1221633 100644 --- a/doc.esy.lock/opam/menhirSdk.20200525/opam +++ b/doc.esy.lock/opam/menhirSdk.20200624/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/doc.esy.lock/opam/odoc.1.5.0/opam b/doc.esy.lock/opam/odoc.1.5.1/opam similarity index 68% rename from doc.esy.lock/opam/odoc.1.5.0/opam rename to doc.esy.lock/opam/odoc.1.5.1/opam index 8a8da7d7f..d216fb2fc 100644 --- a/doc.esy.lock/opam/odoc.1.5.0/opam +++ b/doc.esy.lock/opam/odoc.1.5.1/opam @@ -12,7 +12,7 @@ authors: [ "Anton Bachin " "Jon Ludlam " ] -maintainer: "Anton Bachin " +maintainer: "Jon Ludlam " dev-repo: "git+https://github.com/ocaml/odoc.git" synopsis: "OCaml documentation generator" @@ -27,14 +27,14 @@ depends: [ "cppo" {build} "dune" "fpath" - "ocaml" {>= "4.02.0" & < "4.11"} + "ocaml" {>= "4.02.0"} "result" "tyxml" {>= "4.3.0"} "alcotest" {dev & >= "0.8.3"} "markup" {dev & >= "0.8.0"} "ocamlfind" {dev} - "sexplib" {dev & >= "113.33.00" & < "v0.14"} + "sexplib" {dev & >= "113.33.00"} "bisect_ppx" {with-test & >= "1.3.0"} ] @@ -44,9 +44,9 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] url { - src: "https://github.com/ocaml/odoc/releases/download/1.5.0/odoc-1.5.0.tbz" + src: "https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz" checksum: [ - "sha256=857759be968070bfda208add3ae2c2bc87826ca2bfc39cebab1cc1e13db7a140" - "sha512=9573230f6ebd7f95d44a5e34f6de68f6b1b530cc7987402f84532e339498dde702082517066c4db428a334510af625db8055ecd03d91b57dd599fd5b3ac53f49" + "sha256=ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f" + "sha512=b2d12277d61e1e52354128d459d2ad49bea24a4d46db89790769c2843c4b00beaee3ea7d0215211079174c0bd893de6bf52dcbb71e46622728be7491d91058b2" ] } diff --git a/doc.esy.lock/opam/uri.3.1.0/opam b/doc.esy.lock/opam/uri.3.1.0/opam index ba9e9808d..45406b00a 100644 --- a/doc.esy.lock/opam/uri.3.1.0/opam +++ b/doc.esy.lock/opam/uri.3.1.0/opam @@ -16,7 +16,7 @@ depends: [ "ocaml" {>= "4.04.0"} "dune" {>= "1.2.0"} "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.14"} + "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} "re" {>= "1.9.0"} "stringext" {>= "1.4.0"} ] diff --git a/esy.lock/index.json b/esy.lock/index.json index 129ed2b7e..ae18a382d 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "f20af0222b49c7515aa58b9d48bd1026", + "checksum": "ce311cc411ea1b9846c68a24031a2c9a", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -47,7 +47,7 @@ "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -225,13 +225,17 @@ ], "devDependencies": [] }, - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9": { - "id": "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "id": + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "name": "esy-skia", - "version": "github:revery-ui/esy-skia#d60e5fe", + "version": + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", "source": { "type": "install", - "source": [ "github:revery-ui/esy-skia#d60e5fe" ] + "source": [ + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + ] }, "overrides": [], "dependencies": [ @@ -509,7 +513,7 @@ "@reason-native-web/h2-lwt-unix@0.6.1001@d41d8cd9", "@reason-native-web/h1-lwt-unix@1.2.1001@d41d8cd9", "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7", "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", "@opam/magic-mime@opam:1.1.2@980f82fb", "@opam/lwt@opam:4.5.0@677655b4", "@opam/logs@opam:0.7.0@1d03143e", @@ -749,7 +753,7 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -757,7 +761,7 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -818,8 +822,8 @@ "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, - "@opam/uri@opam:3.1.0@faef85a4": { - "id": "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7": { + "id": "@opam/uri@opam:3.1.0@826aaae7", "name": "@opam/uri", "version": "opam:3.1.0", "source": { @@ -1631,7 +1635,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1640,7 +1644,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -1774,20 +1778,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200525@6baf7403": { - "id": "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirSdk@opam:20200624@2a05b5a7": { + "id": "@opam/menhirSdk@opam:20200624@2a05b5a7", "name": "@opam/menhirSdk", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirSdk", - "version": "20200525", - "path": "esy.lock/opam/menhirSdk.20200525" + "version": "20200624", + "path": "esy.lock/opam/menhirSdk.20200624" } }, "overrides": [], @@ -1799,20 +1803,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200525@f9abf308": { - "id": "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/menhirLib@opam:20200624@8bdd2b0e": { + "id": "@opam/menhirLib@opam:20200624@8bdd2b0e", "name": "@opam/menhirLib", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirLib", - "version": "20200525", - "path": "esy.lock/opam/menhirLib.20200525" + "version": "20200624", + "path": "esy.lock/opam/menhirLib.20200624" } }, "overrides": [], @@ -1824,31 +1828,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200525@f6934337": { - "id": "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13": { + "id": "@opam/menhir@opam:20200624@8629ff13", "name": "@opam/menhir", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhir", - "version": "20200525", - "path": "esy.lock/opam/menhir.20200525" + "version": "20200624", + "path": "esy.lock/opam/menhir.20200624" } }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2207,12 +2211,12 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/fmt@opam:0.8.8@01c3a23c": { @@ -2609,8 +2613,8 @@ ], "devDependencies": [] }, - "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { - "id": "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29": { + "id": "@opam/charInfo_width@opam:1.1.0@b400bb29", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { @@ -2688,7 +2692,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -2696,7 +2700,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -2987,31 +2991,31 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/astring@opam:0.8.3@4e5e17d5": { - "id": "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d": { + "id": "@opam/astring@opam:0.8.4@1215f84d", "name": "@opam/astring", - "version": "opam:0.8.3", + "version": "opam:0.8.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c5/c5bf6352b9ac27fbeab342740f4fa870#md5:c5bf6352b9ac27fbeab342740f4fa870", - "archive:http://erratique.ch/software/astring/releases/astring-0.8.3.tbz#md5:c5bf6352b9ac27fbeab342740f4fa870" + "archive:https://opam.ocaml.org/cache/md5/54/548fcbf501ca4cb816d219ca4f25f660#md5:548fcbf501ca4cb816d219ca4f25f660", + "archive:https://erratique.ch/software/astring/releases/astring-0.8.4.tbz#md5:548fcbf501ca4cb816d219ca4f25f660" ], "opam": { "name": "astring", - "version": "0.8.3", - "path": "esy.lock/opam/astring.0.8.3" + "version": "0.8.4", + "path": "esy.lock/opam/astring.0.8.4" } }, "overrides": [], @@ -3019,12 +3023,9 @@ "ocaml@4.10.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.10.0@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" - ] + "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, "@opam/angstrom@opam:0.14.1@07e286b0": { "id": "@opam/angstrom@opam:0.14.1@07e286b0", @@ -3103,7 +3104,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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/examples.esy.lock/opam/astring.0.8.3/opam b/esy.lock/opam/astring.0.8.4/opam similarity index 64% rename from examples.esy.lock/opam/astring.0.8.3/opam rename to esy.lock/opam/astring.0.8.4/opam index 578ba1fae..7d9ee8e6b 100644 --- a/examples.esy.lock/opam/astring.0.8.3/opam +++ b/esy.lock/opam/astring.0.8.4/opam @@ -1,24 +1,22 @@ opam-version: "2.0" maintainer: "Daniel Bünzli " -authors: ["Daniel Bünzli "] -homepage: "http://erratique.ch/software/astring" -doc: "http://erratique.ch/software/astring/doc" +authors: ["The astring programmers"] +homepage: "https://erratique.ch/software/astring" +doc: "https://erratique.ch/software/astring/doc" dev-repo: "git+http://erratique.ch/repos/astring.git" bug-reports: "https://github.com/dbuenzli/astring/issues" tags: [ "string" "org:erratique" ] license: "ISC" depends: [ - "ocaml" {>= "4.01.0"} + "ocaml" {>= "4.05.0"} "ocamlfind" {build} "ocamlbuild" {build} - "topkg" {build} - "base-bytes" -] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" ]] -synopsis: "Alternative String module for OCaml" -description: """ + "topkg" {build} ] +build: [[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]] + +synopsis: """Alternative String module for OCaml""" +description: """\ + Astring exposes an alternative `String` module for OCaml. This module tries to balance minimality and expressiveness for basic, index-free, string processing and provides types and functions for substrings, @@ -31,8 +29,9 @@ and names, adds a few missing functions and fully exploits OCaml's newfound string immutability. Astring depends only on the OCaml standard library. It is distributed -under the ISC license.""" +under the ISC license. +""" url { - src: "http://erratique.ch/software/astring/releases/astring-0.8.3.tbz" - checksum: "md5=c5bf6352b9ac27fbeab342740f4fa870" +archive: "https://erratique.ch/software/astring/releases/astring-0.8.4.tbz" +checksum: "548fcbf501ca4cb816d219ca4f25f660" } diff --git a/esy.lock/opam/charInfo_width.1.1.0/opam b/esy.lock/opam/charInfo_width.1.1.0/opam index 7c17c9816..dee626092 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.14"} + "ppx_expect" {with-test & < "v0.15"} ] synopsis: "Determine column width for a character" diff --git a/esy.lock/opam/menhir.20200525/opam b/esy.lock/opam/menhir.20200624/opam similarity index 69% rename from esy.lock/opam/menhir.20200525/opam rename to esy.lock/opam/menhir.20200624/opam index 64b0d86ab..37637fcf6 100644 --- a/esy.lock/opam/menhir.20200525/opam +++ b/esy.lock/opam/menhir.20200624/opam @@ -19,9 +19,9 @@ depends: [ synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/bench.esy.lock/opam/menhirLib.20200525/opam b/esy.lock/opam/menhirLib.20200624/opam similarity index 70% rename from bench.esy.lock/opam/menhirLib.20200525/opam rename to esy.lock/opam/menhirLib.20200624/opam index 42f6fcd92..afcbe5d5e 100644 --- a/bench.esy.lock/opam/menhirLib.20200525/opam +++ b/esy.lock/opam/menhirLib.20200624/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/examples.esy.lock/opam/menhirSdk.20200525/opam b/esy.lock/opam/menhirSdk.20200624/opam similarity index 70% rename from examples.esy.lock/opam/menhirSdk.20200525/opam rename to esy.lock/opam/menhirSdk.20200624/opam index a28801d70..af1221633 100644 --- a/examples.esy.lock/opam/menhirSdk.20200525/opam +++ b/esy.lock/opam/menhirSdk.20200624/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/esy.lock/opam/uri.3.1.0/opam b/esy.lock/opam/uri.3.1.0/opam index ba9e9808d..45406b00a 100644 --- a/esy.lock/opam/uri.3.1.0/opam +++ b/esy.lock/opam/uri.3.1.0/opam @@ -16,7 +16,7 @@ depends: [ "ocaml" {>= "4.04.0"} "dune" {>= "1.2.0"} "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.14"} + "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} "re" {>= "1.9.0"} "stringext" {>= "1.4.0"} ] diff --git a/examples.esy.lock/index.json b/examples.esy.lock/index.json index fef62a46f..cd49acb3e 100644 --- a/examples.esy.lock/index.json +++ b/examples.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "f20af0222b49c7515aa58b9d48bd1026", + "checksum": "ce311cc411ea1b9846c68a24031a2c9a", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -47,7 +47,7 @@ "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -225,13 +225,17 @@ ], "devDependencies": [] }, - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9": { - "id": "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "id": + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "name": "esy-skia", - "version": "github:revery-ui/esy-skia#d60e5fe", + "version": + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", "source": { "type": "install", - "source": [ "github:revery-ui/esy-skia#d60e5fe" ] + "source": [ + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + ] }, "overrides": [], "dependencies": [ @@ -509,7 +513,7 @@ "@reason-native-web/h2-lwt-unix@0.6.1001@d41d8cd9", "@reason-native-web/h1-lwt-unix@1.2.1001@d41d8cd9", "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7", "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", "@opam/magic-mime@opam:1.1.2@980f82fb", "@opam/lwt@opam:4.5.0@677655b4", "@opam/logs@opam:0.7.0@1d03143e", @@ -749,7 +753,7 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -757,7 +761,7 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -818,8 +822,8 @@ "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, - "@opam/uri@opam:3.1.0@faef85a4": { - "id": "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7": { + "id": "@opam/uri@opam:3.1.0@826aaae7", "name": "@opam/uri", "version": "opam:3.1.0", "source": { @@ -1631,7 +1635,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1640,7 +1644,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -1774,20 +1778,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200525@6baf7403": { - "id": "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirSdk@opam:20200624@2a05b5a7": { + "id": "@opam/menhirSdk@opam:20200624@2a05b5a7", "name": "@opam/menhirSdk", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirSdk", - "version": "20200525", - "path": "examples.esy.lock/opam/menhirSdk.20200525" + "version": "20200624", + "path": "examples.esy.lock/opam/menhirSdk.20200624" } }, "overrides": [], @@ -1799,20 +1803,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200525@f9abf308": { - "id": "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/menhirLib@opam:20200624@8bdd2b0e": { + "id": "@opam/menhirLib@opam:20200624@8bdd2b0e", "name": "@opam/menhirLib", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirLib", - "version": "20200525", - "path": "examples.esy.lock/opam/menhirLib.20200525" + "version": "20200624", + "path": "examples.esy.lock/opam/menhirLib.20200624" } }, "overrides": [], @@ -1824,31 +1828,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200525@f6934337": { - "id": "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13": { + "id": "@opam/menhir@opam:20200624@8629ff13", "name": "@opam/menhir", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhir", - "version": "20200525", - "path": "examples.esy.lock/opam/menhir.20200525" + "version": "20200624", + "path": "examples.esy.lock/opam/menhir.20200624" } }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2207,12 +2211,12 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/fmt@opam:0.8.8@01c3a23c": { @@ -2609,8 +2613,8 @@ ], "devDependencies": [] }, - "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { - "id": "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29": { + "id": "@opam/charInfo_width@opam:1.1.0@b400bb29", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { @@ -2688,7 +2692,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -2696,7 +2700,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -2987,31 +2991,31 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/astring@opam:0.8.3@4e5e17d5": { - "id": "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d": { + "id": "@opam/astring@opam:0.8.4@1215f84d", "name": "@opam/astring", - "version": "opam:0.8.3", + "version": "opam:0.8.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c5/c5bf6352b9ac27fbeab342740f4fa870#md5:c5bf6352b9ac27fbeab342740f4fa870", - "archive:http://erratique.ch/software/astring/releases/astring-0.8.3.tbz#md5:c5bf6352b9ac27fbeab342740f4fa870" + "archive:https://opam.ocaml.org/cache/md5/54/548fcbf501ca4cb816d219ca4f25f660#md5:548fcbf501ca4cb816d219ca4f25f660", + "archive:https://erratique.ch/software/astring/releases/astring-0.8.4.tbz#md5:548fcbf501ca4cb816d219ca4f25f660" ], "opam": { "name": "astring", - "version": "0.8.3", - "path": "examples.esy.lock/opam/astring.0.8.3" + "version": "0.8.4", + "path": "examples.esy.lock/opam/astring.0.8.4" } }, "overrides": [], @@ -3019,12 +3023,9 @@ "ocaml@4.10.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.10.0@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" - ] + "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, "@opam/angstrom@opam:0.14.1@07e286b0": { "id": "@opam/angstrom@opam:0.14.1@07e286b0", @@ -3103,7 +3104,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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/esy.lock/opam/astring.0.8.3/opam b/examples.esy.lock/opam/astring.0.8.4/opam similarity index 64% rename from esy.lock/opam/astring.0.8.3/opam rename to examples.esy.lock/opam/astring.0.8.4/opam index 578ba1fae..7d9ee8e6b 100644 --- a/esy.lock/opam/astring.0.8.3/opam +++ b/examples.esy.lock/opam/astring.0.8.4/opam @@ -1,24 +1,22 @@ opam-version: "2.0" maintainer: "Daniel Bünzli " -authors: ["Daniel Bünzli "] -homepage: "http://erratique.ch/software/astring" -doc: "http://erratique.ch/software/astring/doc" +authors: ["The astring programmers"] +homepage: "https://erratique.ch/software/astring" +doc: "https://erratique.ch/software/astring/doc" dev-repo: "git+http://erratique.ch/repos/astring.git" bug-reports: "https://github.com/dbuenzli/astring/issues" tags: [ "string" "org:erratique" ] license: "ISC" depends: [ - "ocaml" {>= "4.01.0"} + "ocaml" {>= "4.05.0"} "ocamlfind" {build} "ocamlbuild" {build} - "topkg" {build} - "base-bytes" -] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" ]] -synopsis: "Alternative String module for OCaml" -description: """ + "topkg" {build} ] +build: [[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]] + +synopsis: """Alternative String module for OCaml""" +description: """\ + Astring exposes an alternative `String` module for OCaml. This module tries to balance minimality and expressiveness for basic, index-free, string processing and provides types and functions for substrings, @@ -31,8 +29,9 @@ and names, adds a few missing functions and fully exploits OCaml's newfound string immutability. Astring depends only on the OCaml standard library. It is distributed -under the ISC license.""" +under the ISC license. +""" url { - src: "http://erratique.ch/software/astring/releases/astring-0.8.3.tbz" - checksum: "md5=c5bf6352b9ac27fbeab342740f4fa870" +archive: "https://erratique.ch/software/astring/releases/astring-0.8.4.tbz" +checksum: "548fcbf501ca4cb816d219ca4f25f660" } diff --git a/examples.esy.lock/opam/charInfo_width.1.1.0/opam b/examples.esy.lock/opam/charInfo_width.1.1.0/opam index 7c17c9816..dee626092 100644 --- a/examples.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/examples.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.14"} + "ppx_expect" {with-test & < "v0.15"} ] synopsis: "Determine column width for a character" diff --git a/examples.esy.lock/opam/menhir.20200525/opam b/examples.esy.lock/opam/menhir.20200624/opam similarity index 69% rename from examples.esy.lock/opam/menhir.20200525/opam rename to examples.esy.lock/opam/menhir.20200624/opam index 64b0d86ab..37637fcf6 100644 --- a/examples.esy.lock/opam/menhir.20200525/opam +++ b/examples.esy.lock/opam/menhir.20200624/opam @@ -19,9 +19,9 @@ depends: [ synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/examples.esy.lock/opam/menhirLib.20200525/opam b/examples.esy.lock/opam/menhirLib.20200624/opam similarity index 70% rename from examples.esy.lock/opam/menhirLib.20200525/opam rename to examples.esy.lock/opam/menhirLib.20200624/opam index 42f6fcd92..afcbe5d5e 100644 --- a/examples.esy.lock/opam/menhirLib.20200525/opam +++ b/examples.esy.lock/opam/menhirLib.20200624/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/bench.esy.lock/opam/menhirSdk.20200525/opam b/examples.esy.lock/opam/menhirSdk.20200624/opam similarity index 70% rename from bench.esy.lock/opam/menhirSdk.20200525/opam rename to examples.esy.lock/opam/menhirSdk.20200624/opam index a28801d70..af1221633 100644 --- a/bench.esy.lock/opam/menhirSdk.20200525/opam +++ b/examples.esy.lock/opam/menhirSdk.20200624/opam @@ -20,9 +20,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20200525/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz" checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" ] } diff --git a/examples.esy.lock/opam/uri.3.1.0/opam b/examples.esy.lock/opam/uri.3.1.0/opam index ba9e9808d..45406b00a 100644 --- a/examples.esy.lock/opam/uri.3.1.0/opam +++ b/examples.esy.lock/opam/uri.3.1.0/opam @@ -16,7 +16,7 @@ depends: [ "ocaml" {>= "4.04.0"} "dune" {>= "1.2.0"} "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.14"} + "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} "re" {>= "1.9.0"} "stringext" {>= "1.4.0"} ] diff --git a/js.esy.lock/index.json b/js.esy.lock/index.json index 567b66234..f60b68562 100644 --- a/js.esy.lock/index.json +++ b/js.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "ba3b6e8837b45e9ad241e9fbcb9a5c2b", + "checksum": "e24ab8fc51602f8cb8117449a7f1ce1e", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -90,7 +90,7 @@ "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "http-server@0.12.3@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -100,7 +100,7 @@ "@opam/lwt_ppx@opam:2.0.1@ab0debb8", "@opam/lwt@opam:4.5.0@677655b4", "@opam/lru@github:bryphe/lru:lru.opam#2708c70@d41d8cd9", "@opam/js_of_ocaml-lwt@opam:3.6.0@55398700", - "@opam/js_of_ocaml-compiler@opam:3.6.0@8dfa564d", + "@opam/js_of_ocaml-compiler@opam:3.6.0@bda9e5de", "@opam/js_of_ocaml@opam:3.6.0@92f53867", "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", "@opam/dune@opam:2.5.0@aef1678b", @@ -381,7 +381,7 @@ }, "overrides": [], "dependencies": [ - "requires-port@1.0.0@d41d8cd9", "follow-redirects@1.11.0@d41d8cd9", + "requires-port@1.0.0@d41d8cd9", "follow-redirects@1.12.1@d41d8cd9", "eventemitter3@4.0.4@d41d8cd9" ], "devDependencies": [] @@ -400,18 +400,18 @@ "dependencies": [], "devDependencies": [] }, - "follow-redirects@1.11.0@d41d8cd9": { - "id": "follow-redirects@1.11.0@d41d8cd9", + "follow-redirects@1.12.1@d41d8cd9": { + "id": "follow-redirects@1.12.1@d41d8cd9", "name": "follow-redirects", - "version": "1.11.0", + "version": "1.12.1", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz#sha1:afa14f08ba12a52963140fe43212658897bc0ecb" + "archive:https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz#sha1:de54a6205311b93d60398ebc01cf7015682312b6" ] }, "overrides": [], - "dependencies": [ "debug@3.2.6@d41d8cd9" ], + "dependencies": [], "devDependencies": [] }, "flex@1.2.3@d41d8cd9": { @@ -480,13 +480,17 @@ "dependencies": [], "devDependencies": [] }, - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9": { - "id": "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "id": + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "name": "esy-skia", - "version": "github:revery-ui/esy-skia#d60e5fe", + "version": + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", "source": { "type": "install", - "source": [ "github:revery-ui/esy-skia#d60e5fe" ] + "source": [ + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + ] }, "overrides": [], "dependencies": [ @@ -851,7 +855,7 @@ "@reason-native-web/h2-lwt-unix@0.6.1001@d41d8cd9", "@reason-native-web/h1-lwt-unix@1.2.1001@d41d8cd9", "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7", "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", "@opam/magic-mime@opam:1.1.2@980f82fb", "@opam/lwt@opam:4.5.0@677655b4", "@opam/logs@opam:0.7.0@1d03143e", @@ -1091,7 +1095,7 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1099,7 +1103,7 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -1161,8 +1165,8 @@ "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, - "@opam/uri@opam:3.1.0@faef85a4": { - "id": "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7": { + "id": "@opam/uri@opam:3.1.0@826aaae7", "name": "@opam/uri", "version": "opam:3.1.0", "source": { @@ -1975,7 +1979,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1984,7 +1988,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -2118,20 +2122,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200525@6baf7403": { - "id": "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirSdk@opam:20200624@2a05b5a7": { + "id": "@opam/menhirSdk@opam:20200624@2a05b5a7", "name": "@opam/menhirSdk", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirSdk", - "version": "20200525", - "path": "js.esy.lock/opam/menhirSdk.20200525" + "version": "20200624", + "path": "js.esy.lock/opam/menhirSdk.20200624" } }, "overrides": [], @@ -2143,20 +2147,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200525@f9abf308": { - "id": "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/menhirLib@opam:20200624@8bdd2b0e": { + "id": "@opam/menhirLib@opam:20200624@8bdd2b0e", "name": "@opam/menhirLib", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirLib", - "version": "20200525", - "path": "js.esy.lock/opam/menhirLib.20200525" + "version": "20200624", + "path": "js.esy.lock/opam/menhirLib.20200624" } }, "overrides": [], @@ -2168,31 +2172,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200525@f6934337": { - "id": "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13": { + "id": "@opam/menhir@opam:20200624@8629ff13", "name": "@opam/menhir", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhir", - "version": "20200525", - "path": "js.esy.lock/opam/menhir.20200525" + "version": "20200624", + "path": "js.esy.lock/opam/menhir.20200624" } }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2541,8 +2545,8 @@ "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/js_of_ocaml-compiler@opam:3.6.0@8dfa564d": { - "id": "@opam/js_of_ocaml-compiler@opam:3.6.0@8dfa564d", + "@opam/js_of_ocaml-compiler@opam:3.6.0@bda9e5de": { + "id": "@opam/js_of_ocaml-compiler@opam:3.6.0@bda9e5de", "name": "@opam/js_of_ocaml-compiler", "version": "opam:3.6.0", "source": { @@ -2594,14 +2598,14 @@ "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/js_of_ocaml-compiler@opam:3.6.0@8dfa564d", + "@opam/js_of_ocaml-compiler@opam:3.6.0@bda9e5de", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/js_of_ocaml-compiler@opam:3.6.0@8dfa564d", + "@opam/js_of_ocaml-compiler@opam:3.6.0@bda9e5de", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2681,12 +2685,12 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/fmt@opam:0.8.8@01c3a23c": { @@ -3106,8 +3110,8 @@ ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, - "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { - "id": "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29": { + "id": "@opam/charInfo_width@opam:1.1.0@b400bb29", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { @@ -3185,7 +3189,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -3193,7 +3197,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -3484,31 +3488,31 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/astring@opam:0.8.3@4e5e17d5": { - "id": "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d": { + "id": "@opam/astring@opam:0.8.4@1215f84d", "name": "@opam/astring", - "version": "opam:0.8.3", + "version": "opam:0.8.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c5/c5bf6352b9ac27fbeab342740f4fa870#md5:c5bf6352b9ac27fbeab342740f4fa870", - "archive:http://erratique.ch/software/astring/releases/astring-0.8.3.tbz#md5:c5bf6352b9ac27fbeab342740f4fa870" + "archive:https://opam.ocaml.org/cache/md5/54/548fcbf501ca4cb816d219ca4f25f660#md5:548fcbf501ca4cb816d219ca4f25f660", + "archive:https://erratique.ch/software/astring/releases/astring-0.8.4.tbz#md5:548fcbf501ca4cb816d219ca4f25f660" ], "opam": { "name": "astring", - "version": "0.8.3", - "path": "js.esy.lock/opam/astring.0.8.3" + "version": "0.8.4", + "path": "js.esy.lock/opam/astring.0.8.4" } }, "overrides": [], @@ -3516,12 +3520,9 @@ "ocaml@4.10.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.10.0@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" - ] + "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, "@opam/angstrom@opam:0.14.1@07e286b0": { "id": "@opam/angstrom@opam:0.14.1@07e286b0", @@ -3600,7 +3601,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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/js.esy.lock/opam/astring.0.8.3/opam b/js.esy.lock/opam/astring.0.8.3/opam deleted file mode 100644 index 578ba1fae..000000000 --- a/js.esy.lock/opam/astring.0.8.3/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "Daniel Bünzli " -authors: ["Daniel Bünzli "] -homepage: "http://erratique.ch/software/astring" -doc: "http://erratique.ch/software/astring/doc" -dev-repo: "git+http://erratique.ch/repos/astring.git" -bug-reports: "https://github.com/dbuenzli/astring/issues" -tags: [ "string" "org:erratique" ] -license: "ISC" -depends: [ - "ocaml" {>= "4.01.0"} - "ocamlfind" {build} - "ocamlbuild" {build} - "topkg" {build} - "base-bytes" -] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" ]] -synopsis: "Alternative String module for OCaml" -description: """ -Astring exposes an alternative `String` module for OCaml. This module -tries to balance minimality and expressiveness for basic, index-free, -string processing and provides types and functions for substrings, -string sets and string maps. - -Remaining compatible with the OCaml `String` module is a non-goal. The -`String` module exposed by Astring has exception safe functions, -removes deprecated and rarely used functions, alters some signatures -and names, adds a few missing functions and fully exploits OCaml's -newfound string immutability. - -Astring depends only on the OCaml standard library. It is distributed -under the ISC license.""" -url { - src: "http://erratique.ch/software/astring/releases/astring-0.8.3.tbz" - checksum: "md5=c5bf6352b9ac27fbeab342740f4fa870" -} diff --git a/js.esy.lock/opam/astring.0.8.4/opam b/js.esy.lock/opam/astring.0.8.4/opam new file mode 100644 index 000000000..7d9ee8e6b --- /dev/null +++ b/js.esy.lock/opam/astring.0.8.4/opam @@ -0,0 +1,37 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["The astring programmers"] +homepage: "https://erratique.ch/software/astring" +doc: "https://erratique.ch/software/astring/doc" +dev-repo: "git+http://erratique.ch/repos/astring.git" +bug-reports: "https://github.com/dbuenzli/astring/issues" +tags: [ "string" "org:erratique" ] +license: "ISC" +depends: [ + "ocaml" {>= "4.05.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build} ] +build: [[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]] + +synopsis: """Alternative String module for OCaml""" +description: """\ + +Astring exposes an alternative `String` module for OCaml. This module +tries to balance minimality and expressiveness for basic, index-free, +string processing and provides types and functions for substrings, +string sets and string maps. + +Remaining compatible with the OCaml `String` module is a non-goal. The +`String` module exposed by Astring has exception safe functions, +removes deprecated and rarely used functions, alters some signatures +and names, adds a few missing functions and fully exploits OCaml's +newfound string immutability. + +Astring depends only on the OCaml standard library. It is distributed +under the ISC license. +""" +url { +archive: "https://erratique.ch/software/astring/releases/astring-0.8.4.tbz" +checksum: "548fcbf501ca4cb816d219ca4f25f660" +} diff --git a/js.esy.lock/opam/charInfo_width.1.1.0/opam b/js.esy.lock/opam/charInfo_width.1.1.0/opam index 7c17c9816..dee626092 100644 --- a/js.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/js.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.14"} + "ppx_expect" {with-test & < "v0.15"} ] synopsis: "Determine column width for a character" diff --git a/js.esy.lock/opam/js_of_ocaml-compiler.3.6.0/opam b/js.esy.lock/opam/js_of_ocaml-compiler.3.6.0/opam index 2aa75f12a..407ffb86a 100644 --- a/js.esy.lock/opam/js_of_ocaml-compiler.3.6.0/opam +++ b/js.esy.lock/opam/js_of_ocaml-compiler.3.6.0/opam @@ -16,7 +16,7 @@ build: [["dune" "build" "-p" name "-j" jobs]] depends: [ "ocaml" {>= "4.02.0" & < "4.11"} "dune" {>= "2.5"} - "ppx_expect" {with-test & >= "v0.12.0" & < "v0.14"} + "ppx_expect" {with-test & >= "v0.12.0" & < "v0.15"} "cmdliner" "ocaml-migrate-parsetree" "yojson" # It's optional, but we want users to be able to use source-map without pain. diff --git a/js.esy.lock/opam/menhir.20200525/opam b/js.esy.lock/opam/menhir.20200525/opam deleted file mode 100644 index 64b0d86ab..000000000 --- a/js.esy.lock/opam/menhir.20200525/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/20200525/archive.tar.gz" - checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" - ] -} diff --git a/js.esy.lock/opam/menhir.20200624/opam b/js.esy.lock/opam/menhir.20200624/opam new file mode 100644 index 000000000..37637fcf6 --- /dev/null +++ b/js.esy.lock/opam/menhir.20200624/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/20200624/archive.tar.gz" + checksum: [ + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + ] +} diff --git a/js.esy.lock/opam/menhirLib.20200525/opam b/js.esy.lock/opam/menhirLib.20200525/opam deleted file mode 100644 index 42f6fcd92..000000000 --- a/js.esy.lock/opam/menhirLib.20200525/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/20200525/archive.tar.gz" - checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" - ] -} diff --git a/js.esy.lock/opam/menhirLib.20200624/opam b/js.esy.lock/opam/menhirLib.20200624/opam new file mode 100644 index 000000000..afcbe5d5e --- /dev/null +++ b/js.esy.lock/opam/menhirLib.20200624/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/20200624/archive.tar.gz" + checksum: [ + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + ] +} diff --git a/js.esy.lock/opam/menhirSdk.20200525/opam b/js.esy.lock/opam/menhirSdk.20200525/opam deleted file mode 100644 index a28801d70..000000000 --- a/js.esy.lock/opam/menhirSdk.20200525/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/20200525/archive.tar.gz" - checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" - ] -} diff --git a/js.esy.lock/opam/menhirSdk.20200624/opam b/js.esy.lock/opam/menhirSdk.20200624/opam new file mode 100644 index 000000000..af1221633 --- /dev/null +++ b/js.esy.lock/opam/menhirSdk.20200624/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/20200624/archive.tar.gz" + checksum: [ + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + ] +} diff --git a/js.esy.lock/opam/uri.3.1.0/opam b/js.esy.lock/opam/uri.3.1.0/opam index ba9e9808d..45406b00a 100644 --- a/js.esy.lock/opam/uri.3.1.0/opam +++ b/js.esy.lock/opam/uri.3.1.0/opam @@ -16,7 +16,7 @@ depends: [ "ocaml" {>= "4.04.0"} "dune" {>= "1.2.0"} "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.14"} + "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} "re" {>= "1.9.0"} "stringext" {>= "1.4.0"} ] diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json index f50ca6a93..57c7622bc 100644 --- a/test.esy.lock/index.json +++ b/test.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "7b5eb7d2f99c367ef091665dfccb5f79", + "checksum": "5484cc085160934d9bbabfdedb0ca751", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -47,7 +47,7 @@ "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@reason-native/rely@3.2.1@d41d8cd9", @@ -226,13 +226,17 @@ ], "devDependencies": [] }, - "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9": { - "id": "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "id": + "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", "name": "esy-skia", - "version": "github:revery-ui/esy-skia#d60e5fe", + "version": + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", "source": { "type": "install", - "source": [ "github:revery-ui/esy-skia#d60e5fe" ] + "source": [ + "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + ] }, "overrides": [], "dependencies": [ @@ -510,7 +514,7 @@ "@reason-native-web/h2-lwt-unix@0.6.1001@d41d8cd9", "@reason-native-web/h1-lwt-unix@1.2.1001@d41d8cd9", "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7", "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", "@opam/magic-mime@opam:1.1.2@980f82fb", "@opam/lwt@opam:4.5.0@677655b4", "@opam/logs@opam:0.7.0@1d03143e", @@ -750,7 +754,7 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -758,7 +762,7 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -819,8 +823,8 @@ "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, - "@opam/uri@opam:3.1.0@faef85a4": { - "id": "@opam/uri@opam:3.1.0@faef85a4", + "@opam/uri@opam:3.1.0@826aaae7": { + "id": "@opam/uri@opam:3.1.0@826aaae7", "name": "@opam/uri", "version": "opam:3.1.0", "source": { @@ -1632,7 +1636,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1641,7 +1645,7 @@ "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/dune-build-info@opam:2.6.0@5e86a779", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -1775,20 +1779,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirSdk@opam:20200525@6baf7403": { - "id": "@opam/menhirSdk@opam:20200525@6baf7403", + "@opam/menhirSdk@opam:20200624@2a05b5a7": { + "id": "@opam/menhirSdk@opam:20200624@2a05b5a7", "name": "@opam/menhirSdk", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirSdk", - "version": "20200525", - "path": "test.esy.lock/opam/menhirSdk.20200525" + "version": "20200624", + "path": "test.esy.lock/opam/menhirSdk.20200624" } }, "overrides": [], @@ -1800,20 +1804,20 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhirLib@opam:20200525@f9abf308": { - "id": "@opam/menhirLib@opam:20200525@f9abf308", + "@opam/menhirLib@opam:20200624@8bdd2b0e": { + "id": "@opam/menhirLib@opam:20200624@8bdd2b0e", "name": "@opam/menhirLib", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhirLib", - "version": "20200525", - "path": "test.esy.lock/opam/menhirLib.20200525" + "version": "20200624", + "path": "test.esy.lock/opam/menhirLib.20200624" } }, "overrides": [], @@ -1825,31 +1829,31 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/menhir@opam:20200525@f6934337": { - "id": "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13": { + "id": "@opam/menhir@opam:20200624@8629ff13", "name": "@opam/menhir", - "version": "opam:20200525", + "version": "opam:20200624", "source": { "type": "install", "source": [ - "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" + "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b", + "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b" ], "opam": { "name": "menhir", - "version": "20200525", - "path": "test.esy.lock/opam/menhir.20200525" + "version": "20200624", + "path": "test.esy.lock/opam/menhir.20200624" } }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200525@6baf7403", - "@opam/menhirLib@opam:20200525@f9abf308", + "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", + "@opam/menhirLib@opam:20200624@8bdd2b0e", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -2208,12 +2212,12 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/fmt@opam:0.8.8@01c3a23c": { @@ -2610,8 +2614,8 @@ ], "devDependencies": [] }, - "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { - "id": "@opam/charInfo_width@opam:1.1.0@9d8d61b2", + "@opam/charInfo_width@opam:1.1.0@b400bb29": { + "id": "@opam/charInfo_width@opam:1.1.0@b400bb29", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { @@ -2689,7 +2693,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -2697,7 +2701,7 @@ "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93", "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/astring@opam:0.8.3@4e5e17d5" + "@opam/astring@opam:0.8.4@1215f84d" ] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -2988,31 +2992,31 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/menhir@opam:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/astring@opam:0.8.3@4e5e17d5": { - "id": "@opam/astring@opam:0.8.3@4e5e17d5", + "@opam/astring@opam:0.8.4@1215f84d": { + "id": "@opam/astring@opam:0.8.4@1215f84d", "name": "@opam/astring", - "version": "opam:0.8.3", + "version": "opam:0.8.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c5/c5bf6352b9ac27fbeab342740f4fa870#md5:c5bf6352b9ac27fbeab342740f4fa870", - "archive:http://erratique.ch/software/astring/releases/astring-0.8.3.tbz#md5:c5bf6352b9ac27fbeab342740f4fa870" + "archive:https://opam.ocaml.org/cache/md5/54/548fcbf501ca4cb816d219ca4f25f660#md5:548fcbf501ca4cb816d219ca4f25f660", + "archive:https://erratique.ch/software/astring/releases/astring-0.8.4.tbz#md5:548fcbf501ca4cb816d219ca4f25f660" ], "opam": { "name": "astring", - "version": "0.8.3", - "path": "test.esy.lock/opam/astring.0.8.3" + "version": "0.8.4", + "path": "test.esy.lock/opam/astring.0.8.4" } }, "overrides": [], @@ -3020,12 +3024,9 @@ "ocaml@4.10.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.10.0@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" - ] + "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, "@opam/angstrom@opam:0.14.1@07e286b0": { "id": "@opam/angstrom@opam:0.14.1@07e286b0", @@ -3104,7 +3105,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:20200525@f6934337", + "@opam/menhir@opam:20200624@8629ff13", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] diff --git a/test.esy.lock/opam/astring.0.8.3/opam b/test.esy.lock/opam/astring.0.8.3/opam deleted file mode 100644 index 578ba1fae..000000000 --- a/test.esy.lock/opam/astring.0.8.3/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "Daniel Bünzli " -authors: ["Daniel Bünzli "] -homepage: "http://erratique.ch/software/astring" -doc: "http://erratique.ch/software/astring/doc" -dev-repo: "git+http://erratique.ch/repos/astring.git" -bug-reports: "https://github.com/dbuenzli/astring/issues" -tags: [ "string" "org:erratique" ] -license: "ISC" -depends: [ - "ocaml" {>= "4.01.0"} - "ocamlfind" {build} - "ocamlbuild" {build} - "topkg" {build} - "base-bytes" -] -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" ]] -synopsis: "Alternative String module for OCaml" -description: """ -Astring exposes an alternative `String` module for OCaml. This module -tries to balance minimality and expressiveness for basic, index-free, -string processing and provides types and functions for substrings, -string sets and string maps. - -Remaining compatible with the OCaml `String` module is a non-goal. The -`String` module exposed by Astring has exception safe functions, -removes deprecated and rarely used functions, alters some signatures -and names, adds a few missing functions and fully exploits OCaml's -newfound string immutability. - -Astring depends only on the OCaml standard library. It is distributed -under the ISC license.""" -url { - src: "http://erratique.ch/software/astring/releases/astring-0.8.3.tbz" - checksum: "md5=c5bf6352b9ac27fbeab342740f4fa870" -} diff --git a/test.esy.lock/opam/astring.0.8.4/opam b/test.esy.lock/opam/astring.0.8.4/opam new file mode 100644 index 000000000..7d9ee8e6b --- /dev/null +++ b/test.esy.lock/opam/astring.0.8.4/opam @@ -0,0 +1,37 @@ +opam-version: "2.0" +maintainer: "Daniel Bünzli " +authors: ["The astring programmers"] +homepage: "https://erratique.ch/software/astring" +doc: "https://erratique.ch/software/astring/doc" +dev-repo: "git+http://erratique.ch/repos/astring.git" +bug-reports: "https://github.com/dbuenzli/astring/issues" +tags: [ "string" "org:erratique" ] +license: "ISC" +depends: [ + "ocaml" {>= "4.05.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build} ] +build: [[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]] + +synopsis: """Alternative String module for OCaml""" +description: """\ + +Astring exposes an alternative `String` module for OCaml. This module +tries to balance minimality and expressiveness for basic, index-free, +string processing and provides types and functions for substrings, +string sets and string maps. + +Remaining compatible with the OCaml `String` module is a non-goal. The +`String` module exposed by Astring has exception safe functions, +removes deprecated and rarely used functions, alters some signatures +and names, adds a few missing functions and fully exploits OCaml's +newfound string immutability. + +Astring depends only on the OCaml standard library. It is distributed +under the ISC license. +""" +url { +archive: "https://erratique.ch/software/astring/releases/astring-0.8.4.tbz" +checksum: "548fcbf501ca4cb816d219ca4f25f660" +} diff --git a/test.esy.lock/opam/charInfo_width.1.1.0/opam b/test.esy.lock/opam/charInfo_width.1.1.0/opam index 7c17c9816..dee626092 100644 --- a/test.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/test.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.14"} + "ppx_expect" {with-test & < "v0.15"} ] synopsis: "Determine column width for a character" diff --git a/test.esy.lock/opam/menhir.20200525/opam b/test.esy.lock/opam/menhir.20200525/opam deleted file mode 100644 index 64b0d86ab..000000000 --- a/test.esy.lock/opam/menhir.20200525/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/20200525/archive.tar.gz" - checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" - ] -} diff --git a/test.esy.lock/opam/menhir.20200624/opam b/test.esy.lock/opam/menhir.20200624/opam new file mode 100644 index 000000000..37637fcf6 --- /dev/null +++ b/test.esy.lock/opam/menhir.20200624/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/20200624/archive.tar.gz" + checksum: [ + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + ] +} diff --git a/test.esy.lock/opam/menhirLib.20200525/opam b/test.esy.lock/opam/menhirLib.20200525/opam deleted file mode 100644 index 42f6fcd92..000000000 --- a/test.esy.lock/opam/menhirLib.20200525/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/20200525/archive.tar.gz" - checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" - ] -} diff --git a/test.esy.lock/opam/menhirLib.20200624/opam b/test.esy.lock/opam/menhirLib.20200624/opam new file mode 100644 index 000000000..afcbe5d5e --- /dev/null +++ b/test.esy.lock/opam/menhirLib.20200624/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/20200624/archive.tar.gz" + checksum: [ + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + ] +} diff --git a/test.esy.lock/opam/menhirSdk.20200525/opam b/test.esy.lock/opam/menhirSdk.20200525/opam deleted file mode 100644 index a28801d70..000000000 --- a/test.esy.lock/opam/menhirSdk.20200525/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/20200525/archive.tar.gz" - checksum: [ - "md5=382b76757ae8343f42bca7de3bd70efb" - "sha512=d5cf05b9174fff08922b8a815188cc353ae756dd2ea50df634d407e3bc13c083765b756f484ad08545e8fade36b622f8c498ebb13d0398d724e87bf8bcdfd580" - ] -} diff --git a/test.esy.lock/opam/menhirSdk.20200624/opam b/test.esy.lock/opam/menhirSdk.20200624/opam new file mode 100644 index 000000000..af1221633 --- /dev/null +++ b/test.esy.lock/opam/menhirSdk.20200624/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/20200624/archive.tar.gz" + checksum: [ + "md5=c37ff53a4a69059e1f8223067b91bb8b" + "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39" + ] +} diff --git a/test.esy.lock/opam/uri.3.1.0/opam b/test.esy.lock/opam/uri.3.1.0/opam index ba9e9808d..45406b00a 100644 --- a/test.esy.lock/opam/uri.3.1.0/opam +++ b/test.esy.lock/opam/uri.3.1.0/opam @@ -16,7 +16,7 @@ depends: [ "ocaml" {>= "4.04.0"} "dune" {>= "1.2.0"} "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.14"} + "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} "re" {>= "1.9.0"} "stringext" {>= "1.4.0"} ] From 9120e8ce9ef058da69441b9571f0c51b360cd0e5 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sat, 27 Jun 2020 09:11:39 +0200 Subject: [PATCH 3/9] fix: Bind to new functions. --- bench/lib/DrawBench.re | 11 +- examples/CanvasExample.re | 18 +- examples/skia-cli/SkiaCli.re | 27 +-- .../SkiaFontManagerCli.re | 29 +-- examples/skia-sdl2/SkiaSdl.re | 2 +- src/Draw/CanvasContext.re | 20 ++- src/Font/FontCache.re | 6 +- src/Font/FontRenderer.re | 10 +- src/Font/Smoothing.re | 8 +- src/UI/TextNode.re | 28 +-- src/reason-skia/Skia.re | 60 +++++-- src/reason-skia/Skia.rei | 36 ++-- src/reason-skia/config/discover.re | 6 +- .../wrapped/bindings/SkiaWrappedBindings.re | 170 ++++++++++-------- src/reason-skia/wrapped/c/c_stubs.h | 10 +- src/reason-skia/wrapped/lib/raw_bindings.c | 14 +- src/reason-skia/wrapped/stubgen/stubgen.ml | 25 +-- .../wrapped/stubgen/types_stubgen.ml | 2 +- .../wrapped/types/SkiaWrappedTypes.re | 33 +++- test/reason-skia/PaintTest.re | 22 ++- 20 files changed, 317 insertions(+), 220 deletions(-) diff --git a/bench/lib/DrawBench.re b/bench/lib/DrawBench.re index 561520ac0..7e8d01f94 100644 --- a/bench/lib/DrawBench.re +++ b/bench/lib/DrawBench.re @@ -14,12 +14,14 @@ module Data = { let testString = String.make(50, 'a') ++ String.make(50, 'X'); let paint = { let textPaint = Skia.Paint.make(); - Skia.Paint.setTextEncoding(textPaint, GlyphId); - Skia.Paint.setLcdRenderText(textPaint, true); Skia.Paint.setAntiAlias(textPaint, true); - Skia.Paint.setTextSize(textPaint, 20.); textPaint; }; + let font = { + let textFont = Skia.Font.makeDefault(); + Skia.Font.setTextSize(textFont, 20.); + textFont; + }; let rectPaint = Skia.Paint.make(); }; @@ -29,7 +31,7 @@ let drawText = canvasContext => { | Error(_) => failwith("Unable to load font!") | Ok(font) => Skia.Paint.setColor(Data.paint, Revery_Core.Color.toSkia(Colors.white)); - Skia.Paint.setTypeface(Data.paint, Revery.Font.getSkiaTypeface(font)); + Skia.Font.setTypeface(Data.font, Revery.Font.getSkiaTypeface(font)); let shapedText = Data.testString @@ -41,6 +43,7 @@ let drawText = canvasContext => { ~y=1., ~paint=Data.paint, ~text=shapedText, + ~font=Data.font, canvasContext, ); }; diff --git a/examples/CanvasExample.re b/examples/CanvasExample.re index f85d51198..198679e26 100644 --- a/examples/CanvasExample.re +++ b/examples/CanvasExample.re @@ -58,26 +58,28 @@ module Sample = { | Ok(font) => let textPaint = Skia.Paint.make(); Skia.Paint.setColor(textPaint, Color.toSkia(Colors.white)); - Skia.Paint.setTypeface( - textPaint, - FontCache.getSkiaTypeface(font), - ); - Skia.Paint.setLcdRenderText(textPaint, true); + // ASK: What we should do + // Skia.Paint.setLcdRenderText(textPaint, true); Skia.Paint.setAntiAlias(textPaint, true); - Skia.Paint.setTextSize(textPaint, 20.); + let fontText = + Skia.Font.makeWithValues( + FontCache.getSkiaTypeface(font), + 20., + 1., + 0., + ); let shapedText = "Hello, World" |> FontCache.shape(font) |> ShapeResult.getGlyphString; - Skia.Paint.setTextEncoding(textPaint, GlyphId); - CanvasContext.drawText( ~paint=textPaint, ~x=10.0, ~y=20.0, ~text=shapedText, + ~font=fontText, canvasContext, ); }; diff --git a/examples/skia-cli/SkiaCli.re b/examples/skia-cli/SkiaCli.re index b1ca00f47..33e30c194 100644 --- a/examples/skia-cli/SkiaCli.re +++ b/examples/skia-cli/SkiaCli.re @@ -61,7 +61,8 @@ let draw = canvas => { let fill3 = Paint.make(); Paint.setColor(fill3, Color.makeArgb(0xFFl, 0xFFl, 0xFFl, 0xFFl)); - Paint.setTextSize(fill3, 30.); + // TODO: add some setter + // split creation of font let nonExistentTypeface = Typeface.makeFromFile("non-existent-font.ttf", 0); assert(nonExistentTypeface == None); @@ -74,11 +75,11 @@ let draw = canvas => { | None => failwith("Unable to load font: " ++ filePath) | Some(typeFace) => print_endline(__LOC__ ++ ": we will set."); - Paint.setTypeface(fill3, typeFace); - print_endline(__LOC__ ++ ": setTypeface is OK."); - Canvas.drawText(canvas, "Hello, world!", 30., 30., fill3); + let font = Font.makeWithValues(typeFace, 30., 1., 0.); + print_endline(__LOC__ ++ ": makeWithValues is OK."); + Canvas.drawText(canvas, "Hello, world!", GlyphId, 30., 30., font, fill3); let metrics = FontMetrics.make(); - let _ret: float = Paint.getFontMetrics(fill3, metrics, 1.0); + let _ret: float = Font.getFontMetrics(font, metrics); print_endline( "-- Top: " ++ string_of_float(FontMetrics.getTop(metrics)), @@ -99,10 +100,12 @@ let draw = canvas => { print_endline(__LOC__ ++ ": We return."); // Measure - let measurement = Paint.measureText(fill3, "Hello, world!", None); + let measurement = + Font.measureText(font, "Hello, world!", GlyphId, None, Some(fill3)); print_endline("Measured text: " ++ string_of_float(measurement)); - Paint.setTextSize(fill3, 50.); - let largeMeasurement = Paint.measureText(fill3, "Hello, world!", None); + Font.setTextSize(font, 50.); + let largeMeasurement = + Font.measureText(font, "Hello, world!", GlyphId, None, Some(fill3)); print_endline( "Large measured text: " ++ string_of_float(largeMeasurement), ); @@ -155,12 +158,10 @@ let draw = canvas => { switch (maybeTypeface) { | None => failwith("Unable to load font: " ++ filePath) | Some(typeFace) => + let font = Font.makeWithValues(typeFace, 30., 1., 0.); let fill = Paint.make(); Paint.setColor(fill, Color.makeArgb(0xFFl, 0xFFl, 0xFFl, 0xFFl)); - Paint.setTextSize(fill, 30.); - Paint.setTypeface(fill, typeFace); - Paint.setSubpixelText(fill, true); - Paint.setTextEncoding(fill, GlyphId); + Font.setSubpixelText(font, true); let glyphsToString = glyphs => { let len = List.length(glyphs); @@ -185,7 +186,7 @@ let draw = canvas => { // For FiraCode, this is a==>b let str = glyphsToString([136, 1624, 1624, 1495, 148]); - Canvas.drawText(canvas, str, 50., 100., fill); + Canvas.drawText(canvas, str, GlyphId, 50., 100., font, fill); }; let fill = Paint.make(); diff --git a/examples/skia-font-manager-cli/SkiaFontManagerCli.re b/examples/skia-font-manager-cli/SkiaFontManagerCli.re index 428d3c7c9..c5f2bc75b 100644 --- a/examples/skia-font-manager-cli/SkiaFontManagerCli.re +++ b/examples/skia-font-manager-cli/SkiaFontManagerCli.re @@ -20,17 +20,18 @@ let draw = canvas => { let maybeTypeface = FontManager.matchFamilyStyle(fontManager, "Arial", style); let fill = Paint.make(); + let font = Font.makeDefault(); Paint.setColor(fill, Color.makeArgb(0xFFl, 0xFFl, 0xFFl, 0xFFl)); - Paint.setTextSize(fill, 16.); - Paint.setSubpixelText(fill, true); + Font.setTextSize(font, 16.); + Font.setSubpixelText(font, true); switch (maybeTypeface) { | None => print_endline("Normal Arial not found. Ensure you have it available.") | Some(typeface) => - Paint.setTypeface(fill, typeface); - Canvas.drawText(canvas, "Arial (System)", 10., 20., fill); + Font.setTypeface(font, typeface); + Canvas.drawText(canvas, "Arial (System)", GlyphId, 10., 20., font, fill); let stream = Typeface.toStream(typeface); let length = Stream.getLength(stream); Printf.printf("Stream length: %d\n", length); @@ -50,8 +51,16 @@ let draw = canvas => { "Normal Times New Roman not found. Ensure you have it available.", ) | Some(typeface) => - Paint.setTypeface(fill, typeface); - Canvas.drawText(canvas, "Times New Roman (System)", 10., 40., fill); + Font.setTypeface(font, typeface); + Canvas.drawText( + canvas, + "Times New Roman (System)", + GlyphId, + 10., + 40., + font, + fill, + ); }; let maybeTypeface = @@ -62,9 +71,9 @@ let draw = canvas => { "Normal Consolas not found. Ensure your system has it available.", ) | Some(typeface) => - Paint.setTypeface(fill, typeface); + Font.setTypeface(font, typeface); let metrics = FontMetrics.make(); - let _ret: float = Paint.getFontMetrics(fill, metrics, 1.0); + let _ret: float = Font.getFontMetrics(font, metrics); print_endline("__Consolas__"); print_endline( "-- Average character width: " @@ -82,9 +91,9 @@ let draw = canvas => { switch (maybeTypeface) { | None => failwith("Unable to load font: " ++ filePath) | Some(typeface) => - Paint.setTypeface(fill, typeface); + Font.setTypeface(font, typeface); let metrics = FontMetrics.make(); - let _ret: float = Paint.getFontMetrics(fill, metrics, 1.0); + let _ret: float = Font.getFontMetrics(font, metrics); print_endline("__Fira Code__"); print_endline( "-- Average character width: " diff --git a/examples/skia-sdl2/SkiaSdl.re b/examples/skia-sdl2/SkiaSdl.re index 780f96b22..ac7497307 100644 --- a/examples/skia-sdl2/SkiaSdl.re +++ b/examples/skia-sdl2/SkiaSdl.re @@ -123,7 +123,7 @@ let run = () => { Skia.Color.makeArgb(0xFFl, 0xFFl, 0xFFl, 0xFFl), ); - Skia.Canvas.drawText(canvas, "Hello, world!", 50., 50., paint); + Skia.Canvas.drawText(canvas, "Hello, world!", GlyphId, 50., 50., Font.makeDefault(), paint); Skia.Canvas.flush(canvas); Sdl2.Gl.swapWindow(window); diff --git a/src/Draw/CanvasContext.re b/src/Draw/CanvasContext.re index 24f50b5c5..e42c053a8 100644 --- a/src/Draw/CanvasContext.re +++ b/src/Draw/CanvasContext.re @@ -185,8 +185,8 @@ let drawImage = (~x, ~y, ~width, ~height, ~paint=?, data: Skia.Image.t, v: t) => ); }; -let drawText = (~paint, ~x=0., ~y=0., ~text, v: t) => { - Canvas.drawText(v.canvas, text, x, y, paint); +let drawText = (~paint, ~x=0., ~y=0., ~text, ~font, v: t) => { + Canvas.drawText(v.canvas, text, GlyphId, x, y, font, paint); }; let _topMatrix = Skia.Matrix.make(); @@ -233,17 +233,23 @@ module Deprecated = { | Error(_) => () | Ok(font) => let textPaint = Skia.Paint.make(); + // ASK: put outside ? + let font' = + Skia.Font.makeWithValues( + FontCache.getSkiaTypeface(font), + fontSize, + 1., + 0., + ); Skia.Paint.setColor(textPaint, Revery_Core.Color.toSkia(color)); - Skia.Paint.setTypeface(textPaint, FontCache.getSkiaTypeface(font)); - Skia.Paint.setTextEncoding(textPaint, GlyphId); - Skia.Paint.setLcdRenderText(textPaint, true); + // ASK: What we should do + // Skia.Paint.setLcdRenderText(textPaint, true); Skia.Paint.setAntiAlias(textPaint, true); - Skia.Paint.setTextSize(textPaint, fontSize); let shapedText = text |> FontCache.shape(font) |> ShapeResult.getGlyphString; - drawText(~x, ~y, ~paint=textPaint, ~text=shapedText, v); + drawText(~x, ~y, ~paint=textPaint, ~text=shapedText, ~font=font', v); }; }; }; diff --git a/src/Font/FontCache.re b/src/Font/FontCache.re index 37d7c7c23..2caac1842 100644 --- a/src/Font/FontCache.re +++ b/src/Font/FontCache.re @@ -99,12 +99,10 @@ let getMetrics: (t, float) => FontMetrics.t = MetricsLruHash.promote(size, metricsCache); v; | None => - let paint = Skia.Paint.make(); - Skia.Paint.setTypeface(paint, skiaFace); - Skia.Paint.setTextSize(paint, size); + let font = Skia.Font.makeWithValues(skiaFace, size, 1., 0.); let metrics = Skia.FontMetrics.make(); - let lineHeight = Skia.Paint.getFontMetrics(paint, metrics, 1.0); + let lineHeight = Skia.Font.getFontMetrics(font, metrics); let ret = FontMetrics.ofSkia(size, lineHeight, metrics); MetricsLruHash.add(size, ret, metricsCache); diff --git a/src/Font/FontRenderer.re b/src/Font/FontRenderer.re index 5fd970eaf..5f308a05c 100644 --- a/src/Font/FontRenderer.re +++ b/src/Font/FontRenderer.re @@ -5,20 +5,20 @@ type measureResult = { let measure = { let paint = Skia.Paint.make(); - Skia.Paint.setTextEncoding(paint, GlyphId); (~smoothing: Smoothing.t, font, size, text: string) => { let {height, _}: FontMetrics.t = FontCache.getMetrics(font, size); let skiaFace = FontCache.getSkiaTypeface(font); + // TODO: put outside + let font' = Skia.Font.makeWithValues(skiaFace, size, 1., 0.); let glyphString = text |> FontCache.shape(font) |> ShapeResult.getGlyphString; - Smoothing.setPaint(~smoothing, paint); + Smoothing.setPaint(~smoothing, paint, font'); - Skia.Paint.setTypeface(paint, skiaFace); - Skia.Paint.setTextSize(paint, size); - let width = Skia.Paint.measureText(paint, glyphString, None); + let width = + Skia.Font.measureText(font', glyphString, GlyphId, None, Some(paint)); {height, width}; }; }; diff --git a/src/Font/Smoothing.re b/src/Font/Smoothing.re index 723ceec3e..e0d78e257 100644 --- a/src/Font/Smoothing.re +++ b/src/Font/Smoothing.re @@ -9,16 +9,16 @@ type t = // - https://github.com/onivim/oni2/issues/1592 let default = SubpixelAntialiased; -let setPaint = (~smoothing: t, paint: Skia.Paint.t) => { +let setPaint = (~smoothing: t, paint: Skia.Paint.t, font: Skia.Font.t) => { switch (smoothing) { | None => Skia.Paint.setAntiAlias(paint, false); - Skia.Paint.setSubpixelText(paint, false); + Skia.Font.setSubpixelText(font, false); | Antialiased => Skia.Paint.setAntiAlias(paint, true); - Skia.Paint.setSubpixelText(paint, false); + Skia.Font.setSubpixelText(font, false); | SubpixelAntialiased => Skia.Paint.setAntiAlias(paint, true); - Skia.Paint.setSubpixelText(paint, true); + Skia.Font.setSubpixelText(font, true); }; }; diff --git a/src/UI/TextNode.re b/src/UI/TextNode.re index 592380e1a..8519c77d1 100644 --- a/src/UI/TextNode.re +++ b/src/UI/TextNode.re @@ -27,8 +27,8 @@ class textNode (text: string) = { val mutable _underlined = false; val _textPaint = { let paint = Skia.Paint.make(); - Skia.Paint.setTextEncoding(paint, GlyphId); - Skia.Paint.setLcdRenderText(paint, true); + // ASK: What we should do + // Skia.Paint.setLcdRenderText(paint, true); Skia.Paint.setAntiAlias(paint, true); paint; }; @@ -49,14 +49,17 @@ class textNode (text: string) = { ) ) { | Error(_) => () - | Ok(font) => - Revery_Font.Smoothing.setPaint(~smoothing=_smoothing, _textPaint); + | Ok(fontCache) => + let font = + Skia.Font.makeWithValues( + Revery_Font.FontCache.getSkiaTypeface(fontCache), + _fontSize, + 1., + 0., + ); + // TODO: scale, skew + Revery_Font.Smoothing.setPaint(~smoothing=_smoothing, _textPaint, font); Skia.Paint.setColor(_textPaint, Color.toSkia(colorWithAppliedOpacity)); - Skia.Paint.setTypeface( - _textPaint, - Revery_Font.FontCache.getSkiaTypeface(font), - ); - Skia.Paint.setTextSize(_textPaint, _fontSize); let ascentPx = Text.ascent( @@ -93,7 +96,7 @@ class textNode (text: string) = { let glyphString = line - |> Revery_Font.shape(font) + |> Revery_Font.shape(fontCache) |> Revery_Font.ShapeResult.getGlyphString; CanvasContext.drawText( @@ -101,16 +104,17 @@ class textNode (text: string) = { ~x=0., ~y=baselineY, ~text=glyphString, + ~font, canvas, ); if (_underlined) { let {underlinePosition, underlineThickness, _}: FontMetrics.t = - FontCache.getMetrics(font, _fontSize); + FontCache.getMetrics(fontCache, _fontSize); let width = FontRenderer.measure( ~smoothing=_smoothing, - font, + fontCache, _fontSize, line, ). diff --git a/src/reason-skia/Skia.re b/src/reason-skia/Skia.re index e7780d227..d257ed194 100644 --- a/src/reason-skia/Skia.re +++ b/src/reason-skia/Skia.re @@ -132,10 +132,6 @@ module Paint = { paint; }; - let measureText = (paint, text, rectOpt) => { - SkiaWrapped.Paint.measureText(paint, text, String.length(text), rectOpt); - }; - [@noalloc] external _setColor: (CI.fatptr(_), [@unboxed] int32) => unit = "reason_skia_paint_set_color_byte" "reason_skia_paint_set_color"; @@ -147,23 +143,10 @@ module Paint = { let setColor = (paint, color) => _setColor(CI.cptr(paint), color); let setAlpha = (paint, alpha) => _setAlphaf(CI.cptr(paint), alpha); - let setHinting = SkiaWrapped.Paint.setHinting; - let getHinting = SkiaWrapped.Paint.getHinting; - - let isAutohinted = SkiaWrapped.Paint.isAutohinted; - let setAutohinted = SkiaWrapped.Paint.setAutohinted; - let setAntiAlias = SkiaWrapped.Paint.setAntiAlias; let setStyle = SkiaWrapped.Paint.setStyle; let setStrokeWidth = SkiaWrapped.Paint.setStrokeWidth; - let setLcdRenderText = SkiaWrapped.Paint.setLcdRenderText; - let setSubpixelText = SkiaWrapped.Paint.setSubpixelText; - let setTextSize = SkiaWrapped.Paint.setTextSize; - let setTypeface = SkiaWrapped.Paint.setTypeface; - let getFontMetrics = SkiaWrapped.Paint.getFontMetrics; let setImageFilter = SkiaWrapped.Paint.setImageFilter; - let setTextEncoding = SkiaWrapped.Paint.setTextEncoding; - let getTextEncoding = SkiaWrapped.Paint.getTextEncoding; let setShader = SkiaWrapped.Paint.setShader; }; @@ -474,6 +457,44 @@ module Rect = { }; }; +module Font = { + type t = SkiaWrapped.Font.t; + + let makeDefault = () => { + let fnt = SkiaWrapped.Font.makeDefault(); + Gc.finalise(SkiaWrapped.Font.delete, fnt); + fnt; + }; + + let makeWithValues = (typeface, size, scaleX, skewX) => { + let fnt = SkiaWrapped.Font.makeWidthValues(typeface, size, scaleX, skewX); + Gc.finalise(SkiaWrapped.Font.delete, fnt); + fnt; + }; + + let measureText = (font, text, encoding, rectOpt, paint) => + SkiaWrapped.Font.measureText( + font, + text, + String.length(text), + encoding, + rectOpt, + paint, + ); + + let getFontMetrics = SkiaWrapped.Font.getFontMetrics; + let setTypeface = SkiaWrapped.Font.setTypeface; + let setTextSize = SkiaWrapped.Font.setTextSize; + + let setSubpixelText = SkiaWrapped.Font.setSubpixelText; + + let isAutohinted = SkiaWrapped.Font.isAutohinted; + let setAutohinted = SkiaWrapped.Font.setAutohinted; + + let getHinting = SkiaWrapped.Font.getHinting; + let setHinting = SkiaWrapped.Font.setHinting; +}; + module FontStyle = { type t = SkiaWrapped.FontStyle.t; type slant = SkiaWrapped.FontStyle.slant; @@ -712,13 +733,14 @@ module Canvas = { let drawPath = SkiaWrapped.Canvas.drawPath; let drawCircle = SkiaWrapped.Canvas.drawCircle; - let drawText = (canvas, text, x, y, paint) => { + let drawText = (canvas, text, x, y, font, paint) => { SkiaWrapped.Canvas.drawText( canvas, text, - String.length(text), + Unsigned.Size_t.of_int(String.length(text)), x, y, + font, paint, ); }; diff --git a/src/reason-skia/Skia.rei b/src/reason-skia/Skia.rei index df3f7f65f..79eba28f2 100644 --- a/src/reason-skia/Skia.rei +++ b/src/reason-skia/Skia.rei @@ -187,27 +187,32 @@ module Paint: { let setColor: (t, Color.t) => unit; let setAntiAlias: (t, bool) => unit; - let setAutohinted: (t, bool) => unit; - let isAutohinted: t => bool; - - let setHinting: (t, Hinting.t) => unit; - let getHinting: t => Hinting.t; - let setStyle: (t, style) => unit; let setStrokeWidth: (t, float) => unit; let setImageFilter: (t, ImageFilter.t) => unit; + let setAlpha: (t, float) => unit; + + let setShader: (t, Shader.t) => unit; +}; + +module Font: { + type t = SkiaWrapped.Font.t; + + let makeDefault: unit => t; + let makeWithValues: (Typeface.t, float, float, float) => t; + let measureText: + (t, string, TextEncoding.t, option(Rect.t), option(Paint.t)) => float; + let getFontMetrics: (t, SkiaWrapped.FontMetrics.t) => float; let setTypeface: (t, Typeface.t) => unit; - let setLcdRenderText: (t, bool) => unit; - let setSubpixelText: (t, bool) => unit; let setTextSize: (t, float) => unit; - let setAlpha: (t, float) => unit; - let getFontMetrics: (t, FontMetrics.t, float) => float; - let measureText: (t, string, option(Rect.t)) => float; - let setTextEncoding: (t, TextEncoding.t) => unit; - let getTextEncoding: t => TextEncoding.t; + let setSubpixelText: (t, bool) => unit; - let setShader: (t, Shader.t) => unit; + let setAutohinted: (t, bool) => unit; + let isAutohinted: t => bool; + + let getHinting: t => Hinting.t; + let setHinting: (t, Hinting.t) => unit; }; module IRect: { @@ -448,7 +453,8 @@ module Canvas: { let drawCircle: (t, float, float, float, Paint.t) => unit; let drawRRect: (t, RRect.t, Paint.t) => unit; let drawPath: (t, Path.t, Paint.t) => unit; - let drawText: (t, string, float, float, Paint.t) => unit; + let drawText: + (t, string, TextEncoding.t, float, float, Font.t, Paint.t) => unit; let drawImage: (t, Image.t, float, float, option(Paint.t)) => unit; let drawImageRect: (t, Image.t, option(Rect.t), Rect.t, option(Paint.t)) => unit; diff --git a/src/reason-skia/config/discover.re b/src/reason-skia/config/discover.re index b743bb4c5..ceb6ffbcb 100644 --- a/src/reason-skia/config/discover.re +++ b/src/reason-skia/config/discover.re @@ -70,7 +70,7 @@ let () = { [] @ ["-I" ++ getenv("SDL2_INCLUDE_PATH")] @ ["-I" ++ getenv("SKIA_INCLUDE_PATH")] - @ ["-I" ++ getenv("SKIA_INCLUDE_PATH") ++ "/c"] + @ ["-I" ++ Filename.dirname(getenv("SKIA_INCLUDE_PATH"))] | Linux => [] @@ -78,7 +78,7 @@ let () = { @ ["-lskia"] @ ["-I" ++ getenv("SDL2_INCLUDE_PATH")] @ ["-I" ++ getenv("SKIA_INCLUDE_PATH")] - @ ["-I" ++ getenv("SKIA_INCLUDE_PATH") ++ "/c"] + @ ["-I" ++ Filename.dirname(getenv("SKIA_INCLUDE_PATH"))] @ ["-L" ++ getenv("SKIA_LIB_PATH")] @ ["-L" ++ getenv("SDL2_LIB_PATH")] @ ["-L" ++ getenv("JPEG_LIB_PATH")] @@ -90,7 +90,7 @@ let () = { @ ["-std=c++1y"] @ ["-I" ++ getenv("SDL2_INCLUDE_PATH")] @ ["-I" ++ getenv("SKIA_INCLUDE_PATH")] - @ ["-I" ++ getenv("SKIA_INCLUDE_PATH") ++ "/c"] + @ ["-I" ++ Filename.dirname(getenv("SKIA_INCLUDE_PATH"))] | _ => failwith("cflags: unknown platform") }; diff --git a/src/reason-skia/wrapped/bindings/SkiaWrappedBindings.re b/src/reason-skia/wrapped/bindings/SkiaWrappedBindings.re index d451a68e7..cbbcab407 100644 --- a/src/reason-skia/wrapped/bindings/SkiaWrappedBindings.re +++ b/src/reason-skia/wrapped/bindings/SkiaWrappedBindings.re @@ -79,7 +79,7 @@ module M = (F: FOREIGN) => { let makeFromName = foreign( - "sk_typeface_create_from_name_with_font_style", + "sk_typeface_create_from_name", string @-> FontStyle.t @-> returning(ptr_opt(SkiaTypes.Typeface.t)), ); @@ -136,6 +136,61 @@ module M = (F: FOREIGN) => { getf(!@metrics, SkiaTypes.FontMetrics.avgCharacterWidth); }; + module Font = { + type t = ptr(structure(SkiaTypes.Font.t)); + let t = ptr(SkiaTypes.Font.t); + + let makeDefault = foreign("sk_font_new", void @-> returning(t)); + let makeWidthValues = + foreign( + "sk_font_new_with_values", + ptr(SkiaTypes.Typeface.t) + @-> float + @-> float + @-> float + @-> returning(t), + ); + let getFontMetrics = + foreign( + "sk_font_get_metrics", + t @-> FontMetrics.t @-> returning(float), + ); + let measureText = + foreign( + "sk_font_measure_text", + t + @-> string + @-> int + @-> TextEncoding.t + @-> ptr_opt(SkiaTypes.Rect.t) + @-> ptr_opt(SkiaTypes.Paint.t) + @-> returning(float), + ); + + let setSubpixelText = + foreign("sk_font_set_subpixel", t @-> bool @-> returning(void)); + + let setTypeface = + foreign("sk_font_set_typeface", t @-> Typeface.t @-> returning(void)); + let setTextSize = + foreign("sk_font_set_size", t @-> float @-> returning(void)); + + let isAutohinted = + foreign("sk_font_is_force_auto_hinting", t @-> returning(bool)); + let setAutohinted = + foreign( + "sk_font_set_force_auto_hinting", + t @-> bool @-> returning(void), + ); + + let getHinting = + foreign("sk_font_get_hinting", t @-> returning(Hinting.t)); + let setHinting = + foreign("sk_font_set_hinting", t @-> Hinting.t @-> returning(void)); + + let delete = foreign("sk_font_delete", t @-> returning(void)); + }; + module ImageFilter = { type t = ptr(structure(SkiaTypes.ImageFilter.t)); let t = ptr(SkiaTypes.ImageFilter.t); @@ -247,67 +302,12 @@ module M = (F: FOREIGN) => { let setStrokeWidth = foreign("sk_paint_set_stroke_width", t @-> float @-> returning(void)); - let setTypeface = - foreign("sk_paint_set_typeface", t @-> Typeface.t @-> returning(void)); - - let setLcdRenderText = - foreign( - "sk_paint_set_lcd_render_text", - t @-> bool @-> returning(void), - ); - - let setSubpixelText = - foreign("sk_paint_set_subpixel_text", t @-> bool @-> returning(void)); - - let setTextSize = - foreign("sk_paint_set_textsize", t @-> float @-> returning(void)); - - let getFontMetrics = - foreign( - "sk_paint_get_fontmetrics", - t @-> ptr(SkiaTypes.FontMetrics.t) @-> float @-> returning(float), - ); - - let isAutohinted = - foreign("sk_paint_is_autohinted", t @-> returning(bool)); - - let setAutohinted = - foreign("sk_paint_set_autohinted", t @-> bool @-> returning(void)); - - let isAutohinted = - foreign("sk_paint_is_autohinted", t @-> returning(bool)); - - let getHinting = - foreign("sk_paint_get_hinting", t @-> returning(Hinting.t)); - - let setHinting = - foreign("sk_paint_set_hinting", t @-> Hinting.t @-> returning(void)); - - let measureText = - foreign( - "sk_paint_measure_text", - t - @-> string - @-> int - @-> ptr_opt(SkiaTypes.Rect.t) - @-> returning(float), - ); - let setImageFilter = foreign( "sk_paint_set_imagefilter", t @-> ImageFilter.t @-> returning(void), ); - let getTextEncoding = - foreign("sk_paint_get_text_encoding", t @-> returning(TextEncoding.t)); - - let setTextEncoding = - foreign( - "sk_paint_set_text_encoding", - t @-> TextEncoding.t @-> returning(void), - ); - let setShader = foreign("sk_paint_set_shader", t @-> Shader.t @-> returning(void)); }; @@ -406,25 +406,49 @@ module M = (F: FOREIGN) => { perspective1, perspective2, ) => { - let mat = getf(!@matrix, SkiaTypes.Matrix.mat); - CArray.set(mat, 0, scaleX); - CArray.set(mat, 1, skewX); - CArray.set(mat, 2, translateX); - CArray.set(mat, 3, skewY); - CArray.set(mat, 4, scaleY); - CArray.set(mat, 5, translateY); - CArray.set(mat, 6, perspective0); - CArray.set(mat, 7, perspective1); - CArray.set(mat, 8, perspective2); + let mat = !@matrix; + setf(mat, SkiaTypes.Matrix.scaleX, scaleX); + setf(mat, SkiaTypes.Matrix.skewX, skewX); + setf(mat, SkiaTypes.Matrix.transX, translateX); + setf(mat, SkiaTypes.Matrix.skewY, skewY); + setf(mat, SkiaTypes.Matrix.scaleY, scaleY); + setf(mat, SkiaTypes.Matrix.transY, translateY); + setf(mat, SkiaTypes.Matrix.persp0, perspective0); + setf(mat, SkiaTypes.Matrix.persp1, perspective1); + setf(mat, SkiaTypes.Matrix.persp2, perspective2); }; + //TODO: prevent out of bound with variant ? + let get = (matrix, index) => { - let mat = getf(!@matrix, SkiaTypes.Matrix.mat); - CArray.get(mat, index); + let mat = !@matrix; + switch (index) { + | 0 => getf(mat, SkiaTypes.Matrix.scaleX) + | 1 => getf(mat, SkiaTypes.Matrix.skewX) + | 2 => getf(mat, SkiaTypes.Matrix.transX) + | 3 => getf(mat, SkiaTypes.Matrix.skewY) + | 4 => getf(mat, SkiaTypes.Matrix.scaleY) + | 5 => getf(mat, SkiaTypes.Matrix.transY) + | 6 => getf(mat, SkiaTypes.Matrix.persp0) + | 7 => getf(mat, SkiaTypes.Matrix.persp1) + | 8 => getf(mat, SkiaTypes.Matrix.persp2) + | _ => assert(false) + }; }; let set = (matrix, index, value) => { - let mat = getf(!@matrix, SkiaTypes.Matrix.mat); - CArray.set(mat, index, value); + let mat = !@matrix; + switch (index) { + | 0 => setf(mat, SkiaTypes.Matrix.scaleX, value) + | 1 => setf(mat, SkiaTypes.Matrix.skewX, value) + | 2 => setf(mat, SkiaTypes.Matrix.transX, value) + | 3 => setf(mat, SkiaTypes.Matrix.skewY, value) + | 4 => setf(mat, SkiaTypes.Matrix.scaleY, value) + | 5 => setf(mat, SkiaTypes.Matrix.transY, value) + | 6 => setf(mat, SkiaTypes.Matrix.persp0, value) + | 7 => setf(mat, SkiaTypes.Matrix.persp1, value) + | 8 => setf(mat, SkiaTypes.Matrix.persp2, value) + | _ => assert(false) + }; }; let invert = @@ -864,12 +888,14 @@ module M = (F: FOREIGN) => { let drawText = foreign( - "sk_canvas_draw_text", + "sk_canvas_draw_simple_text", t @-> string - @-> int + @-> size_t + @-> TextEncoding.t @-> float @-> float + @-> Font.t @-> Paint.t @-> returning(void), ); diff --git a/src/reason-skia/wrapped/c/c_stubs.h b/src/reason-skia/wrapped/c/c_stubs.h index cef32f7e4..aaba61fde 100644 --- a/src/reason-skia/wrapped/c/c_stubs.h +++ b/src/reason-skia/wrapped/c/c_stubs.h @@ -1,8 +1,8 @@ -#include "gr_context.h" -#include "sk_canvas.h" -#include "sk_paint.h" -#include "sk_shader.h" -#include "sk_types.h" +#include "include/c/gr_context.h" +#include "include/c/sk_canvas.h" +#include "include/c/sk_paint.h" +#include "include/c/sk_shader.h" +#include "include/c/sk_types.h" #include diff --git a/src/reason-skia/wrapped/lib/raw_bindings.c b/src/reason-skia/wrapped/lib/raw_bindings.c index e5db19cd4..d91afe15a 100644 --- a/src/reason-skia/wrapped/lib/raw_bindings.c +++ b/src/reason-skia/wrapped/lib/raw_bindings.c @@ -5,13 +5,13 @@ */ #include "c_stubs.h" -#include "sk_canvas.h" -#include "sk_matrix.h" -#include "sk_paint.h" -#include "sk_types.h" -#include "sk_typeface.h" -#include "sk_data.h" -#include "sk_stream.h" +#include "include/c/sk_canvas.h" +#include "include/c/sk_matrix.h" +#include "include/c/sk_paint.h" +#include "include/c/sk_types.h" +#include "include/c/sk_typeface.h" +#include "include/c/sk_data.h" +#include "include/c/sk_stream.h" #include #include diff --git a/src/reason-skia/wrapped/stubgen/stubgen.ml b/src/reason-skia/wrapped/stubgen/stubgen.ml index ca3cfa9fb..a4d0af1d6 100644 --- a/src/reason-skia/wrapped/stubgen/stubgen.ml +++ b/src/reason-skia/wrapped/stubgen/stubgen.ml @@ -2,18 +2,19 @@ let prefix = "skia_wrapped_stub" let prologue = " #include \"c_stubs.h\" -#include \"gr_context.h\" -#include \"sk_canvas.h\" -#include \"sk_data.h\" -#include \"sk_image.h\" -#include \"sk_imagefilter.h\" -#include \"sk_paint.h\" -#include \"sk_path.h\" -#include \"sk_surface.h\" -#include \"sk_rrect.h\" -#include \"sk_matrix.h\" -#include \"sk_typeface.h\" -#include \"sk_stream.h\" +#include \"include/c/gr_context.h\" +#include \"include/c/sk_canvas.h\" +#include \"include/c/sk_data.h\" +#include \"include/c/sk_image.h\" +#include \"include/c/sk_imagefilter.h\" +#include \"include/c/sk_paint.h\" +#include \"include/c/sk_path.h\" +#include \"include/c/sk_surface.h\" +#include \"include/c/sk_rrect.h\" +#include \"include/c/sk_matrix.h\" +#include \"include/c/sk_typeface.h\" +#include \"include/c/sk_font.h\" +#include \"include/c/sk_stream.h\" " let () = diff --git a/src/reason-skia/wrapped/stubgen/types_stubgen.ml b/src/reason-skia/wrapped/stubgen/types_stubgen.ml index 71656aa5f..58eae50f0 100644 --- a/src/reason-skia/wrapped/stubgen/types_stubgen.ml +++ b/src/reason-skia/wrapped/stubgen/types_stubgen.ml @@ -1,7 +1,7 @@ let prefix = "skia_wrapped_stub" let prologue = " -#include \"sk_types.h\" +#include \"include/c/sk_types.h\" " let () = diff --git a/src/reason-skia/wrapped/types/SkiaWrappedTypes.re b/src/reason-skia/wrapped/types/SkiaWrappedTypes.re index aa911db33..dd15b164f 100644 --- a/src/reason-skia/wrapped/types/SkiaWrappedTypes.re +++ b/src/reason-skia/wrapped/types/SkiaWrappedTypes.re @@ -25,12 +25,12 @@ module M = (T: TYPE) => { let t = skiaCEnum( - "sk_paint_hinting_t", + "sk_font_hinting_t", [ - (NoHinting, "NO_HINTING_SK_PAINT_HINTING"), - (SlightHinting, "SLIGHT_HINTING_SK_PAINT_HINTING"), - (NormalHinting, "NORMAL_HINTING_SK_PAINT_HINTING"), - (FullHinting, "FULL_HINTING_SK_PAINT_HINTING"), + (NoHinting, "NONE_SK_FONT_HINTING"), + (SlightHinting, "SLIGHT_SK_FONT_HINTING"), + (NormalHinting, "NORMAL_SK_FONT_HINTING"), + (FullHinting, "FULL_SK_FONT_HINTING"), ], ); }; @@ -85,6 +85,12 @@ module M = (T: TYPE) => { type t; let t: typ(structure(t)) = structure("sk_stream_t"); let t = typedef(t, "sk_stream_t"); + + module Asset = { + type t; + let t: typ(structure(t)) = structure("sk_stream_asset_t"); + let t = typedef(t, "sk_stream_asset_t"); + }; }; module Typeface = { @@ -93,6 +99,13 @@ module M = (T: TYPE) => { let t = typedef(t, "sk_typeface_t"); }; + module Font = { + type t; + + let t: typ(structure(t)) = structure("sk_font_t"); + let t = typedef(t, "sk_font_t"); + }; + module FontManager = { type t; @@ -209,7 +222,15 @@ module M = (T: TYPE) => { module Matrix = { type t; let t: typ(structure(t)) = structure("sk_matrix_t"); - let mat = field(t, "mat", array(9, float)); + let scaleX = field(t, "scaleX", float); + let skewX = field(t, "skewX", float); + let transX = field(t, "transX", float); + let skewY = field(t, "skewY", float); + let scaleY = field(t, "scaleY", float); + let transY = field(t, "transY", float); + let persp0 = field(t, "persp0", float); + let persp1 = field(t, "persp1", float); + let persp2 = field(t, "persp2", float); seal(t); let t = typedef(t, "sk_matrix_t"); }; diff --git a/test/reason-skia/PaintTest.re b/test/reason-skia/PaintTest.re index 6bc9fa7de..1e6ae1ec8 100644 --- a/test/reason-skia/PaintTest.re +++ b/test/reason-skia/PaintTest.re @@ -4,24 +4,22 @@ open TestFramework; describe("Paint", ({describe, _}) => { describe("hinting", ({test, _}) => { test("get / set isAutohinted", ({expect, _}) => { - let paint = Paint.make(); + let font = Font.makeDefault(); - Paint.setAutohinted(paint, true); - expect.equal(paint |> Paint.isAutohinted, true); + Font.setAutohinted(font, true); + expect.equal(font |> Font.isAutohinted, true); - Paint.setAutohinted(paint, false); - expect.equal(paint |> Paint.isAutohinted, false); + Font.setAutohinted(font, false); + expect.equal(font |> Font.isAutohinted, false); }); test("get / set hinting", ({expect, _}) => { - let paint = Paint.make(); + let font = Font.makeDefault(); - Paint.setTextEncoding(paint, Utf8); + Font.setHinting(font, FullHinting); + expect.equal(font |> Font.getHinting, FullHinting); - Paint.setHinting(paint, FullHinting); - expect.equal(paint |> Paint.getHinting, FullHinting); - - Paint.setHinting(paint, NoHinting); - expect.equal(paint |> Paint.getHinting, NoHinting); + Font.setHinting(font, NoHinting); + expect.equal(font |> Font.getHinting, NoHinting); }); }) }); From 83ddc070fcba999b6fd8614b977aac04dc437a6b Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sat, 27 Jun 2020 09:12:40 +0200 Subject: [PATCH 4/9] explicity require some libs used. --- src/Font/dune | 3 ++- src/reason-skia/dune | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Font/dune b/src/Font/dune index 74fe6e36a..b193fd2e8 100644 --- a/src/Font/dune +++ b/src/Font/dune @@ -2,7 +2,7 @@ (name Revery_Font) (public_name Revery.Font) (preprocess (pps lwt_ppx)) - (libraries + (libraries harfbuzz font-manager lru @@ -13,4 +13,5 @@ rebez.lib Revery_Core Revery_Math + skia )) diff --git a/src/reason-skia/dune b/src/reason-skia/dune index 272490ff8..ef84043c0 100644 --- a/src/reason-skia/dune +++ b/src/reason-skia/dune @@ -9,5 +9,5 @@ (library_flags (:include flags.sexp)) (c_library_flags (:include c_library_flags.sexp)) (libraries - SkiaWrapped + SkiaWrapped integers )) From 1bc0133562e93ce2b1e8fd88aee028708b230557 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sat, 27 Jun 2020 09:13:27 +0200 Subject: [PATCH 5/9] does this work on linux/macos ? if so we can refactor because it is the same rule --- src/reason-skia/wrapped/c/dune | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reason-skia/wrapped/c/dune b/src/reason-skia/wrapped/c/dune index d9ac24ed4..932bbbef1 100644 --- a/src/reason-skia/wrapped/c/dune +++ b/src/reason-skia/wrapped/c/dune @@ -23,7 +23,7 @@ (rule (targets dllskia_wrapped_c_stubs.so) (deps c_stubs.o) - (action (run %{cc} %{read-lines:c_library_flags.txt} -shared -o %{targets} %{deps}))) + (action (run %{cc} -shared -o %{targets} %{deps} %{read-lines:c_library_flags.txt} ))) (rule (targets c_stubs.o) From 9745cb0ae038e914efbd53cc47c0c68e8a533b3d Mon Sep 17 00:00:00 2001 From: Github Runner Date: Sat, 27 Jun 2020 15:10:21 +0000 Subject: [PATCH 6/9] format, --- examples/skia-sdl2/SkiaSdl.re | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/examples/skia-sdl2/SkiaSdl.re b/examples/skia-sdl2/SkiaSdl.re index ac7497307..64e420f03 100644 --- a/examples/skia-sdl2/SkiaSdl.re +++ b/examples/skia-sdl2/SkiaSdl.re @@ -123,7 +123,15 @@ let run = () => { Skia.Color.makeArgb(0xFFl, 0xFFl, 0xFFl, 0xFFl), ); - Skia.Canvas.drawText(canvas, "Hello, world!", GlyphId, 50., 50., Font.makeDefault(), paint); + Skia.Canvas.drawText( + canvas, + "Hello, world!", + GlyphId, + 50., + 50., + Font.makeDefault(), + paint, + ); Skia.Canvas.flush(canvas); Sdl2.Gl.swapWindow(window); From e50c6900e6fa66d69cc0dac48338a225c15ef011 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sat, 27 Jun 2020 16:44:00 +0200 Subject: [PATCH 7/9] ci: esy i in ci --- .github/workflows/validate-pr.yml | 166 +----------------------------- 1 file changed, 1 insertion(+), 165 deletions(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index a467013d5..aaf720291 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -27,28 +27,8 @@ jobs: esy install -P bench esy install -P doc esy install -P js + esy install -P examples git diff --exit-code || (git add *lock; git commit -m "Update lockdir, ") - - name: Print esy cache - id: print_esy_cache - run: node .github/workflows/print_esy_cache.js - - name: Try to restore dependencies cache - id: deps-cache-macos - uses: actions/cache@v1.1.2 - with: - path: ${{ steps.print_esy_cache.outputs.esy_cache }} - key: macos-latest-${{ hashFiles('**/index.json') }} - restore-keys: | - macos-latest- - - name: Build dependencies - if: steps.deps-cache-macos.outputs.cache-hit != 'true' - run: esy build-dependencies --release - - name: Generate opam files - run: | - esy build dune build @check - git diff --exit-code || ([[ "$(git log -1 --pretty=format:'%an')" != "Github Runner" ]] && git commit -am "opam, " || git commit --amend -am "$(git log -1 --pretty=format:'%s')opam, ") - - name: format sources files - run: | - esy format || ([[ "$(git log -1 --pretty=format:'%an')" != "Github Runner" ]] && git commit -am "format, " || git commit --amend -am "$(git log -1 --pretty=format:'%s')format, ") - name: Push if it is not up to date if: github.event_name != 'pull_request' run: | @@ -73,147 +53,3 @@ jobs: body: "I have updated your lock dirs and formatted the code.\n" + "Please @" + context.actor + " pull the last commit before pushing any more changes." }); - - doc: - name: Push docs to GitHub's Pages - runs-on: macos-latest - steps: - - uses: actions/setup-node@v1.4.2 - with: - node-version: 12 - - uses: actions/checkout@v2 - - name: Install esy - run: npm install -g esy - - run: brew install coreutils - - name: Solve doc dependencies - run: esy @doc install - - name: Print esy cache - id: print_esy_cache - run: node .github/workflows/print_esy_cache.js - - name: Try to restore dependencies cache - id: deps-cache-macos - uses: actions/cache@v1.1.2 - with: - path: ${{ steps.print_esy_cache.outputs.esy_cache }} - key: macos-latest-${{ hashFiles('**/index.json') }} - restore-keys: | - macos-latest- - - name: Install doc dependencies - if: steps.deps-cache-macos.outputs.cache-hit != 'true' - run: esy @doc build-dependencies --release - - name: Print docs path - id: print_docs_path - run: node .github/workflows/print_docs_path.js - - name: Generate docs - run: esy @doc build --release - - run: ls ./_esy - - run: ls ./_esy/doc - - run: ls ./_esy/doc/store - - run: ls ./_esy/doc/store/b - - run: ls ./_esy/doc/store/b/revery-* - - run: ls ./_esy/doc/store/b/revery-*/default - - run: ls ./_esy/doc/store/b/revery-*/default/_doc - - run: ls ./_esy/doc/store/b/revery-*/default/_doc/_html - - run: echo $GITHUB_ACTOR $DOC_PATH - env: - DOC_PATH: ${{ steps.print_docs_path.outputs.docs_path }} - - run: find . -name "*.html" - - run: ls ./$DOC_PATH - env: - DOC_PATH: ${{ steps.print_docs_path.outputs.docs_path }} - - name: Deploy docs - if: github.ref == 'refs/heads/master' - uses: JamesIves/github-pages-deploy-action@releases/v3 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BRANCH: gh-pages - CLEAN: true - FOLDER: ${{ steps.print_docs_path.outputs.docs_path }} - - build_docker: - name: Build inside a docker - runs-on: ubuntu-latest - strategy: - # If we have many bug we can test on all plateform - fail-fast: false - matrix: - os: [archlinux, centos] - steps: - - uses: actions/checkout@v2 - - run: docker build -t ${{ matrix.os }} scripts/docker/${{ matrix.os }} - - name: Create esy store - run: mkdir ~/.esy - - run: docker run --rm --volume $(pwd):/revery --volume ~/.esy:/esy/store ${{ matrix.os }} bash -c "cd /revery && esy install --prefix-path=/esy/store" - - name: Print esy cache - id: print_esy_cache - run: node .github/workflows/print_esy_cache.js - - name: Try to restore dependencies cache - id: deps-cache - uses: actions/cache@v1.1.2 - with: - path: ${{ steps.print_esy_cache.outputs.esy_cache }} - key: ${{ matrix.os }}-${{ hashFiles('**/index.json') }} - restore-keys: | - ${{ matrix.os }}- - - name: Build release dependencies - if: steps.deps-cache.outputs.cache-hit != 'true' - run: docker run --rm --volume $(pwd):/revery --volume ~/.esy:/esy/store ${{ matrix.os }} bash -c "cd /revery && esy build-dependencies --release --prefix-path=/esy/store" - - name: Build project in release - run: docker run --rm --volume $(pwd):/revery --volume ~/.esy:/esy/store ${{ matrix.os }} bash -c "cd /revery && esy build --release --prefix-path=/esy/store" - - name: Build test/dev dependencies - run: docker run --rm --volume $(pwd):/revery --volume ~/.esy:/esy/store ${{ matrix.os }} bash -c "cd /revery && esy build-dependencies --prefix-path=/esy/store" - - build: - name: Build - runs-on: ${{ matrix.os }} - strategy: - # If we have many bug we can test on all plateform - fail-fast: false - matrix: - os: [windows-2016, ubuntu-latest, macos-latest] - steps: - - uses: actions/setup-node@v1.4.2 - with: - node-version: 12 - - uses: actions/checkout@v2 - - name: Install esy - run: npm install -g esy - - name: Install native dependencies on ubuntu-latest - if: matrix.os == 'ubuntu-latest' - run: | - sudo apt-get update - sudo apt-get install -y libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-utils mesa-utils-extra ragel libgtk-3-dev nasm - - name: Install dependencies - run: esy install - - name: Print esy cache - id: print_esy_cache - run: node .github/workflows/print_esy_cache.js - - name: Try to restore dependencies cache - if: matrix.os != 'windows-latest' - id: deps-cache-non-win - uses: actions/cache@v1.1.2 - with: - path: ${{ steps.print_esy_cache.outputs.esy_cache }} - key: ${{ matrix.os }}-${{ hashFiles('**/index.json') }} - restore-keys: | - ${{ matrix.os }}- - - name: Try to restore dependencies cache - if: matrix.os == 'windows-latest' - id: deps-cache-win - uses: actions/cache@v1.1.2 - with: - path: ${{ steps.print_esy_cache.outputs.esy_cache }} - key: ${{ matrix.os }}-${{ hashFiles('**\index.json') }} - restore-keys: | - ${{ matrix.os }}- - - name: Build dependencies - if: steps.deps-cache-win.outputs.cache-hit != 'true' && steps.deps-cache-non-win.outputs.cache-hit != 'true' - run: esy build-dependencies --release - - name: Build - run: esy build --release - - name: Build test/dev dependencies - if: steps.deps-cache-win.outputs.cache-hit != 'true' && steps.deps-cache-non-win.outputs.cache-hit != 'true' - run: | - esy build-dependencies - # We might have used restore-keys - esy cleanup . From 8c85dd82bfafce3d586fa98f830d8b475ca3945f Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sat, 27 Jun 2020 18:26:02 +0200 Subject: [PATCH 8/9] fixup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a4d243e64..de68929fd 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "esy-freetype2": "^2.9.1007", "esy-harfbuzz": "^1.9.1008", "esy-sdl2": "^2.0.10008", - "esy-skia": "Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", + "esy-skia": "Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e", "fetch-native-lwt": "0.1.0-alpha.5", "flex": "1.2.3", "reperf": "^1.4.0", From f3a3bd3acedf0f38272cf140c4c5a074d3707a92 Mon Sep 17 00:00:00 2001 From: Github Runner Date: Sat, 27 Jun 2020 16:32:47 +0000 Subject: [PATCH 9/9] Update lockdir, --- bench.esy.lock/index.json | 12 ++++++------ doc.esy.lock/index.json | 12 ++++++------ esy.lock/index.json | 12 ++++++------ examples.esy.lock/index.json | 12 ++++++------ js.esy.lock/index.json | 12 ++++++------ test.esy.lock/index.json | 12 ++++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json index 20bf6332f..e625d91ee 100644 --- a/bench.esy.lock/index.json +++ b/bench.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "ce311cc411ea1b9846c68a24031a2c9a", + "checksum": "d8489440e84bf1351601902cc4c29146", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -47,7 +47,7 @@ "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -225,16 +225,16 @@ ], "devDependencies": [] }, - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9": { "id": - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "name": "esy-skia", "version": - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e", "source": { "type": "install", "source": [ - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e" ] }, "overrides": [], diff --git a/doc.esy.lock/index.json b/doc.esy.lock/index.json index 847716806..5c380c053 100644 --- a/doc.esy.lock/index.json +++ b/doc.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "b0f0ab63325c9923015999637ea67ae1", + "checksum": "8fe6e7cec83d64dcf6676b558e51015d", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -90,7 +90,7 @@ "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "http-server@0.12.3@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -476,16 +476,16 @@ "dependencies": [], "devDependencies": [] }, - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9": { "id": - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "name": "esy-skia", "version": - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e", "source": { "type": "install", "source": [ - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e" ] }, "overrides": [], diff --git a/esy.lock/index.json b/esy.lock/index.json index ae18a382d..0674cec47 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "ce311cc411ea1b9846c68a24031a2c9a", + "checksum": "d8489440e84bf1351601902cc4c29146", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -47,7 +47,7 @@ "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -225,16 +225,16 @@ ], "devDependencies": [] }, - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9": { "id": - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "name": "esy-skia", "version": - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e", "source": { "type": "install", "source": [ - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e" ] }, "overrides": [], diff --git a/examples.esy.lock/index.json b/examples.esy.lock/index.json index cd49acb3e..5fa8e46b5 100644 --- a/examples.esy.lock/index.json +++ b/examples.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "ce311cc411ea1b9846c68a24031a2c9a", + "checksum": "d8489440e84bf1351601902cc4c29146", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -47,7 +47,7 @@ "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -225,16 +225,16 @@ ], "devDependencies": [] }, - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9": { "id": - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "name": "esy-skia", "version": - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e", "source": { "type": "install", "source": [ - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e" ] }, "overrides": [], diff --git a/js.esy.lock/index.json b/js.esy.lock/index.json index f60b68562..5b555e82d 100644 --- a/js.esy.lock/index.json +++ b/js.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "e24ab8fc51602f8cb8117449a7f1ce1e", + "checksum": "2ffdde5090c28bad7a5c4659f9729ab2", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -90,7 +90,7 @@ "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "http-server@0.12.3@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", @@ -480,16 +480,16 @@ "dependencies": [], "devDependencies": [] }, - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9": { "id": - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "name": "esy-skia", "version": - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e", "source": { "type": "install", "source": [ - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e" ] }, "overrides": [], diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json index 57c7622bc..2a7d3c4aa 100644 --- a/test.esy.lock/index.json +++ b/test.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "5484cc085160934d9bbabfdedb0ca751", + "checksum": "37920fdf5ea1dab58a27c708c7e2b913", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -47,7 +47,7 @@ "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@reason-native/rely@3.2.1@d41d8cd9", @@ -226,16 +226,16 @@ ], "devDependencies": [] }, - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9": { + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9": { "id": - "esy-skia@github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b@d41d8cd9", + "esy-skia@github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e@d41d8cd9", "name": "esy-skia", "version": - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b", + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e", "source": { "type": "install", "source": [ - "github:Et7f3/esy-skia#3f0369727eecabd88715d65e8b87d3bddeb10c5b" + "github:Et7f3/esy-skia#f41cb2498dc9d85b6e90c14a3c5d0c4af9b4c60e" ] }, "overrides": [],