diff --git a/bench.esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam b/bench.esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam index 09ef0da3c..ed6af9c23 100644 --- a/bench.esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam +++ b/bench.esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam @@ -29,9 +29,16 @@ rewriters independent of a compiler version. """ url { src: +<<<<<<< HEAD:bench.esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.7.3/ocaml-migrate-parsetree-v1.7.3.tbz" checksum: [ "sha256=6d85717bcf476b87f290714872ed4fbde0233dc899c3158a27f439d70224fb55" "sha512=fe9c74a244d160d973d8ca62e356edad4c872fc46471ddc668f854456d3979576895d446d49da2aee61c65b441b72c573225b0b254ab2eac4a0fb4debdbce9d4" +======= + "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.7.2/ocaml-migrate-parsetree-v1.7.2.tbz" + checksum: [ + "sha256=6ae6753c3e632a63f76b031afc3eab74b209babdfdba4030060a934ce0660bd6" + "sha512=68bfbbadbb6715cf0be5a02136cb3508c5f8d3debba69f9cdf9c0668ebc09fe47eac10abcdc3eb0e5e19f33a223e193da039a3e203bec1404bd177635f1a93d7" +>>>>>>> Chore: Update API to reflect Reason Skia-changes:esy.lock/opam/ocaml-migrate-parsetree.1.7.2/opam ] } diff --git a/esy.lock/index.json b/esy.lock/index.json index 8a46d5b31..aaad3b921 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,11 +1,17 @@ { +<<<<<<< HEAD "checksum": "d42f42ea41262b01042684ac74fd312e", +======= + "checksum": "139b07416a06201dbf9b0387f0f9a894", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "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": [ @@ -17,15 +23,16 @@ "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.1@a0c1e658" ], "devDependencies": [] }, "revery@link-dev:./package.json": { @@ -40,9 +47,9 @@ "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", +<<<<<<< HEAD "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", @@ -65,6 +72,26 @@ "ocaml@4.10.0@d41d8cd9", "esy-astyle@github:zbaylin/esy-astyle#59bc21a@d41d8cd9", "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6@d41d8cd9" +======= + "reason-skia@github:revery-ui/reason-skia#5726a11@d41d8cd9", + "reason-sdl2@2.10.3021@d41d8cd9", + "reason-harfbuzz@1.91.8000@d41d8cd9", + "reason-font-manager@2.1.1@d41d8cd9", "flex@1.2.3@d41d8cd9", + "@reason-native/rely@3.2.1@d41d8cd9", + "@reason-native/console@0.0.3@d41d8cd9", + "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@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", + "@glennsl/timber@1.0.0@d41d8cd9", "@esy-ocaml/reason@3.5.2@d41d8cd9", + "@brisk/brisk-reconciler@github:briskml/brisk-reconciler#10cab2d@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "esy-astyle@github:zbaylin/esy-astyle#59bc21a@d41d8cd9", + "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#04733ed@d41d8cd9", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "reperf@1.5.0@d41d8cd9": { @@ -79,12 +106,19 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "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", "@esy-ocaml/reason@3.6.0@d41d8cd9" +======= + "refmterr@3.3.0@d41d8cd9", "ocaml@4.8.1000@d41d8cd9", + "@reason-native/pastel@0.1.0@d41d8cd9", + "@opam/printbox@opam:0.5@82f5d436", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -100,6 +134,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "refmterr@3.3.2@d41d8cd9", "@reason-native/rely@3.2.1@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", @@ -108,6 +143,14 @@ "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" +======= + "refmterr@3.3.0@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:2.0.3@9465cf1c", + "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -123,6 +166,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", @@ -130,6 +174,13 @@ "@opam/dune@opam:2.5.0@aef1678b", "@opam/atdgen@opam:2.2.1@d73fda11", "@esy-ocaml/reason@3.6.0@d41d8cd9" +======= + "ocaml@4.8.1000@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.1@a0c1e658", + "@opam/atdgen@opam:2.2.1@d73fda11", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -139,10 +190,11 @@ "version": "github:jchavarri/rebez#03fa3b7", "source": { "type": "install", - "source": ["github:jchavarri/rebez#03fa3b7"] + "source": [ "github:jchavarri/rebez#03fa3b7" ] }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" @@ -153,6 +205,73 @@ "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", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" + ], + "devDependencies": [] + }, + "reason-skia@github:revery-ui/reason-skia#5726a11@d41d8cd9": { + "id": "reason-skia@github:revery-ui/reason-skia#5726a11@d41d8cd9", + "name": "reason-skia", + "version": "github:revery-ui/reason-skia#5726a11", + "source": { + "type": "install", + "source": [ "github:revery-ui/reason-skia#5726a11" ] + }, + "overrides": [], + "dependencies": [ + "refmterr@3.3.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", + "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", + "esy-skia@github:revery-ui/esy-skia#07c13a9@d41d8cd9", + "esy-sdl2@2.0.10006@d41d8cd9", "esy-freetype2@2.9.1007@d41d8cd9", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.1@a0c1e658", + "@opam/ctypes@opam:0.15.1@b0227b2f", + "@esy-ocaml/reason@3.5.2@d41d8cd9" + ], + "devDependencies": [ "@opam/dune@opam:2.5.1@a0c1e658" ] + }, + "reason-sdl2@2.10.3021@d41d8cd9": { + "id": "reason-sdl2@2.10.3021@d41d8cd9", + "name": "reason-sdl2", + "version": "2.10.3021", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/reason-sdl2/-/reason-sdl2-2.10.3021.tgz#sha1:9ea4f7a663c49954db438fe5d914bafd7864d0e0" + ] + }, + "overrides": [], + "dependencies": [ + "refmterr@3.3.0@d41d8cd9", "esy-sdl2@2.0.10006@d41d8cd9", + "esy-cmake@github:prometheansacrifice/esy-cmake#2a47392def755@d41d8cd9", + "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/reason@3.5.2@d41d8cd9" + ], + "devDependencies": [] + }, + "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9": { + "id": + "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", + "name": "reason-native-crash-utils", + "version": "github:onivim/reason-native-crash-utils#ae1fd34", + "source": { + "type": "install", + "source": [ "github:onivim/reason-native-crash-utils#ae1fd34" ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/reason@3.5.2@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + }, + "reason-harfbuzz@1.91.8000@d41d8cd9": { + "id": "reason-harfbuzz@1.91.8000@d41d8cd9", + "name": "reason-harfbuzz", + "version": "1.91.8000", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "source": { "type": "install", "source": [ @@ -161,14 +280,42 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "esy-harfbuzz@1.9.1008@d41d8cd9", + "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/reason@3.5.2@d41d8cd9" + ], + "devDependencies": [] + }, + "reason-font-manager@2.1.1@d41d8cd9": { + "id": "reason-font-manager@2.1.1@d41d8cd9", + "name": "reason-font-manager", + "version": "2.1.1", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/reason-font-manager/-/reason-font-manager-2.1.1.tgz#sha1:3505aa2c32798eddd67d9af770f164b6b77c155b" + ] + }, + "overrides": [], + "dependencies": [ + "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": ["ocaml@4.10.0@d41d8cd9"] }, +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9": { "id": "ocaml@4.10.0@d41d8cd9", +======= + "ocaml@4.8.1000@d41d8cd9": { + "id": "ocaml@4.8.1000@d41d8cd9", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "name": "ocaml", "version": "4.10.0", "source": { @@ -193,9 +340,14 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -205,7 +357,11 @@ "version": "github:revery-ui/esy-skia#d60e5fe", "source": { "type": "install", +<<<<<<< HEAD "source": ["github:revery-ui/esy-skia#d60e5fe"] +======= + "source": [ "github:revery-ui/esy-skia#07c13a9" ] +>>>>>>> Chore: Update API to reflect Reason Skia-changes }, "overrides": [], "dependencies": [ @@ -228,44 +384,35 @@ "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": [] }, +<<<<<<< HEAD "esy-libjpeg-turbo@github:revery-ui/libjpeg-turbo#dbb3dd5@d41d8cd9": { "id": "esy-libjpeg-turbo@github:revery-ui/libjpeg-turbo#dbb3dd5@d41d8cd9", +======= + "esy-libjpeg-turbo@github:revery-ui/libjpeg-turbo#61e031f@d41d8cd9": { + "id": + "esy-libjpeg-turbo@github:revery-ui/libjpeg-turbo#61e031f@d41d8cd9", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "name": "esy-libjpeg-turbo", "version": "github:revery-ui/libjpeg-turbo#dbb3dd5", "source": { "type": "install", +<<<<<<< HEAD "source": ["github:revery-ui/libjpeg-turbo#dbb3dd5"] +======= + "source": [ "github:revery-ui/libjpeg-turbo#61e031f" ] +>>>>>>> Chore: Update API to reflect Reason Skia-changes }, "overrides": [], "dependencies": [ @@ -275,20 +422,6 @@ ], "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", @@ -317,15 +450,25 @@ "dependencies": ["esy-cmake@0.3.5@d41d8cd9"], "devDependencies": [] }, +<<<<<<< HEAD "esy-cmake@0.3.5@d41d8cd9": { "id": "esy-cmake@0.3.5@d41d8cd9", +======= + "esy-cmake@github:prometheansacrifice/esy-cmake#2a47392def755@d41d8cd9": { + "id": + "esy-cmake@github:prometheansacrifice/esy-cmake#2a47392def755@d41d8cd9", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "name": "esy-cmake", "version": "0.3.5", "source": { "type": "install", +<<<<<<< HEAD "source": [ "archive:https://registry.npmjs.org/esy-cmake/-/esy-cmake-0.3.5.tgz#sha1:2df0bdfe9317fbcded5f463fca1f346464494c7a" ] +======= + "source": [ "github:prometheansacrifice/esy-cmake#2a47392def755" ] +>>>>>>> Chore: Update API to reflect Reason Skia-changes }, "overrides": [], "dependencies": [], @@ -337,7 +480,7 @@ "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"], @@ -369,6 +512,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", "@reason-native/file-context-printer@0.0.3@d41d8cd9", @@ -377,6 +521,13 @@ "@opam/junit@opam:2.0.2@0b7bd730", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" +======= + "ocaml@4.8.1000@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.1@a0c1e658", "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -392,9 +543,14 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -410,11 +566,17 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "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" +======= + "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -430,9 +592,14 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.6.0@d41d8cd9" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -448,11 +615,17 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "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" +======= + "ocaml@4.8.1000@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -474,18 +647,28 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/charInfo_width@opam:1.1.0@9d8d61b2", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/charInfo_width@opam:1.1.0@9d8d61b2", "@opam/camomile@opam:1.0.2@51b42ad8", "@opam/base-bytes@opam:base@19d0c2ff" @@ -509,18 +692,28 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "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.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/cppo@opam:1.6.6@f4f83858", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "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.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/biniou@opam:1.2.1@d7570399" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -541,14 +734,19 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] @@ -582,6 +780,9 @@ "@opam/stringext@opam:1.6.0@104bc94b", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.4.0@639d28a3" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/uchar@opam:0.0.2@c8218eea": { @@ -602,11 +803,18 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "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"] +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] +>>>>>>> Chore: Update API to reflect Reason Skia-changes }, "@opam/tyxml@opam:4.4.0@1dca5713": { "id": "@opam/tyxml@opam:4.4.0@1dca5713", @@ -626,6 +834,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", @@ -639,6 +848,16 @@ "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@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.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@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.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/trie@opam:1.0.0@d2efc587": { @@ -686,12 +905,17 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] @@ -723,6 +947,9 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/base-bytes@opam:base@19d0c2ff" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/stdlib-shims@opam:0.1.0@d957c903": { @@ -743,6 +970,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -750,6 +978,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/stdio@opam:v0.14.0@a624e254": { @@ -770,6 +1005,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@opam/base@opam:v0.14.0@b8817fc1", @@ -779,6 +1015,15 @@ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@opam/base@opam:v0.14.0@b8817fc1" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@opam/base@opam:v0.13.1@7d937ed0", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@opam/base@opam:v0.13.1@7d937ed0" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/sexplib0@opam:v0.14.0@ddeb6438": { @@ -799,6 +1044,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -806,6 +1052,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -814,7 +1067,7 @@ "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "seq", "version": "base", @@ -823,6 +1076,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -852,11 +1106,11 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" +======= + "ocaml@4.8.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], - "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", - "@opam/result@opam:1.5@6b753c82" - ] + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, "@opam/result@opam:1.5@6b753c82": { "id": "@opam/result@opam:1.5@6b753c82", @@ -876,6 +1130,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -883,6 +1138,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/react@opam:1.2.1@0e11855f": { @@ -903,13 +1165,21 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], +<<<<<<< HEAD "devDependencies": ["ocaml@4.10.0@d41d8cd9"] +======= + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] +>>>>>>> Chore: Update API to reflect Reason Skia-changes }, "@opam/re@opam:1.9.0@d4d5e13d": { "id": "@opam/re@opam:1.9.0@d4d5e13d", @@ -929,6 +1199,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:2.5.0@aef1678b", @@ -938,6 +1209,14 @@ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ptime@opam:0.8.5@0051d642": { @@ -958,16 +1237,24 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/psq@opam:0.2.0@247756d4": { @@ -988,6 +1275,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:2.5.0@aef1678b", @@ -997,6 +1285,14 @@ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/printbox@opam:0.5@82f5d436": { @@ -1017,16 +1313,25 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "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.8.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -1048,6 +1353,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", @@ -1065,6 +1371,21 @@ "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", "@opam/dune@opam:2.5.0@aef1678b", "@opam/base@opam:v0.14.0@b8817fc1" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/stdio@opam:v0.13.0@eb59d879", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/base@opam:v0.13.1@7d937ed0", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/stdio@opam:v0.13.0@eb59d879", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/base@opam:v0.13.1@7d937ed0" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ppxfind@opam:1.4@1e01d2a5": { @@ -1085,6 +1406,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", @@ -1096,6 +1418,16 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": { @@ -1116,6 +1448,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/dune@opam:2.5.0@aef1678b", @@ -1125,6 +1458,14 @@ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1": { @@ -1145,6 +1486,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/dune@opam:2.5.0@aef1678b", @@ -1154,6 +1496,16 @@ "ocaml@4.10.0@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ppx_tools@opam:6.1+4.10.0@d7f16ed7": { @@ -1174,6 +1526,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1181,6 +1534,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ppx_deriving@opam:4.5@bb81afdc": { @@ -1201,6 +1561,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@1e01d2a5", @@ -1218,6 +1579,22 @@ "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppxfind@opam:1.4@c51fd7bf", + "@opam/ppx_tools@opam:6.0+4.08.0@5f5453f4", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/cppo@opam:1.6.6@f4f83858", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_tools@opam:6.0+4.08.0@5f5453f4", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -1238,6 +1615,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1245,6 +1623,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ocplib-endian@opam:1.1@84c1ca88": { @@ -1265,15 +1650,23 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -1296,15 +1689,23 @@ }, "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": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": ["ocaml@4.10.0@d41d8cd9"] +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] +>>>>>>> Chore: Update API to reflect Reason Skia-changes }, "@opam/ocamlbuild@opam:0.14.0@6ac75d03": { "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -1324,10 +1725,12 @@ }, "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": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1347,29 +1750,63 @@ "name": "ocaml-migrate-parsetree", "version": "1.7.3", "path": "esy.lock/opam/ocaml-migrate-parsetree.1.7.3" +======= + "ocaml@4.8.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] + }, + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e": { + "id": "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "name": "@opam/ocaml-migrate-parsetree", + "version": "opam:1.7.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/6a/6ae6753c3e632a63f76b031afc3eab74b209babdfdba4030060a934ce0660bd6#sha256:6ae6753c3e632a63f76b031afc3eab74b209babdfdba4030060a934ce0660bd6", + "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.7.2/ocaml-migrate-parsetree-v1.7.2.tbz#sha256:6ae6753c3e632a63f76b031afc3eab74b209babdfdba4030060a934ce0660bd6" + ], + "opam": { + "name": "ocaml-migrate-parsetree", + "version": "1.7.2", + "path": "esy.lock/opam/ocaml-migrate-parsetree.1.7.2" +>>>>>>> Chore: Update API to reflect Reason Skia-changes } }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.5.0@aef1678b" + "@opam/dune@opam:2.5.1@a0c1e658" ] }, +<<<<<<< HEAD "@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", +======= + "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#04733ed@d41d8cd9": { + "id": + "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#04733ed@d41d8cd9", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "name": "@opam/ocaml-lsp-server", "version": "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6", "source": { "type": "install", +<<<<<<< HEAD "source": [ "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6" ] @@ -1378,10 +1815,18 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", +======= + "source": [ "github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#04733ed" ] + }, + "overrides": [], + "dependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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", +<<<<<<< HEAD "@opam/dune-build-info@opam:2.5.1@921e5578", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1389,12 +1834,22 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", +======= + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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", +<<<<<<< HEAD "@opam/dune-build-info@opam:2.5.1@921e5578", "@opam/dune@opam:2.5.0@aef1678b" +======= + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d": { @@ -1415,6 +1870,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1422,6 +1878,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/mmap@opam:1.1.0@b85334ff": { @@ -1442,6 +1905,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1480,6 +1944,13 @@ "@opam/react@opam:1.2.1@0e11855f", "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/mew@opam:0.1.0@a74f69d6": { @@ -1531,6 +2002,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", @@ -1539,6 +2011,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/menhirSdk@opam:20200211@b2a79ec0": { @@ -1559,6 +2038,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1566,6 +2046,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/menhirLib@opam:20200211@93d0f001": { @@ -1586,6 +2073,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1593,6 +2081,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/menhir@opam:20200211@26571604": { @@ -1613,49 +2108,30 @@ }, "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": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@b2a79ec0", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/menhirLib@opam:20200211@93d0f001", - "@opam/dune@opam:2.5.0@aef1678b" - ] - }, - "@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/dune@opam:2.5.1@a0c1e658" ] }, "@opam/lwt_react@opam:1.1.3@72987fcf": { @@ -1676,6 +2152,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt@opam:4.5.0@677655b4", @@ -1687,6 +2164,15 @@ "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/lwt_ppx@opam:2.0.1@ab0debb8": { @@ -1707,6 +2193,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@48c10ee1", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", @@ -1720,6 +2207,19 @@ "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", + "@opam/ppx_tools_versioned@opam:5.3.0@2c0dc023", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", + "@opam/ppx_tools_versioned@opam:5.3.0@2c0dc023", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/lwt_log@opam:1.1.1@2d7a797f": { @@ -1740,13 +2240,11 @@ }, "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.1@a0c1e658", "@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.1@a0c1e658" ] }, "@opam/lwt@opam:4.5.0@677655b4": { @@ -1767,26 +2265,42 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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", +<<<<<<< HEAD "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", +======= + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/cppo@opam:1.6.6@f4f83858", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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", +<<<<<<< HEAD "@opam/dune@opam:2.5.0@aef1678b" +======= + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/lru@github:bryphe/lru:lru.opam#2708c70@d41d8cd9": { @@ -1795,10 +2309,11 @@ "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": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4", "@opam/dune@opam:2.5.0@aef1678b", @@ -1807,6 +2322,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/logs@opam:0.7.0@1d03143e": { @@ -1827,16 +2349,23 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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" ], +<<<<<<< HEAD "devDependencies": ["ocaml@4.10.0@d41d8cd9"] +======= + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] +>>>>>>> Chore: Update API to reflect Reason Skia-changes }, "@opam/lambda-term@opam:3.1.0@8adc2660": { "id": "@opam/lambda-term@opam:3.1.0@8adc2660", @@ -1856,26 +2385,32 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/zed@opam:3.1.0@86c55416", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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/dune@opam:2.5.0@aef1678b", + "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/camomile@opam:1.0.2@51b42ad8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/zed@opam:3.1.0@86c55416", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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/dune@opam:2.5.0@aef1678b", + "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/camomile@opam:1.0.2@51b42ad8" ] }, @@ -1897,19 +2432,21 @@ }, "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.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/tyxml@opam:4.4.0@1dca5713", - "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:2.5.0@aef1678b" + "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:2.5.1@a0c1e658" ] }, +<<<<<<< HEAD "@opam/integers@opam:0.4.0@f7acfaeb": { "id": "@opam/integers@opam:0.4.0@f7acfaeb", +======= + "@opam/integers@opam:0.3.0@d6eefd3a": { + "id": "@opam/integers@opam:0.3.0@d6eefd3a", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "name": "@opam/integers", "version": "opam:0.4.0", "source": { @@ -1926,6 +2463,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1957,13 +2495,13 @@ "@opam/faraday@opam:0.7.1@19546ee5", "@opam/dune@opam:2.4.0@639d28a3", "@opam/angstrom@opam:0.13.0@cf460a5e", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" ] }, "@opam/fpath@opam:0.7.2@45477b93": { @@ -1984,8 +2522,12 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", @@ -1993,8 +2535,12 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/astring@opam:0.8.3@4e5e17d5" ] }, @@ -2016,8 +2562,12 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/stdlib-shims@opam:0.1.0@d957c903", "@opam/seq@opam:base@d8d7de1d", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", @@ -2026,8 +2576,12 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@d957c903", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@d957c903", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/seq@opam:base@d8d7de1d" ] }, @@ -2049,6 +2603,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -2143,12 +2698,13 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/bigstringaf@opam:0.6.1@35f5e6d1", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -2169,6 +2725,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -2176,6 +2733,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/dune-private-libs@opam:2.5.1@60c1661f": { @@ -2196,6 +2760,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -2203,6 +2768,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/dune-configurator@opam:2.5.1@aeb9d8d5": { @@ -2224,6 +2796,7 @@ "overrides": [], "dependencies": [ "@opam/dune-private-libs@opam:2.5.1@60c1661f", +<<<<<<< HEAD "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -2257,30 +2830,49 @@ }, "@opam/dune@opam:2.5.0@aef1678b": { "id": "@opam/dune@opam:2.5.0@aef1678b", +======= + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "@opam/dune-private-libs@opam:2.5.1@60c1661f", + "@opam/dune@opam:2.5.1@a0c1e658" + ] + }, + "@opam/dune@opam:2.5.1@a0c1e658": { + "id": "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "name": "@opam/dune", - "version": "opam:2.5.0", + "version": "opam:2.5.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/9c/9cc1661b9b173dd183867edcf8ee28a9ce79079a7d00316b719bdcba1d78d7da#sha256:9cc1661b9b173dd183867edcf8ee28a9ce79079a7d00316b719bdcba1d78d7da", - "archive:https://github.com/ocaml/dune/releases/download/2.5.0/dune-2.5.0.tbz#sha256:9cc1661b9b173dd183867edcf8ee28a9ce79079a7d00316b719bdcba1d78d7da" + "archive:https://opam.ocaml.org/cache/sha256/8f/8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b", + "archive:https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz#sha256:8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" ], "opam": { "name": "dune", - "version": "2.5.0", - "path": "esy.lock/opam/dune.2.5.0" + "version": "2.5.1", + "path": "esy.lock/opam/dune.2.5.1" } }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-threads@opam:base@36803084" ] }, @@ -2302,20 +2894,31 @@ }, "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": [ +<<<<<<< HEAD "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", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/integers@opam:0.3.0@d6eefd3a", + "@opam/conf-pkg-config@opam:1.1@55d8e330", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/integers@opam:0.4.0@f7acfaeb", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/integers@opam:0.3.0@d6eefd3a", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -2337,14 +2940,22 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -2354,7 +2965,7 @@ "version": "opam:1.2", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "conf-pkg-config", "version": "1.2", @@ -2363,7 +2974,12 @@ }, "overrides": [ { +<<<<<<< HEAD "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.1_opam_override" +>>>>>>> Chore: Update API to reflect Reason Skia-changes } ], "dependencies": [ @@ -2378,7 +2994,7 @@ "version": "opam:1", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "conf-m4", "version": "1", @@ -2386,21 +3002,7 @@ } }, "overrides": [], - "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" - ], + "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, "@opam/charInfo_width@opam:1.1.0@9d8d61b2": { @@ -2421,16 +3023,26 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/camomile@opam:1.0.2@51b42ad8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.5.0@aef1678b", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/camomile@opam:1.0.2@51b42ad8" ] }, @@ -2452,6 +3064,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -2489,16 +3102,13 @@ "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/base-unix@opam:base@87d0b2eb", "@opam/astring@opam:0.8.3@4e5e17d5", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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" + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.5.1@a0c1e658" ] }, "@opam/biniou@opam:1.2.1@d7570399": { @@ -2519,6 +3129,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b", @@ -2552,69 +3163,14 @@ "@opam/dune@opam:2.4.0@639d28a3", "@opam/bigarray-compat@opam:1.0.0@1faefa97", "@esy-ocaml/substs@0.0.1@d41d8cd9" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "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" + "ocaml@4.8.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", + "@opam/dune@opam:2.5.1@a0c1e658" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -2623,7 +3179,7 @@ "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "base-unix", "version": "base", @@ -2631,7 +3187,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": { @@ -2640,7 +3196,7 @@ "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "base-threads", "version": "base", @@ -2648,7 +3204,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": { @@ -2657,7 +3213,7 @@ "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "base-bytes", "version": "base", @@ -2666,6 +3222,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -2673,6 +3230,13 @@ "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/base@opam:v0.14.0@b8817fc1": { @@ -2693,6 +3257,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", @@ -2704,6 +3269,16 @@ "@opam/sexplib0@opam:v0.14.0@ddeb6438", "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be", + "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/sexplib0@opam:v0.13.0@3f54c2be", + "@opam/dune-configurator@opam:2.5.1@aeb9d8d5", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/atdgen-runtime@opam:2.2.1@6a3a6395": { @@ -2724,18 +3299,28 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "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.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ +<<<<<<< HEAD "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.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.5.1@a0c1e658", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/biniou@opam:1.2.1@d7570399" ] }, @@ -2757,6 +3342,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", "@opam/dune@opam:2.5.0@aef1678b", @@ -2770,6 +3356,16 @@ "@opam/yojson@opam:1.7.0@7056d985", "@opam/dune@opam:2.5.0@aef1678b", "@opam/biniou@opam:1.2.1@d7570399", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/biniou@opam:1.2.1@d7570399", + "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", + "@opam/atd@opam:2.2.1@071ab6bd", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/dune@opam:2.5.1@a0c1e658", "@opam/biniou@opam:1.2.1@d7570399", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "@opam/atd@opam:2.2.1@071ab6bd" ] @@ -2792,6 +3388,7 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/menhir@opam:20200211@26571604", @@ -2805,6 +3402,18 @@ "@opam/menhir@opam:20200211@26571604", "@opam/easy-format@opam:1.3.2@0484b3c4", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@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.1@a0c1e658", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.8.1000@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.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "@opam/astring@opam:0.8.3@4e5e17d5": { @@ -2825,14 +3434,19 @@ }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", +>>>>>>> Chore: Update API to reflect Reason Skia-changes "@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": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -2845,16 +3459,36 @@ "type": "install", "source": [ "archive:https://registry.npmjs.org/@glennsl/timber/-/timber-1.2.0.tgz#sha1:fd888b470eeef09d00482d1888eaa360e599daf4" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff" + ] + }, + "@glennsl/timber@1.0.0@d41d8cd9": { + "id": "@glennsl/timber@1.0.0@d41d8cd9", + "name": "@glennsl/timber", + "version": "1.0.0", + "source": { + "type": "install", + "source": [ + "archive:https://registry.npmjs.org/@glennsl/timber/-/timber-1.0.0.tgz#sha1:4fc919f19b7849d9877d842008b5960e5a502123" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ] }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "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" +======= + "refmterr@3.3.0@d41d8cd9", "ocaml@4.8.1000@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.1@a0c1e658", + "@esy-ocaml/reason@3.5.2@d41d8cd9" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -2872,18 +3506,19 @@ "dependencies": [], "devDependencies": [] }, - "@esy-ocaml/reason@3.6.0@d41d8cd9": { - "id": "@esy-ocaml/reason@3.6.0@d41d8cd9", + "@esy-ocaml/reason@3.5.2@d41d8cd9": { + "id": "@esy-ocaml/reason@3.5.2@d41d8cd9", "name": "@esy-ocaml/reason", - "version": "3.6.0", + "version": "3.5.2", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#sha1:ae98f3335e9e03ff0e01376830a14cd1246b5278" + "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.5.2.tgz#sha1:ac48b63fd66fbbc1d77ab6a2b7e3a1ba21a8f40b" ] }, "overrides": [], "dependencies": [ +<<<<<<< HEAD "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", @@ -2892,6 +3527,14 @@ "@opam/menhir@opam:20200211@26571604", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@aef1678b" +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocaml-migrate-parsetree@opam:1.7.2@bc8b618e", + "@opam/merlin-extend@opam:0.5@a5dd7d4b", + "@opam/menhir@opam:20200211@26571604", + "@opam/dune@opam:2.5.1@a0c1e658" +>>>>>>> Chore: Update API to reflect Reason Skia-changes ], "devDependencies": [] }, @@ -2910,21 +3553,29 @@ "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": [ +<<<<<<< HEAD "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"] +======= + "ocaml@4.8.1000@d41d8cd9", "@opam/ppxlib@opam:0.13.0@65a9c7cc", + "@opam/dune@opam:2.5.1@a0c1e658", "@esy-ocaml/reason@3.5.2@d41d8cd9" + ], + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] +>>>>>>> Chore: Update API to reflect Reason Skia-changes } } -} +} \ No newline at end of file diff --git a/esy.lock/opam/dune.2.5.0/opam b/esy.lock/opam/dune.2.5.1/opam similarity index 85% rename from esy.lock/opam/dune.2.5.0/opam rename to esy.lock/opam/dune.2.5.1/opam index 7441e4dd3..dae256a8a 100644 --- a/esy.lock/opam/dune.2.5.0/opam +++ b/esy.lock/opam/dune.2.5.1/opam @@ -46,9 +46,9 @@ depends: [ "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/2.5.0/dune-2.5.0.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.5.1/dune-2.5.1.tbz" checksum: [ - "sha256=9cc1661b9b173dd183867edcf8ee28a9ce79079a7d00316b719bdcba1d78d7da" - "sha512=fa29986243b73caa6ca01acbc55cfba5e454e069e737f53c32bee5abc7e3c4679fecdec232d34af63954287bebf0fb1cabe4a95c56147f457d82d1a72dd44223" + "sha256=8f77d3a87f208e0d7cccaa1c48c4bb1bb87d62d07c3f25e9b8ba298e028ce52b" + "sha512=f209f12ced10c1abf8782bdb0143f4cec77795f7174d2cc75130afb1e01550b01f2f77b9e3ec4888efdad83d2f9878d179b39126f824f4e522f3ef4da34bf27e" ] } diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.7.2/opam b/esy.lock/opam/ocaml-migrate-parsetree.1.7.2/opam new file mode 100644 index 000000000..ed6af9c23 --- /dev/null +++ b/esy.lock/opam/ocaml-migrate-parsetree.1.7.2/opam @@ -0,0 +1,44 @@ +opam-version: "2.0" +maintainer: "frederic.bour@lakaban.net" +authors: [ + "Frédéric Bour " + "Jérémie Dimino " +] +license: "LGPL-2.1 with OCaml linking exception" +homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree" +bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues" +dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git" +doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/" +tags: [ "syntax" "org:ocamllabs" ] +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "result" + "ppx_derivers" + "dune" {>= "1.9.0"} + "ocaml" {>= "4.02.3" & < "4.12"} +] +synopsis: "Convert OCaml parsetrees between different versions" +description: """ +Convert OCaml parsetrees between different versions + +This library converts parsetrees, outcometree and ast mappers between +different OCaml versions. High-level functions help making PPX +rewriters independent of a compiler version. +""" +url { + src: +<<<<<<< HEAD:bench.esy.lock/opam/ocaml-migrate-parsetree.1.7.3/opam + "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.7.3/ocaml-migrate-parsetree-v1.7.3.tbz" + checksum: [ + "sha256=6d85717bcf476b87f290714872ed4fbde0233dc899c3158a27f439d70224fb55" + "sha512=fe9c74a244d160d973d8ca62e356edad4c872fc46471ddc668f854456d3979576895d446d49da2aee61c65b441b72c573225b0b254ab2eac4a0fb4debdbce9d4" +======= + "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.7.2/ocaml-migrate-parsetree-v1.7.2.tbz" + checksum: [ + "sha256=6ae6753c3e632a63f76b031afc3eab74b209babdfdba4030060a934ce0660bd6" + "sha512=68bfbbadbb6715cf0be5a02136cb3508c5f8d3debba69f9cdf9c0668ebc09fe47eac10abcdc3eb0e5e19f33a223e193da039a3e203bec1404bd177635f1a93d7" +>>>>>>> Chore: Update API to reflect Reason Skia-changes:esy.lock/opam/ocaml-migrate-parsetree.1.7.2/opam + ] +} diff --git a/src/UI/ImageNode.re b/src/UI/ImageNode.re index 2b8d961ff..a1aba6c59 100644 --- a/src/UI/ImageNode.re +++ b/src/UI/ImageNode.re @@ -52,13 +52,7 @@ class imageNode (imagePath: string) = { /* Clockwise, */ /* ); */ - Skia.Path.addRoundRect( - path, - rect, - _borderRadius, - _borderRadius, - Clockwise, - ); + Skia.Path.addRoundRect(path, rect, _borderRadius, _borderRadius, ()); path |> Draw.CanvasContext.clipPath(canvas, ~antiAlias=true); Draw.CanvasContext.drawPath(~path, ~paint=_paint, canvas); Skia.Path.close(path); @@ -82,4 +76,4 @@ class imageNode (imagePath: string) = { pub setSrc = newSrc => { src = newSrc; }; -}; \ No newline at end of file +};