diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json index f1eb0b5ff0..3f4c34ad96 100644 --- a/bench.esy.lock/index.json +++ b/bench.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "696484669c273e4ff36e8f859e0e7350", + "checksum": "a0f6964dd4e6f5632edba7d438578e4d", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -131,20 +131,20 @@ }, "overrides": [], "dependencies": [ - "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "reason-libvterm@github:revery-ui/reason-libvterm#91bad1f@d41d8cd9", "isolinear@github:revery-ui/isolinear#b17ce17@d41d8cd9", "@glennsl/timber@1.0.0@d41d8cd9" ], "devDependencies": [] }, - "revery@github:revery-ui/revery#a0ec051@d41d8cd9": { - "id": "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9": { + "id": "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "name": "revery", - "version": "github:revery-ui/revery#a0ec051", + "version": "github:revery-ui/revery#bd3d702", "source": { "type": "install", - "source": [ "github:revery-ui/revery#a0ec051" ] + "source": [ "github:revery-ui/revery#bd3d702" ] }, "overrides": [], "dependencies": [ @@ -157,7 +157,7 @@ "reason-harfbuzz@1.91.8001@d41d8cd9", "reason-font-manager@2.1.1@d41d8cd9", "flex@1.2.3@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@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", @@ -994,7 +994,7 @@ "overrides": [], "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.9.1000@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/menhir@opam:20200211@26571604", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], @@ -1012,7 +1012,7 @@ "overrides": [], "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.9.1000@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [ "ocaml@4.9.1000@d41d8cd9" ] @@ -1151,7 +1151,7 @@ "overrides": [ "bench.json" ], "dependencies": [ "revery-terminal@github:revery-ui/revery-terminal#4e8ca1c@d41d8cd9", - "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "reperf@1.5.0@d41d8cd9", "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.2@d41d8cd9", @@ -1173,7 +1173,7 @@ "@opam/ppxlib@opam:0.13.0@65a9c7cc", "@opam/ppx_let@opam:v0.13.0@5703d2be", "@opam/ppx_deriving_yojson@opam:3.5.2@ca415fbe", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@677655b4", "@opam/luv@opam:0.5.2@bfb5a32a", "@opam/logs@opam:0.7.0@1d03143e", @@ -1989,7 +1989,7 @@ "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@1e01d2a5", "@opam/ppx_tools@opam:6.0+4.08.0@5f5453f4", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1997,24 +1997,24 @@ "ocaml@4.9.1000@d41d8cd9", "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/ppx_deriving@opam:4.4.1@208c6c8f": { - "id": "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc": { + "id": "@opam/ppx_deriving@opam:4.5@bb81afdc", "name": "@opam/ppx_deriving", - "version": "opam:4.4.1", + "version": "opam:4.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/27/27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f#sha256:27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f", - "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.4.1.tar.gz#sha256:27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f" + "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b", + "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b" ], "opam": { "name": "ppx_deriving", - "version": "4.4.1", - "path": "bench.esy.lock/opam/ppx_deriving.4.4.1" + "version": "4.5", + "path": "bench.esy.lock/opam/ppx_deriving.4.5" } }, "overrides": [], diff --git a/bench.esy.lock/opam/ppx_deriving.4.4.1/opam b/bench.esy.lock/opam/ppx_deriving.4.5/opam similarity index 71% rename from bench.esy.lock/opam/ppx_deriving.4.4.1/opam rename to bench.esy.lock/opam/ppx_deriving.4.5/opam index 1fd0d53cc1..13bd4a0fac 100644 --- a/bench.esy.lock/opam/ppx_deriving.4.4.1/opam +++ b/bench.esy.lock/opam/ppx_deriving.4.5/opam @@ -1,5 +1,5 @@ opam-version: "2.0" -maintainer: "whitequark " +maintainer: "thierry.martinez@inria.fr" authors: [ "whitequark " ] license: "MIT" homepage: "https://github.com/ocaml-ppx/ppx_deriving" @@ -10,7 +10,7 @@ tags: [ "syntax" ] build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version >= "4.03"} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} ] depends: [ @@ -22,7 +22,7 @@ depends: [ "ppx_tools" {>= "4.02.3"} "result" "ounit" {with-test} - "ocaml" {>= "4.02.2" & < "4.11.0"} + "ocaml" {>= "4.02" & < "4.12.0"} ] synopsis: "Type-driven code generation for OCaml >=4.02.2" description: """ @@ -31,6 +31,5 @@ code based on type definitions, and a set of useful plugins for common tasks. """ url { - src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.4.1.tar.gz" - checksum: "sha256=27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f" -} + src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz" + checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"} diff --git a/esy.lock/index.json b/esy.lock/index.json index b75192de61..d116d0de52 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "696484669c273e4ff36e8f859e0e7350", + "checksum": "a0f6964dd4e6f5632edba7d438578e4d", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -131,20 +131,20 @@ }, "overrides": [], "dependencies": [ - "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "reason-libvterm@github:revery-ui/reason-libvterm#91bad1f@d41d8cd9", "isolinear@github:revery-ui/isolinear#b17ce17@d41d8cd9", "@glennsl/timber@1.0.0@d41d8cd9" ], "devDependencies": [] }, - "revery@github:revery-ui/revery#a0ec051@d41d8cd9": { - "id": "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9": { + "id": "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "name": "revery", - "version": "github:revery-ui/revery#a0ec051", + "version": "github:revery-ui/revery#bd3d702", "source": { "type": "install", - "source": [ "github:revery-ui/revery#a0ec051" ] + "source": [ "github:revery-ui/revery#bd3d702" ] }, "overrides": [], "dependencies": [ @@ -157,7 +157,7 @@ "reason-harfbuzz@1.91.8001@d41d8cd9", "reason-font-manager@2.1.1@d41d8cd9", "flex@1.2.3@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@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", @@ -994,7 +994,7 @@ "overrides": [], "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.9.1000@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/menhir@opam:20200211@26571604", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], @@ -1012,7 +1012,7 @@ "overrides": [], "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.9.1000@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [ "ocaml@4.9.1000@d41d8cd9" ] @@ -1151,7 +1151,7 @@ "overrides": [], "dependencies": [ "revery-terminal@github:revery-ui/revery-terminal#4e8ca1c@d41d8cd9", - "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.2@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", @@ -1172,7 +1172,7 @@ "@opam/ppxlib@opam:0.13.0@65a9c7cc", "@opam/ppx_let@opam:v0.13.0@5703d2be", "@opam/ppx_deriving_yojson@opam:3.5.2@ca415fbe", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@677655b4", "@opam/luv@opam:0.5.2@bfb5a32a", "@opam/logs@opam:0.7.0@1d03143e", @@ -1988,7 +1988,7 @@ "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@1e01d2a5", "@opam/ppx_tools@opam:6.0+4.08.0@5f5453f4", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1996,24 +1996,24 @@ "ocaml@4.9.1000@d41d8cd9", "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/ppx_deriving@opam:4.4.1@208c6c8f": { - "id": "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc": { + "id": "@opam/ppx_deriving@opam:4.5@bb81afdc", "name": "@opam/ppx_deriving", - "version": "opam:4.4.1", + "version": "opam:4.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/27/27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f#sha256:27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f", - "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.4.1.tar.gz#sha256:27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f" + "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b", + "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b" ], "opam": { "name": "ppx_deriving", - "version": "4.4.1", - "path": "esy.lock/opam/ppx_deriving.4.4.1" + "version": "4.5", + "path": "esy.lock/opam/ppx_deriving.4.5" } }, "overrides": [], diff --git a/esy.lock/opam/ppx_deriving.4.4.1/opam b/esy.lock/opam/ppx_deriving.4.5/opam similarity index 71% rename from esy.lock/opam/ppx_deriving.4.4.1/opam rename to esy.lock/opam/ppx_deriving.4.5/opam index 1fd0d53cc1..13bd4a0fac 100644 --- a/esy.lock/opam/ppx_deriving.4.4.1/opam +++ b/esy.lock/opam/ppx_deriving.4.5/opam @@ -1,5 +1,5 @@ opam-version: "2.0" -maintainer: "whitequark " +maintainer: "thierry.martinez@inria.fr" authors: [ "whitequark " ] license: "MIT" homepage: "https://github.com/ocaml-ppx/ppx_deriving" @@ -10,7 +10,7 @@ tags: [ "syntax" ] build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version >= "4.03"} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} ] depends: [ @@ -22,7 +22,7 @@ depends: [ "ppx_tools" {>= "4.02.3"} "result" "ounit" {with-test} - "ocaml" {>= "4.02.2" & < "4.11.0"} + "ocaml" {>= "4.02" & < "4.12.0"} ] synopsis: "Type-driven code generation for OCaml >=4.02.2" description: """ @@ -31,6 +31,5 @@ code based on type definitions, and a set of useful plugins for common tasks. """ url { - src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.4.1.tar.gz" - checksum: "sha256=27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f" -} + src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz" + checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"} diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json index 005f5d54f0..a1b84caa63 100644 --- a/integrationtest.esy.lock/index.json +++ b/integrationtest.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "696484669c273e4ff36e8f859e0e7350", + "checksum": "a0f6964dd4e6f5632edba7d438578e4d", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -131,20 +131,20 @@ }, "overrides": [], "dependencies": [ - "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "reason-libvterm@github:revery-ui/reason-libvterm#91bad1f@d41d8cd9", "isolinear@github:revery-ui/isolinear#b17ce17@d41d8cd9", "@glennsl/timber@1.0.0@d41d8cd9" ], "devDependencies": [] }, - "revery@github:revery-ui/revery#a0ec051@d41d8cd9": { - "id": "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9": { + "id": "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "name": "revery", - "version": "github:revery-ui/revery#a0ec051", + "version": "github:revery-ui/revery#bd3d702", "source": { "type": "install", - "source": [ "github:revery-ui/revery#a0ec051" ] + "source": [ "github:revery-ui/revery#bd3d702" ] }, "overrides": [], "dependencies": [ @@ -157,7 +157,7 @@ "reason-harfbuzz@1.91.8001@d41d8cd9", "reason-font-manager@2.1.1@d41d8cd9", "flex@1.2.3@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@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", @@ -994,7 +994,7 @@ "overrides": [], "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.9.1000@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/menhir@opam:20200211@26571604", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], @@ -1012,7 +1012,7 @@ "overrides": [], "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.9.1000@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [ "ocaml@4.9.1000@d41d8cd9" ] @@ -1151,7 +1151,7 @@ "overrides": [ "integrationtest.json" ], "dependencies": [ "revery-terminal@github:revery-ui/revery-terminal#4e8ca1c@d41d8cd9", - "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.2@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", @@ -1172,7 +1172,7 @@ "@opam/ppxlib@opam:0.13.0@65a9c7cc", "@opam/ppx_let@opam:v0.13.0@5703d2be", "@opam/ppx_deriving_yojson@opam:3.5.2@ca415fbe", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@677655b4", "@opam/luv@opam:0.5.2@bfb5a32a", "@opam/logs@opam:0.7.0@1d03143e", @@ -1988,7 +1988,7 @@ "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@1e01d2a5", "@opam/ppx_tools@opam:6.0+4.08.0@5f5453f4", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1996,24 +1996,24 @@ "ocaml@4.9.1000@d41d8cd9", "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/ppx_deriving@opam:4.4.1@208c6c8f": { - "id": "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc": { + "id": "@opam/ppx_deriving@opam:4.5@bb81afdc", "name": "@opam/ppx_deriving", - "version": "opam:4.4.1", + "version": "opam:4.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/27/27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f#sha256:27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f", - "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.4.1.tar.gz#sha256:27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f" + "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b", + "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b" ], "opam": { "name": "ppx_deriving", - "version": "4.4.1", - "path": "integrationtest.esy.lock/opam/ppx_deriving.4.4.1" + "version": "4.5", + "path": "integrationtest.esy.lock/opam/ppx_deriving.4.5" } }, "overrides": [], diff --git a/integrationtest.esy.lock/opam/ppx_deriving.4.4.1/opam b/integrationtest.esy.lock/opam/ppx_deriving.4.5/opam similarity index 71% rename from integrationtest.esy.lock/opam/ppx_deriving.4.4.1/opam rename to integrationtest.esy.lock/opam/ppx_deriving.4.5/opam index 1fd0d53cc1..13bd4a0fac 100644 --- a/integrationtest.esy.lock/opam/ppx_deriving.4.4.1/opam +++ b/integrationtest.esy.lock/opam/ppx_deriving.4.5/opam @@ -1,5 +1,5 @@ opam-version: "2.0" -maintainer: "whitequark " +maintainer: "thierry.martinez@inria.fr" authors: [ "whitequark " ] license: "MIT" homepage: "https://github.com/ocaml-ppx/ppx_deriving" @@ -10,7 +10,7 @@ tags: [ "syntax" ] build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version >= "4.03"} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} ] depends: [ @@ -22,7 +22,7 @@ depends: [ "ppx_tools" {>= "4.02.3"} "result" "ounit" {with-test} - "ocaml" {>= "4.02.2" & < "4.11.0"} + "ocaml" {>= "4.02" & < "4.12.0"} ] synopsis: "Type-driven code generation for OCaml >=4.02.2" description: """ @@ -31,6 +31,5 @@ code based on type definitions, and a set of useful plugins for common tasks. """ url { - src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.4.1.tar.gz" - checksum: "sha256=27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f" -} + src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz" + checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"} diff --git a/package.json b/package.json index 7ac3108437..12a481d80b 100644 --- a/package.json +++ b/package.json @@ -410,7 +410,7 @@ "resolutions": { "@esy-ocaml/libffi": "onivim/libffi#590b041", "@opam/yojson": "onivim/yojson:yojson.opam#f480aef", - "revery": "revery-ui/revery#a0ec051", + "revery": "revery-ui/revery#bd3d702", "editor-core-types": "onivim/editor-core-types#6a8afaf", "esy-skia": "revery-ui/esy-skia#d60e5fe", "rench": "bryphe/rench#a976fe5", diff --git a/src/UI/Root.re b/src/UI/Root.re index 0fae3ae71b..0054a66e4a 100644 --- a/src/UI/Root.re +++ b/src/UI/Root.re @@ -21,17 +21,25 @@ module Constants = { module Styles = { open Style; - let root = theme => [ - backgroundColor(Colors.Editor.background.from(theme)), - color(Colors.foreground.from(theme)), - position(`Absolute), - top(0), - left(0), - right(0), - bottom(0), - justifyContent(`Center), - alignItems(`Stretch), - ]; + let root = (theme, windowDisplayMode) => { + let style = + ref([ + backgroundColor(Colors.Editor.background.from(theme)), + color(Colors.foreground.from(theme)), + position(`Absolute), + top(0), + left(0), + right(0), + bottom(0), + justifyContent(`Center), + alignItems(`Stretch), + ]); + if (Revery.Environment.os == Windows + && windowDisplayMode == State.Maximized) { + style := [margin(6), ...style^]; + }; + style^; + }; let surface = [flexGrow(1), flexDirection(`Row)]; @@ -130,7 +138,7 @@ let make = (~state: State.t, ()) => { ; }; - + { - {Revery.Environment.os == Windows ? : React.empty} + {Revery.Environment.os == Windows + && state.windowDisplayMode != State.Maximized + ? : React.empty} ; }; diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json index 3844ccb0b8..ba89fe9309 100644 --- a/test.esy.lock/index.json +++ b/test.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "4d094e5d25e9e655e359ff99f14daff2", + "checksum": "f2de1bfa84908b8afd33e667fd1506a2", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -131,20 +131,20 @@ }, "overrides": [], "dependencies": [ - "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "reason-libvterm@github:revery-ui/reason-libvterm#91bad1f@d41d8cd9", "isolinear@github:revery-ui/isolinear#b17ce17@d41d8cd9", "@glennsl/timber@1.0.0@d41d8cd9" ], "devDependencies": [] }, - "revery@github:revery-ui/revery#a0ec051@d41d8cd9": { - "id": "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9": { + "id": "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "name": "revery", - "version": "github:revery-ui/revery#a0ec051", + "version": "github:revery-ui/revery#bd3d702", "source": { "type": "install", - "source": [ "github:revery-ui/revery#a0ec051" ] + "source": [ "github:revery-ui/revery#bd3d702" ] }, "overrides": [], "dependencies": [ @@ -157,7 +157,7 @@ "reason-harfbuzz@1.91.8001@d41d8cd9", "reason-font-manager@2.1.1@d41d8cd9", "flex@1.2.3@d41d8cd9", "@reason-native/console@0.0.3@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@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", @@ -994,7 +994,7 @@ "overrides": [], "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.9.1000@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/menhir@opam:20200211@26571604", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], @@ -1012,7 +1012,7 @@ "overrides": [], "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.9.1000@d41d8cd9", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [ "ocaml@4.9.1000@d41d8cd9" ] @@ -1151,7 +1151,7 @@ "overrides": [ "test.json" ], "dependencies": [ "revery-terminal@github:revery-ui/revery-terminal#4e8ca1c@d41d8cd9", - "revery@github:revery-ui/revery#a0ec051@d41d8cd9", + "revery@github:revery-ui/revery#bd3d702@d41d8cd9", "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.2@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", @@ -1172,7 +1172,7 @@ "@opam/ppxlib@opam:0.13.0@65a9c7cc", "@opam/ppx_let@opam:v0.13.0@5703d2be", "@opam/ppx_deriving_yojson@opam:3.5.2@ca415fbe", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@677655b4", "@opam/luv@opam:0.5.2@bfb5a32a", "@opam/logs@opam:0.7.0@1d03143e", @@ -1988,7 +1988,7 @@ "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@1e01d2a5", "@opam/ppx_tools@opam:6.0+4.08.0@5f5453f4", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -1996,24 +1996,24 @@ "ocaml@4.9.1000@d41d8cd9", "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc", "@opam/dune@opam:2.5.0@aef1678b" ] }, - "@opam/ppx_deriving@opam:4.4.1@208c6c8f": { - "id": "@opam/ppx_deriving@opam:4.4.1@208c6c8f", + "@opam/ppx_deriving@opam:4.5@bb81afdc": { + "id": "@opam/ppx_deriving@opam:4.5@bb81afdc", "name": "@opam/ppx_deriving", - "version": "opam:4.4.1", + "version": "opam:4.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/27/27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f#sha256:27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f", - "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.4.1.tar.gz#sha256:27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f" + "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b", + "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b" ], "opam": { "name": "ppx_deriving", - "version": "4.4.1", - "path": "test.esy.lock/opam/ppx_deriving.4.4.1" + "version": "4.5", + "path": "test.esy.lock/opam/ppx_deriving.4.5" } }, "overrides": [], diff --git a/test.esy.lock/opam/ppx_deriving.4.4.1/opam b/test.esy.lock/opam/ppx_deriving.4.5/opam similarity index 71% rename from test.esy.lock/opam/ppx_deriving.4.4.1/opam rename to test.esy.lock/opam/ppx_deriving.4.5/opam index 1fd0d53cc1..13bd4a0fac 100644 --- a/test.esy.lock/opam/ppx_deriving.4.4.1/opam +++ b/test.esy.lock/opam/ppx_deriving.4.5/opam @@ -1,5 +1,5 @@ opam-version: "2.0" -maintainer: "whitequark " +maintainer: "thierry.martinez@inria.fr" authors: [ "whitequark " ] license: "MIT" homepage: "https://github.com/ocaml-ppx/ppx_deriving" @@ -10,7 +10,7 @@ tags: [ "syntax" ] build: [ ["dune" "subst"] {pinned} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version >= "4.03"} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} ] depends: [ @@ -22,7 +22,7 @@ depends: [ "ppx_tools" {>= "4.02.3"} "result" "ounit" {with-test} - "ocaml" {>= "4.02.2" & < "4.11.0"} + "ocaml" {>= "4.02" & < "4.12.0"} ] synopsis: "Type-driven code generation for OCaml >=4.02.2" description: """ @@ -31,6 +31,5 @@ code based on type definitions, and a set of useful plugins for common tasks. """ url { - src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.4.1.tar.gz" - checksum: "sha256=27bc57774724fc4f48775f2011375a5ee1439570204abbf6607761c472757e2f" -} + src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz" + checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"}