From e016f9d904cf06362aaf359878eac3acfd482821 Mon Sep 17 00:00:00 2001 From: Tom Ekander Date: Tue, 7 Apr 2020 13:33:57 +0200 Subject: [PATCH] Use roundRect --- esy.lock/index.json | 1085 +++++++++++++++++++++++++++--------- src/Draw/CanvasContext.re | 6 +- src/UI/ImageNode.re | 28 +- src/UI_Primitives/Image.re | 12 + 4 files changed, 873 insertions(+), 258 deletions(-) diff --git a/esy.lock/index.json b/esy.lock/index.json index 19173bc56..8a46d5b31 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -3,11 +3,9 @@ "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { - "id": - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", + "id": "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "name": "yarn-pkg-config", - "version": - "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79", + "version": "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79", "source": { "type": "install", "source": [ @@ -19,16 +17,15 @@ "devDependencies": [] }, "revery-text-wrap@github:revery-ui/revery-text-wrap#966383e@d41d8cd9": { - "id": - "revery-text-wrap@github:revery-ui/revery-text-wrap#966383e@d41d8cd9", + "id": "revery-text-wrap@github:revery-ui/revery-text-wrap#966383e@d41d8cd9", "name": "revery-text-wrap", "version": "github:revery-ui/revery-text-wrap#966383e", "source": { "type": "install", - "source": [ "github:revery-ui/revery-text-wrap#966383e" ] + "source": ["github:revery-ui/revery-text-wrap#966383e"] }, "overrides": [], - "dependencies": [ "@opam/dune@opam:2.5.0@aef1678b" ], + "dependencies": ["@opam/dune@opam:2.5.0@aef1678b"], "devDependencies": [] }, "revery@link-dev:./package.json": { @@ -43,21 +40,25 @@ "overrides": [], "dependencies": [ "revery-text-wrap@github:revery-ui/revery-text-wrap#966383e@d41d8cd9", - "reperf@1.5.0@d41d8cd9", "rench@1.9.1@d41d8cd9", + "reperf@1.5.0@d41d8cd9", + "rench@1.9.1@d41d8cd9", "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f003a0ab26d6e94932e88af9b58ce758f9a6@d41d8cd9", "flex@1.2.3@d41d8cd9", "esy-skia@github:revery-ui/esy-skia#d60e5fe@d41d8cd9", - "esy-sdl2@2.0.10008@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", + "esy-sdl2@2.0.10008@d41d8cd9", + "esy-harfbuzz@1.9.1008@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", "@opam/ppx_deriving@opam:4.5@bb81afdc", - "@opam/lwt_ppx@opam:2.0.1@ab0debb8", "@opam/lwt@opam:4.5.0@677655b4", + "@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", "@opam/dune@opam:2.5.0@aef1678b", "@opam/ctypes@opam:0.15.1@b0227b2f", - "@glennsl/timber@1.2.0@d41d8cd9", "@esy-ocaml/reason@3.6.0@d41d8cd9", + "@glennsl/timber@1.2.0@d41d8cd9", + "@esy-ocaml/reason@3.6.0@d41d8cd9", "@brisk/brisk-reconciler@github:briskml/brisk-reconciler#10cab2d@d41d8cd9" ], "devDependencies": [ @@ -78,9 +79,11 @@ }, "overrides": [], "dependencies": [ - "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9", + "refmterr@3.3.2@d41d8cd9", + "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/printbox@opam:0.5@82f5d436", "@opam/dune@opam:2.5.0@aef1678b", + "@opam/printbox@opam:0.5@82f5d436", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] @@ -97,11 +100,13 @@ }, "overrides": [], "dependencies": [ - "refmterr@3.3.2@d41d8cd9", "@reason-native/rely@3.2.1@d41d8cd9", + "refmterr@3.3.2@d41d8cd9", + "@reason-native/rely@3.2.1@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", "@opam/lambda-term@opam:3.1.0@8adc2660", - "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.5.0@aef1678b", + "@opam/fpath@opam:0.7.2@45477b93", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] @@ -118,9 +123,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", + "ocaml@4.10.0@d41d8cd9", + "@reason-native/pastel@0.1.0@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.0@aef1678b", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/atdgen@opam:2.2.1@d73fda11", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], @@ -132,21 +139,20 @@ "version": "github:jchavarri/rebez#03fa3b7", "source": { "type": "install", - "source": [ "github:jchavarri/rebez#03fa3b7" ] + "source": ["github:jchavarri/rebez#03fa3b7"] }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] }, "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f003a0ab26d6e94932e88af9b58ce758f9a6@d41d8cd9": { - "id": - "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f003a0ab26d6e94932e88af9b58ce758f9a6@d41d8cd9", + "id": "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f003a0ab26d6e94932e88af9b58ce758f9a6@d41d8cd9", "name": "reason-native-crash-utils", - "version": - "github:onivim/reason-native-crash-utils#38c8f003a0ab26d6e94932e88af9b58ce758f9a6", + "version": "github:onivim/reason-native-crash-utils#38c8f003a0ab26d6e94932e88af9b58ce758f9a6", "source": { "type": "install", "source": [ @@ -159,7 +165,7 @@ "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", "@opam/dune@opam:2.5.0@aef1678b" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": ["ocaml@4.10.0@d41d8cd9"] }, "ocaml@4.10.0@d41d8cd9": { "id": "ocaml@4.10.0@d41d8cd9", @@ -187,7 +193,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] @@ -198,7 +205,7 @@ "version": "github:revery-ui/esy-skia#d60e5fe", "source": { "type": "install", - "source": [ "github:revery-ui/esy-skia#d60e5fe" ] + "source": ["github:revery-ui/esy-skia#d60e5fe"] }, "overrides": [], "dependencies": [ @@ -221,26 +228,44 @@ "dependencies": [], "devDependencies": [] }, + "esy-openssl@archive:https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz#sha1:df0ee4811c87c209ebadb4e6b203d1e560d00f9a@4108b898": { + "id": "esy-openssl@archive:https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz#sha1:df0ee4811c87c209ebadb4e6b203d1e560d00f9a@4108b898", + "name": "esy-openssl", + "version": "archive:https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz#sha1:df0ee4811c87c209ebadb4e6b203d1e560d00f9a", + "source": { + "type": "install", + "source": [ + "archive:https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz#sha1:df0ee4811c87c209ebadb4e6b203d1e560d00f9a" + ] + }, + "overrides": [ + "esy.lock/overrides/4108b898e4249d2037785df23c0d9d38/package.json" + ], + "dependencies": [ + "@opam/conf-pkg-config@opam:1.1@55d8e330", + "@opam/conf-autoconf@github:esy-packages/esy-autoconf:package.json#fb93edf@d41d8cd9" + ], + "devDependencies": [] + }, "esy-nasm@github:revery-ui/esy-nasm#64a802b@d41d8cd9": { "id": "esy-nasm@github:revery-ui/esy-nasm#64a802b@d41d8cd9", "name": "esy-nasm", "version": "github:revery-ui/esy-nasm#64a802b", "source": { "type": "install", - "source": [ "github:revery-ui/esy-nasm#64a802b" ] + "source": ["github:revery-ui/esy-nasm#64a802b"] }, "overrides": [], "dependencies": [], "devDependencies": [] }, "esy-libjpeg-turbo@github:revery-ui/libjpeg-turbo#dbb3dd5@d41d8cd9": { - "id": - "esy-libjpeg-turbo@github:revery-ui/libjpeg-turbo#dbb3dd5@d41d8cd9", + "id": "esy-libjpeg-turbo@github:revery-ui/libjpeg-turbo#dbb3dd5@d41d8cd9", "name": "esy-libjpeg-turbo", "version": "github:revery-ui/libjpeg-turbo#dbb3dd5", "source": { "type": "install", - "source": [ "github:revery-ui/libjpeg-turbo#dbb3dd5" ] + "source": ["github:revery-ui/libjpeg-turbo#dbb3dd5"] }, "overrides": [], "dependencies": [ @@ -250,6 +275,20 @@ ], "devDependencies": [] }, + "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9": { + "id": "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9", + "name": "esy-help2man", + "version": "github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443", + "source": { + "type": "install", + "source": [ + "github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443" + ] + }, + "overrides": [], + "dependencies": [], + "devDependencies": [] + }, "esy-harfbuzz@1.9.1008@d41d8cd9": { "id": "esy-harfbuzz@1.9.1008@d41d8cd9", "name": "esy-harfbuzz", @@ -261,7 +300,7 @@ ] }, "overrides": [], - "dependencies": [ "esy-cmake@0.3.5@d41d8cd9" ], + "dependencies": ["esy-cmake@0.3.5@d41d8cd9"], "devDependencies": [] }, "esy-freetype2@2.9.1007@d41d8cd9": { @@ -275,7 +314,7 @@ ] }, "overrides": [], - "dependencies": [ "esy-cmake@0.3.5@d41d8cd9" ], + "dependencies": ["esy-cmake@0.3.5@d41d8cd9"], "devDependencies": [] }, "esy-cmake@0.3.5@d41d8cd9": { @@ -298,11 +337,11 @@ "version": "github:zbaylin/esy-astyle#59bc21a", "source": { "type": "install", - "source": [ "github:zbaylin/esy-astyle#59bc21a" ] + "source": ["github:zbaylin/esy-astyle#59bc21a"] }, "overrides": [], - "dependencies": [ "esy-cmake@0.3.5@d41d8cd9" ], - "devDependencies": [ "esy-cmake@0.3.5@d41d8cd9" ] + "dependencies": ["esy-cmake@0.3.5@d41d8cd9"], + "devDependencies": ["esy-cmake@0.3.5@d41d8cd9"] }, "@revery/esy-cmake@0.3.5001@d41d8cd9": { "id": "@revery/esy-cmake@0.3.5001@d41d8cd9", @@ -330,11 +369,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", + "ocaml@4.10.0@d41d8cd9", + "@reason-native/pastel@0.1.0@d41d8cd9", "@reason-native/file-context-printer@0.0.3@d41d8cd9", "@reason-native/cli@0.0.1-alpha@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.2@0b7bd730", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/junit@opam:2.0.2@0b7bd730", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] }, @@ -350,7 +392,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] @@ -367,8 +410,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@reason-native/pastel@0.1.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] @@ -385,7 +430,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] @@ -402,8 +448,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@reason-native/pastel@0.1.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] @@ -426,7 +474,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "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/camomile@opam:1.0.2@51b42ad8", @@ -434,7 +483,8 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "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/camomile@opam:1.0.2@51b42ad8", @@ -459,14 +509,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.10.0@d41d8cd9", + "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/cppo@opam:1.6.6@f4f83858", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.0@aef1678b", "@opam/biniou@opam:1.2.1@d7570399" + "ocaml@4.10.0@d41d8cd9", + "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -487,14 +541,47 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "ocaml@4.10.0@d41d8cd9", + "@opam/uchar@opam:0.0.2@c8218eea", "@opam/topkg@opam:1.0.1@a42c631e", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + "ocaml@4.10.0@d41d8cd9", + "@opam/uchar@opam:0.0.2@c8218eea" + ] + }, + "@opam/uri@opam:3.1.0@d38ac0ae": { + "id": "@opam/uri@opam:3.1.0@d38ac0ae", + "name": "@opam/uri", + "version": "opam:3.1.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/c4/c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43#sha256:c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43", + "archive:https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz#sha256:c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" + ], + "opam": { + "name": "uri", + "version": "3.1.0", + "path": "esy.lock/opam/uri.3.1.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/stringext@opam:1.6.0@104bc94b", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.4.0@639d28a3", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/stringext@opam:1.6.0@104bc94b", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.4.0@639d28a3" ] }, "@opam/uchar@opam:0.0.2@c8218eea": { @@ -515,10 +602,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.10.0@d41d8cd9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": ["ocaml@4.10.0@d41d8cd9"] }, "@opam/tyxml@opam:4.4.0@1dca5713": { "id": "@opam/tyxml@opam:4.4.0@1dca5713", @@ -538,13 +626,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@opam/uutf@opam:1.0.2@4440868f", + "@opam/seq@opam:base@d8d7de1d", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", + "ocaml@4.10.0@d41d8cd9", + "@opam/uutf@opam:1.0.2@4440868f", + "@opam/seq@opam:base@d8d7de1d", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -566,11 +659,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/topkg@opam:1.0.1@a42c631e": { @@ -591,12 +686,43 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.10.0@d41d8cd9", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + "ocaml@4.10.0@d41d8cd9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03" + ] + }, + "@opam/stringext@opam:1.6.0@104bc94b": { + "id": "@opam/stringext@opam:1.6.0@104bc94b", + "name": "@opam/stringext", + "version": "opam:1.6.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/db/db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea", + "archive:https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" + ], + "opam": { + "name": "stringext", + "version": "1.6.0", + "path": "esy.lock/opam/stringext.1.6.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/base-bytes@opam:base@19d0c2ff", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/base-bytes@opam:base@19d0c2ff" ] }, "@opam/stdlib-shims@opam:0.1.0@d957c903": { @@ -617,11 +743,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/stdio@opam:v0.14.0@a624e254": { @@ -642,12 +770,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/base@opam:v0.14.0@b8817fc1", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/base@opam:v0.14.0@b8817fc1" ] }, @@ -669,11 +799,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -682,7 +814,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "seq", "version": "base", @@ -691,9 +823,40 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": ["ocaml@4.10.0@d41d8cd9"] + }, + "@opam/rresult@opam:0.6.0@4b185e72": { + "id": "@opam/rresult@opam:0.6.0@4b185e72", + "name": "@opam/rresult", + "version": "opam:0.6.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/ab/aba88cffa29081714468c2c7bcdf7fb1#md5:aba88cffa29081714468c2c7bcdf7fb1", + "archive:http://erratique.ch/software/rresult/releases/rresult-0.6.0.tbz#md5:aba88cffa29081714468c2c7bcdf7fb1" + ], + "opam": { + "name": "rresult", + "version": "0.6.0", + "path": "esy.lock/opam/rresult.0.6.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/topkg@opam:1.0.1@a42c631e", + "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/result@opam:1.5@6b753c82" + ] }, "@opam/result@opam:1.5@6b753c82": { "id": "@opam/result@opam:1.5@6b753c82", @@ -713,11 +876,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/react@opam:1.2.1@0e11855f": { @@ -738,12 +903,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "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", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": ["ocaml@4.10.0@d41d8cd9"] }, "@opam/re@opam:1.9.0@d4d5e13d": { "id": "@opam/re@opam:1.9.0@d4d5e13d", @@ -763,11 +929,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.10.0@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -789,14 +958,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.10.0@d41d8cd9", + "@opam/topkg@opam:1.0.1@a42c631e", "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82" + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82" ] }, "@opam/psq@opam:0.2.0@247756d4": { @@ -817,11 +988,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.10.0@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -843,13 +1017,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/uutf@opam:1.0.2@4440868f", + "@opam/tyxml@opam:4.4.0@1dca5713", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -871,19 +1048,23 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254", + "ocaml@4.10.0@d41d8cd9", + "@opam/stdio@opam:v0.14.0@a624e254", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", - "@opam/dune@opam:2.5.0@aef1678b", "@opam/base@opam:v0.14.0@b8817fc1", + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/base@opam:v0.14.0@b8817fc1", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254", + "ocaml@4.10.0@d41d8cd9", + "@opam/stdio@opam:v0.14.0@a624e254", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", - "@opam/dune@opam:2.5.0@aef1678b", "@opam/base@opam:v0.14.0@b8817fc1" + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/base@opam:v0.14.0@b8817fc1" ] }, "@opam/ppxfind@opam:1.4@1e01d2a5": { @@ -904,12 +1085,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.10.0@d41d8cd9", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.10.0@d41d8cd9", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -932,11 +1116,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.10.0@d41d8cd9", + "@opam/yojson@opam:1.7.0@7056d985", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -960,7 +1147,8 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", @@ -986,11 +1174,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/ppx_deriving@opam:4.5@bb81afdc": { @@ -1011,16 +1201,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@1e01d2a5", "@opam/ppx_tools@opam:6.1+4.10.0@d7f16ed7", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82", "@opam/ppx_tools@opam:6.1+4.10.0@d7f16ed7", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", @@ -1045,11 +1238,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/ocplib-endian@opam:1.1@84c1ca88": { @@ -1070,13 +1265,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -1099,15 +1296,15 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override" } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", + "ocaml@4.10.0@d41d8cd9", + "@opam/conf-m4@opam:1@3b2b148a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": ["ocaml@4.10.0@d41d8cd9"] }, "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -1127,14 +1324,14 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.0_opam_override" } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": ["ocaml@4.10.0@d41d8cd9"] }, "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47": { "id": "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", @@ -1154,22 +1351,23 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6@d41d8cd9": { - "id": - "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6@d41d8cd9", + "id": "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6@d41d8cd9", "name": "@opam/ocaml-lsp-server", - "version": - "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6", + "version": "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6", "source": { "type": "install", "source": [ @@ -1178,16 +1376,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.10.0@d41d8cd9", + "@opam/yojson@opam:1.7.0@7056d985", "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/menhir@opam:20200211@26571604", "@opam/dune-build-info@opam:2.5.1@921e5578", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "ocaml@4.10.0@d41d8cd9", + "@opam/yojson@opam:1.7.0@7056d985", "@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", @@ -1214,11 +1415,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/mmap@opam:1.1.0@b85334ff": { @@ -1239,11 +1442,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/mew_vi@opam:0.5.0@cf66c299": { @@ -1264,13 +1469,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/react@opam:1.2.1@0e11855f", + "@opam/mew@opam:0.1.0@a74f69d6", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/react@opam:1.2.1@0e11855f", + "@opam/mew@opam:0.1.0@a74f69d6", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/mew@opam:0.1.0@a74f69d6": { @@ -1291,13 +1500,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/trie@opam:1.0.0@d2efc587", - "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/trie@opam:1.0.0@d2efc587", + "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/trie@opam:1.0.0@d2efc587", - "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/trie@opam:1.0.0@d2efc587", + "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/merlin-extend@opam:0.5@675b1611": { @@ -1318,11 +1531,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", - "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/cppo@opam:1.6.6@f4f83858", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/menhirSdk@opam:20200211@b2a79ec0": { @@ -1343,11 +1559,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/menhirLib@opam:20200211@93d0f001": { @@ -1368,11 +1586,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/menhir@opam:20200211@26571604": { @@ -1393,25 +1613,54 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", + "ocaml@4.10.0@d41d8cd9", + "@opam/menhirSdk@opam:20200211@b2a79ec0", "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b", + "@opam/fix@opam:20200131@0ecd2f01", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", + "ocaml@4.10.0@d41d8cd9", + "@opam/menhirSdk@opam:20200211@b2a79ec0", "@opam/menhirLib@opam:20200211@93d0f001", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/lwt_react@opam:1.1.3@72987fcf": { - "id": "@opam/lwt_react@opam:1.1.3@72987fcf", - "name": "@opam/lwt_react", + "@opam/magic-mime@opam:1.1.2@980f82fb": { + "id": "@opam/magic-mime@opam:1.1.2@980f82fb", + "name": "@opam/magic-mime", + "version": "opam:1.1.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/0c/0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb#sha256:0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb", + "archive:https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz#sha256:0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" + ], + "opam": { + "name": "magic-mime", + "version": "1.1.2", + "path": "esy.lock/opam/magic-mime.1.1.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3" + ] + }, + "@opam/lwt_react@opam:1.1.3@72987fcf": { + "id": "@opam/lwt_react@opam:1.1.3@72987fcf", + "name": "@opam/lwt_react", "version": "opam:1.1.3", "source": { "type": "install", @@ -1427,13 +1676,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/react@opam:1.2.1@0e11855f", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/react@opam:1.2.1@0e11855f", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/lwt_ppx@opam:2.0.1@ab0debb8": { @@ -1457,14 +1710,16 @@ "ocaml@4.10.0@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b" + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/lwt_log@opam:1.1.1@2d7a797f": { @@ -1485,11 +1740,13 @@ }, "overrides": [], "dependencies": [ - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b" + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/lwt@opam:4.5.0@677655b4": { @@ -1510,18 +1767,21 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.10.0@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", - "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.10.0@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", @@ -1535,15 +1795,18 @@ "version": "github:bryphe/lru:lru.opam#2708c70", "source": { "type": "install", - "source": [ "github:bryphe/lru:lru.opam#2708c70" ] + "source": ["github:bryphe/lru:lru.opam#2708c70"] }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@opam/psq@opam:0.2.0@247756d4", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4" + "ocaml@4.10.0@d41d8cd9", + "@opam/psq@opam:0.2.0@247756d4" ] }, "@opam/logs@opam:0.7.0@1d03143e": { @@ -1564,14 +1827,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "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/lwt@opam:4.5.0@677655b4", "@opam/fmt@opam:0.8.8@01c3a23c", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": ["ocaml@4.10.0@d41d8cd9"] }, "@opam/lambda-term@opam:3.1.0@8adc2660": { "id": "@opam/lambda-term@opam:3.1.0@8adc2660", @@ -1591,21 +1856,25 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/zed@opam:3.1.0@86c55416", + "ocaml@4.10.0@d41d8cd9", + "@opam/zed@opam:3.1.0@86c55416", "@opam/react@opam:1.2.1@0e11855f", "@opam/mew_vi@opam:0.5.0@cf66c299", "@opam/lwt_react@opam:1.1.3@72987fcf", - "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", + "@opam/lwt_log@opam:1.1.1@2d7a797f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b", "@opam/camomile@opam:1.0.2@51b42ad8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/zed@opam:3.1.0@86c55416", + "ocaml@4.10.0@d41d8cd9", + "@opam/zed@opam:3.1.0@86c55416", "@opam/react@opam:1.2.1@0e11855f", "@opam/mew_vi@opam:0.5.0@cf66c299", "@opam/lwt_react@opam:1.1.3@72987fcf", - "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", + "@opam/lwt_log@opam:1.1.1@2d7a797f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b", "@opam/camomile@opam:1.0.2@51b42ad8" ] @@ -1628,11 +1897,14 @@ }, "overrides": [], "dependencies": [ - "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/tyxml@opam:4.4.0@1dca5713", + "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/tyxml@opam:4.4.0@1dca5713", + "@opam/ptime@opam:0.8.5@0051d642", "@opam/dune@opam:2.5.0@aef1678b" ] }, @@ -1654,11 +1926,44 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" + ] + }, + "@opam/hpack@opam:0.2.0@9f3eae78": { + "id": "@opam/hpack@opam:0.2.0@9f3eae78", + "name": "@opam/hpack", + "version": "opam:0.2.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/c8/c883927ce8a9f3f7159ef7b20988f051#md5:c883927ce8a9f3f7159ef7b20988f051", + "archive:https://github.com/anmonteiro/ocaml-h2/releases/download/0.2.0/h2-0.2.0.tbz#md5:c883927ce8a9f3f7159ef7b20988f051" + ], + "opam": { + "name": "hpack", + "version": "0.2.0", + "path": "esy.lock/opam/hpack.0.2.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/faraday@opam:0.7.1@19546ee5", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/angstrom@opam:0.13.0@cf460a5e", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/faraday@opam:0.7.1@19546ee5", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/angstrom@opam:0.13.0@cf460a5e" ] }, "@opam/fpath@opam:0.7.2@45477b93": { @@ -1679,7 +1984,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.10.0@d41d8cd9", + "@opam/topkg@opam:1.0.1@a42c631e", "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -1687,7 +1993,8 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82", "@opam/astring@opam:0.8.3@4e5e17d5" ] }, @@ -1709,7 +2016,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "ocaml@4.10.0@d41d8cd9", + "@opam/topkg@opam:1.0.1@a42c631e", "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/seq@opam:base@d8d7de1d", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", @@ -1718,7 +2026,8 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@d957c903", + "ocaml@4.10.0@d41d8cd9", + "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/seq@opam:base@d8d7de1d" ] }, @@ -1740,11 +2049,106 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" + ] + }, + "@opam/faraday-lwt-unix@opam:0.7.1@4854f547": { + "id": "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", + "name": "@opam/faraday-lwt-unix", + "version": "opam:0.7.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", + "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" + ], + "opam": { + "name": "faraday-lwt-unix", + "version": "0.7.1", + "path": "esy.lock/opam/faraday-lwt-unix.0.7.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/faraday-lwt@opam:0.7.1@e28c97d1", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/base-unix@opam:base@87d0b2eb", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/faraday-lwt@opam:0.7.1@e28c97d1", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/base-unix@opam:base@87d0b2eb" + ] + }, + "@opam/faraday-lwt@opam:0.7.1@e28c97d1": { + "id": "@opam/faraday-lwt@opam:0.7.1@e28c97d1", + "name": "@opam/faraday-lwt", + "version": "opam:0.7.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", + "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" + ], + "opam": { + "name": "faraday-lwt", + "version": "0.7.1", + "path": "esy.lock/opam/faraday-lwt.0.7.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/faraday@opam:0.7.1@19546ee5", + "@opam/dune@opam:2.4.0@639d28a3", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.8.1000@d41d8cd9", + "@opam/lwt@opam:4.5.0@677655b4", + "@opam/faraday@opam:0.7.1@19546ee5", + "@opam/dune@opam:2.4.0@639d28a3" + ] + }, + "@opam/faraday@opam:0.7.1@19546ee5": { + "id": "@opam/faraday@opam:0.7.1@19546ee5", + "name": "@opam/faraday", + "version": "opam:0.7.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", + "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" + ], + "opam": { + "name": "faraday", + "version": "0.7.1", + "path": "esy.lock/opam/faraday.0.7.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/bigstringaf@opam:0.6.1@35f5e6d1", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/bigstringaf@opam:0.6.1@35f5e6d1" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -1765,11 +2169,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/dune-private-libs@opam:2.5.1@60c1661f": { @@ -1790,11 +2196,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" ] }, "@opam/dune-configurator@opam:2.5.1@aeb9d8d5": { @@ -1816,7 +2224,8 @@ "overrides": [], "dependencies": [ "@opam/dune-private-libs@opam:2.5.1@60c1661f", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/dune-private-libs@opam:2.5.1@60c1661f", @@ -1841,9 +2250,10 @@ }, "overrides": [], "dependencies": [ - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:2.5.0@aef1678b" ] + "devDependencies": ["@opam/dune@opam:2.5.0@aef1678b"] }, "@opam/dune@opam:2.5.0@aef1678b": { "id": "@opam/dune@opam:2.5.0@aef1678b", @@ -1863,12 +2273,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.0@d41d8cd9", + "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.0@d41d8cd9", + "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, @@ -1890,19 +2302,20 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ctypes_opam__c__0.15.1_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ctypes_opam__c__0.15.1_opam_override" } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.10.0@d41d8cd9", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/integers@opam:0.4.0@f7acfaeb", "@opam/conf-pkg-config@opam:1.2@d86c8f53", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/integers@opam:0.4.0@f7acfaeb", + "ocaml@4.10.0@d41d8cd9", + "@opam/integers@opam:0.4.0@f7acfaeb", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -1924,12 +2337,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -1939,7 +2354,7 @@ "version": "opam:1.2", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "conf-pkg-config", "version": "1.2", @@ -1948,8 +2363,7 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.2_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.2_opam_override" } ], "dependencies": [ @@ -1964,7 +2378,7 @@ "version": "opam:1", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "conf-m4", "version": "1", @@ -1972,7 +2386,21 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], + "devDependencies": [] + }, + "@opam/conf-autoconf@github:esy-packages/esy-autoconf:package.json#fb93edf@d41d8cd9": { + "id": "@opam/conf-autoconf@github:esy-packages/esy-autoconf:package.json#fb93edf@d41d8cd9", + "name": "@opam/conf-autoconf", + "version": "github:esy-packages/esy-autoconf:package.json#fb93edf", + "source": { + "type": "install", + "source": ["github:esy-packages/esy-autoconf:package.json#fb93edf"] + }, + "overrides": [], + "dependencies": [ + "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9" + ], "devDependencies": [] }, "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { @@ -1993,13 +2421,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.5.0@aef1678b", "@opam/camomile@opam:1.0.2@51b42ad8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.5.0@aef1678b", "@opam/camomile@opam:1.0.2@51b42ad8" ] @@ -2022,11 +2452,53 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" + "ocaml@4.10.0@d41d8cd9", + "@opam/dune@opam:2.5.0@aef1678b" + ] + }, + "@opam/bos@opam:0.2.0@df49e63f": { + "id": "@opam/bos@opam:0.2.0@df49e63f", + "name": "@opam/bos", + "version": "opam:0.2.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/ae/aeae7447567db459c856ee41b5a66fd2#md5:aeae7447567db459c856ee41b5a66fd2", + "archive:http://erratique.ch/software/bos/releases/bos-0.2.0.tbz#md5:aeae7447567db459c856ee41b5a66fd2" + ], + "opam": { + "name": "bos", + "version": "0.2.0", + "path": "esy.lock/opam/bos.0.2.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/topkg@opam:1.0.1@a42c631e", + "@opam/rresult@opam:0.6.0@4b185e72", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@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", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/rresult@opam:0.6.0@4b185e72", + "@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/biniou@opam:1.2.1@d7570399": { @@ -2047,21 +2519,111 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@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/easy-format@opam:1.3.2@0484b3c4", + "ocaml@4.10.0@d41d8cd9", + "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" ] }, + "@opam/bigstringaf@opam:0.6.1@35f5e6d1": { + "id": "@opam/bigstringaf@opam:0.6.1@35f5e6d1", + "name": "@opam/bigstringaf", + "version": "opam:0.6.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/dc/dccf639273b1eec0e0f142f21319268d#md5:dccf639273b1eec0e0f142f21319268d", + "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz#md5:dccf639273b1eec0e0f142f21319268d" + ], + "opam": { + "name": "bigstringaf", + "version": "0.6.1", + "path": "esy.lock/opam/bigstringaf.0.6.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/bigarray-compat@opam:1.0.0@1faefa97", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/bigarray-compat@opam:1.0.0@1faefa97" + ] + }, + "@opam/bigarray-compat@opam:1.0.0@1faefa97": { + "id": "@opam/bigarray-compat@opam:1.0.0@1faefa97", + "name": "@opam/bigarray-compat", + "version": "opam:1.0.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/1c/1cc7c25382a8900bada34aadfd66632e#md5:1cc7c25382a8900bada34aadfd66632e", + "archive:https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz#md5:1cc7c25382a8900bada34aadfd66632e" + ], + "opam": { + "name": "bigarray-compat", + "version": "1.0.0", + "path": "esy.lock/opam/bigarray-compat.1.0.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune@opam:2.4.0@639d28a3" + ] + }, + "@opam/base64@opam:3.4.0@f5b9ad9b": { + "id": "@opam/base64@opam:3.4.0@f5b9ad9b", + "name": "@opam/base64", + "version": "opam:3.4.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/1c/1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634#sha256:1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634", + "archive:https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz#sha256:1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" + ], + "opam": { + "name": "base64", + "version": "3.4.0", + "path": "esy.lock/opam/base64.3.4.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune-configurator@opam:2.4.0@6976bb12", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/base-bytes@opam:base@19d0c2ff", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune-configurator@opam:2.4.0@6976bb12", + "@opam/dune@opam:2.4.0@639d28a3", + "@opam/base-bytes@opam:base@19d0c2ff" + ] + }, "@opam/base-unix@opam:base@87d0b2eb": { "id": "@opam/base-unix@opam:base@87d0b2eb", "name": "@opam/base-unix", "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-unix", "version": "base", @@ -2069,7 +2631,7 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], "devDependencies": [] }, "@opam/base-threads@opam:base@36803084": { @@ -2078,7 +2640,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-threads", "version": "base", @@ -2086,7 +2648,7 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], "devDependencies": [] }, "@opam/base-bytes@opam:base@19d0c2ff": { @@ -2095,7 +2657,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-bytes", "version": "base", @@ -2104,11 +2666,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.10.0@d41d8cd9", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" + "ocaml@4.10.0@d41d8cd9", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9" ] }, "@opam/base@opam:v0.14.0@b8817fc1": { @@ -2129,12 +2693,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "ocaml@4.10.0@d41d8cd9", + "@opam/sexplib0@opam:v0.14.0@ddeb6438", "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", + "ocaml@4.10.0@d41d8cd9", + "@opam/sexplib0@opam:v0.14.0@ddeb6438", "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", "@opam/dune@opam:2.5.0@aef1678b" ] @@ -2157,14 +2724,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/yojson@opam:1.7.0@7056d985", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.0@aef1678b", + "ocaml@4.10.0@d41d8cd9", + "@opam/yojson@opam:1.7.0@7056d985", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/dune@opam:2.5.0@aef1678b", "@opam/biniou@opam:1.2.1@d7570399" ] }, @@ -2186,14 +2757,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.5.0@aef1678b", "@opam/biniou@opam:1.2.1@d7570399", + "ocaml@4.10.0@d41d8cd9", + "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", - "@opam/atd@opam:2.2.1@071ab6bd", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/atd@opam:2.2.1@071ab6bd", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.5.0@aef1678b", "@opam/biniou@opam:1.2.1@d7570399", + "ocaml@4.10.0@d41d8cd9", + "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.5.0@aef1678b", + "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "@opam/atd@opam:2.2.1@071ab6bd" ] @@ -2216,13 +2792,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", + "ocaml@4.10.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/menhir@opam:20200211@26571604", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@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", + "ocaml@4.10.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/menhir@opam:20200211@26571604", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" @@ -2246,14 +2825,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", + "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" + "ocaml@4.10.0@d41d8cd9", + "@opam/base-bytes@opam:base@19d0c2ff" ] }, "@glennsl/timber@1.2.0@d41d8cd9": { @@ -2268,9 +2849,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/logs@opam:0.7.0@1d03143e", "@opam/fmt@opam:0.8.8@01c3a23c", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/logs@opam:0.7.0@1d03143e", + "@opam/fmt@opam:0.8.8@01c3a23c", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/reason@3.6.0@d41d8cd9" ], "devDependencies": [] }, @@ -2300,12 +2884,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "ocaml@4.10.0@d41d8cd9", + "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.5@675b1611", "@opam/menhir@opam:20200211@26571604", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" + "@opam/fix@opam:20200131@0ecd2f01", + "@opam/dune@opam:2.5.0@aef1678b" ], "devDependencies": [] }, @@ -2324,20 +2910,21 @@ "devDependencies": [] }, "@brisk/brisk-reconciler@github:briskml/brisk-reconciler#10cab2d@d41d8cd9": { - "id": - "@brisk/brisk-reconciler@github:briskml/brisk-reconciler#10cab2d@d41d8cd9", + "id": "@brisk/brisk-reconciler@github:briskml/brisk-reconciler#10cab2d@d41d8cd9", "name": "@brisk/brisk-reconciler", "version": "github:briskml/brisk-reconciler#10cab2d", "source": { "type": "install", - "source": [ "github:briskml/brisk-reconciler#10cab2d" ] + "source": ["github:briskml/brisk-reconciler#10cab2d"] }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.13.0@65a9c7cc", - "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", + "@opam/ppxlib@opam:0.13.0@65a9c7cc", + "@opam/dune@opam:2.5.0@aef1678b", + "@esy-ocaml/reason@3.6.0@d41d8cd9" ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] + "devDependencies": ["ocaml@4.10.0@d41d8cd9"] } } -} \ No newline at end of file +} diff --git a/src/Draw/CanvasContext.re b/src/Draw/CanvasContext.re index 7e6c997fe..9bdccf5b2 100644 --- a/src/Draw/CanvasContext.re +++ b/src/Draw/CanvasContext.re @@ -204,17 +204,17 @@ let concat = (transform, context) => { }; let clipRect = - (v: t, ~clipOp: clipOp=Intersect, ~antiAlias=false, rect: Skia.Rect.t) => { + (v: t, ~clipOp: clipOp=Intersect, ~antiAlias=true, rect: Skia.Rect.t) => { Canvas.clipRect(v.canvas, rect, clipOp, antiAlias); }; let clipRRect = - (v: t, ~clipOp: clipOp=Intersect, ~antiAlias=false, rRect: Skia.RRect.t) => { + (v: t, ~clipOp: clipOp=Intersect, ~antiAlias=true, rRect: Skia.RRect.t) => { Canvas.clipRRect(v.canvas, rRect, clipOp, antiAlias); }; let clipPath = - (v: t, ~clipOp: clipOp=Intersect, ~antiAlias=false, path: Skia.Path.t) => { + (v: t, ~clipOp: clipOp=Intersect, ~antiAlias=true, path: Skia.Path.t) => { Canvas.clipPath(v.canvas, path, clipOp, antiAlias); }; diff --git a/src/UI/ImageNode.re b/src/UI/ImageNode.re index fe287ea6d..2b8d961ff 100644 --- a/src/UI/ImageNode.re +++ b/src/UI/ImageNode.re @@ -37,15 +37,31 @@ class imageNode (imagePath: string) = { let path = Skia.Path.make(); if (int_of_float(_borderRadius) !== 0) { - Skia.Path.addCircle( + let rect = + Skia.Rect.makeLtrb( + 0., + 0., + float_of_int(dimensions.width), + float_of_int(dimensions.height), + ); + /* Skia.Path.addCircle( */ + /* path, */ + /* float_of_int(dimensions.width / 2), */ + /* float_of_int(dimensions.height / 2), */ + /* float_of_int(dimensions.width / 2), */ + /* Clockwise, */ + /* ); */ + + Skia.Path.addRoundRect( path, - float_of_int(dimensions.width / 2), - float_of_int(dimensions.height / 2), - float_of_int(dimensions.width / 2), + rect, + _borderRadius, + _borderRadius, Clockwise, ); - path |> Draw.CanvasContext.clipPath(canvas, ~antiAlias=false); + path |> Draw.CanvasContext.clipPath(canvas, ~antiAlias=true); Draw.CanvasContext.drawPath(~path, ~paint=_paint, canvas); + Skia.Path.close(path); }; Revery_Draw.CanvasContext.setMatrix(canvas, world); @@ -66,4 +82,4 @@ class imageNode (imagePath: string) = { pub setSrc = newSrc => { src = newSrc; }; -}; +}; \ No newline at end of file diff --git a/src/UI_Primitives/Image.re b/src/UI_Primitives/Image.re index c285a1c54..b3f6886b1 100644 --- a/src/UI_Primitives/Image.re +++ b/src/UI_Primitives/Image.re @@ -23,6 +23,10 @@ let%nativeComponent make = ~onMouseMove=?, ~onMouseUp=?, ~onMouseWheel=?, + ~onMouseEnter=?, + ~onMouseLeave=?, + ~onMouseOver=?, + ~onMouseOut=?, ~ref=?, ~resizeMode=ImageResizeMode.Stretch, ~opacity=1.0, @@ -44,6 +48,10 @@ let%nativeComponent make = ~onMouseMove?, ~onMouseUp?, ~onMouseWheel?, + ~onMouseEnter?, + ~onMouseLeave?, + ~onMouseOver?, + ~onMouseOut?, (), ); let node = PrimitiveNodeFactory.get().createImageNode(src); @@ -62,6 +70,10 @@ let%nativeComponent make = ~onMouseMove?, ~onMouseUp?, ~onMouseWheel?, + ~onMouseEnter?, + ~onMouseLeave?, + ~onMouseOver?, + ~onMouseOut?, (), ); let imgNode: imageNode = Obj.magic(node);