From ffda6e3e0da209d4110a906b94c8c03eda116056 Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Mon, 6 May 2019 07:57:53 -0700 Subject: [PATCH] dune -> ^1.9.0 --- esy.json | 3 +- esy.lock/index.json | 197 +++++++++--------- esy.lock/opam/{dune.1.8.2 => dune.1.9.1}/opam | 7 +- esy.lock/opam/{lwt.4.2.0 => lwt.4.2.1}/opam | 6 +- esy.lock/opam/merlin-extend.0.3/opam | 2 +- esy.lock/opam/{mmap.1.0.2 => mmap.1.1.0}/opam | 6 +- .../opam | 8 +- esy.lock/opam/ppx_tools_versioned.5.2.1/opam | 2 +- .../opam/{ptime.0.8.4 => ptime.0.8.5}/opam | 28 +-- esy.lock/opam/{re.1.8.0 => re.1.9.0}/opam | 21 +- esy.lock/opam/tyxml.4.3.0/opam | 3 +- .../package.json | 0 .../files/merlin-extend-winfix-4.2.3007.patch | 34 +++ .../package.json | 5 +- 14 files changed, 186 insertions(+), 136 deletions(-) rename esy.lock/opam/{dune.1.8.2 => dune.1.9.1}/opam (82%) rename esy.lock/opam/{lwt.4.2.0 => lwt.4.2.1}/opam (88%) rename esy.lock/opam/{mmap.1.0.2 => mmap.1.1.0}/opam (73%) rename esy.lock/opam/{ppx_derivers.1.0 => ppx_derivers.1.2.1}/opam (73%) rename esy.lock/opam/{ptime.0.8.4 => ptime.0.8.5}/opam (73%) rename esy.lock/opam/{re.1.8.0 => re.1.9.0}/opam (70%) rename esy.lock/overrides/{opam__s__dune_opam__c__1.8.2_opam_override => opam__s__dune_opam__c__1.9.1_opam_override}/package.json (100%) create mode 100644 esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch diff --git a/esy.json b/esy.json index 6ead3d4..3a977bb 100644 --- a/esy.json +++ b/esy.json @@ -13,7 +13,8 @@ "dependencies": { "@esy-ocaml/reason": ">=3.4.0", "@brisk/macos": "*", - "brisk-reconciler": "*" + "brisk-reconciler": "*", + "@opam/dune": "^1.9.0" }, "devDependencies": { "@opam/merlin": "^3.2.2", diff --git a/esy.lock/index.json b/esy.lock/index.json index 39fd8ca..867383c 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "1388ea5c6df01b304f893fad2f594fe7", + "checksum": "dec16dae56824f5ef8739c52bcaf3c35", "root": "brisk@link-dev:./esy.json", "node": { "refmterr@3.1.10@d41d8cd9": { @@ -14,8 +14,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/re@opam:1.8.0@7baac1a7", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/reason@3.4.0@d41d8cd9" + "ocaml@4.7.1004@d41d8cd9", "@opam/re@opam:1.9.0@7f4a36a5", + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] }, @@ -59,7 +59,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8", + "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] @@ -75,7 +75,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8", + "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] @@ -88,7 +88,7 @@ "overrides": [], "dependencies": [ "brisk-reconciler@github:briskml/brisk-reconciler#be325c5@d41d8cd9", - "@esy-ocaml/reason@3.4.0@d41d8cd9", + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/reason@3.4.0@d41d8cd9", "@brisk/macos@link-dev:renderer-macos" ], "devDependencies": [ @@ -97,14 +97,14 @@ "@opam/merlin@opam:3.2.2@829ee6dd" ] }, - "@reason-native/rely@1.3.1@d41d8cd9": { - "id": "@reason-native/rely@1.3.1@d41d8cd9", + "@reason-native/rely@2.1.0@d41d8cd9": { + "id": "@reason-native/rely@2.1.0@d41d8cd9", "name": "@reason-native/rely", - "version": "1.3.1", + "version": "2.1.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/rely/-/rely-1.3.1.tgz#sha1:f57050aac6887196d1a41f0d42c7b5ec0adee271" + "archive:https://registry.npmjs.org/@reason-native/rely/-/rely-2.1.0.tgz#sha1:f562a8dc2ad51d1d4930ac6278d98e6547bb8c33" ] }, "overrides": [], @@ -112,8 +112,8 @@ "refmterr@3.1.10@d41d8cd9", "ocaml@4.7.1004@d41d8cd9", "@reason-native/pastel@0.2.1@d41d8cd9", "@reason-native/file-context-printer@0.0.3@d41d8cd9", - "@opam/re@opam:1.8.0@7baac1a7", "@opam/junit@opam:2.0.1@c25e35a7", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/reason@3.4.0@d41d8cd9" + "@opam/re@opam:1.9.0@7f4a36a5", "@opam/junit@opam:2.0.1@c25e35a7", + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] }, @@ -129,7 +129,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8", + "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] @@ -147,7 +147,7 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@reason-native/pastel@0.2.1@d41d8cd9", - "@opam/re@opam:1.8.0@7baac1a7", "@opam/dune@opam:1.8.2@511996a8", + "@opam/re@opam:1.9.0@7f4a36a5", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] @@ -171,7 +171,7 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/easy-format@opam:1.3.1@9abfd4ed", - "@opam/dune@opam:1.8.2@511996a8", "@opam/cppo@opam:1.6.5@bec3dbd9", + "@opam/dune@opam:1.9.1@61bdaadf", "@opam/cppo@opam:1.6.5@bec3dbd9", "@opam/biniou@opam:1.2.0@c8516f18", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -231,8 +231,8 @@ ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] }, - "@opam/tyxml@opam:4.3.0@b35a7c40": { - "id": "@opam/tyxml@opam:4.3.0@b35a7c40", + "@opam/tyxml@opam:4.3.0@15e44054": { + "id": "@opam/tyxml@opam:4.3.0@15e44054", "name": "@opam/tyxml", "version": "opam:4.3.0", "source": { @@ -250,12 +250,12 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.8.0@7baac1a7", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@7f4a36a5", + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.8.0@7baac1a7" + "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@7f4a36a5" ] }, "@opam/topkg@opam:1.0.0@61f4ccf9": { @@ -328,46 +328,45 @@ ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] }, - "@opam/re@opam:1.8.0@7baac1a7": { - "id": "@opam/re@opam:1.8.0@7baac1a7", + "@opam/re@opam:1.9.0@7f4a36a5": { + "id": "@opam/re@opam:1.9.0@7f4a36a5", "name": "@opam/re", - "version": "opam:1.8.0", + "version": "opam:1.9.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/76/765f6f8d3e6ab200866e719ed7e5178d#md5:765f6f8d3e6ab200866e719ed7e5178d", - "archive:https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz#md5:765f6f8d3e6ab200866e719ed7e5178d" + "archive:https://opam.ocaml.org/cache/md5/bd/bddaed4f386a22cace7850c9c7dac296#md5:bddaed4f386a22cace7850c9c7dac296", + "archive:https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz#md5:bddaed4f386a22cace7850c9c7dac296" ], "opam": { "name": "re", - "version": "1.8.0", - "path": "esy.lock/opam/re.1.8.0" + "version": "1.9.0", + "path": "esy.lock/opam/re.1.9.0" } }, "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/jbuilder@opam:transition@58bdfe0a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d" ] }, - "@opam/ptime@opam:0.8.4@23eca65b": { - "id": "@opam/ptime@opam:0.8.4@23eca65b", + "@opam/ptime@opam:0.8.5@0051d642": { + "id": "@opam/ptime@opam:0.8.5@0051d642", "name": "@opam/ptime", - "version": "opam:0.8.4", + "version": "opam:0.8.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/12/12fb5e8c3eb1d2e6075ac31ce93f7dd6#md5:12fb5e8c3eb1d2e6075ac31ce93f7dd6", - "archive:http://erratique.ch/software/ptime/releases/ptime-0.8.4.tbz#md5:12fb5e8c3eb1d2e6075ac31ce93f7dd6" + "archive:https://opam.ocaml.org/cache/md5/4d/4d48055d623ecf2db792439b3e96a520#md5:4d48055d623ecf2db792439b3e96a520", + "archive:https://erratique.ch/software/ptime/releases/ptime-0.8.5.tbz#md5:4d48055d623ecf2db792439b3e96a520" ], "opam": { "name": "ptime", - "version": "0.8.4", - "path": "esy.lock/opam/ptime.0.8.4" + "version": "0.8.5", + "path": "esy.lock/opam/ptime.0.8.5" } }, "overrides": [], @@ -410,8 +409,8 @@ "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71" ] }, - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75": { - "id": "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765": { + "id": "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "name": "@opam/ppx_tools_versioned", "version": "opam:5.2.1", "source": { @@ -485,7 +484,7 @@ "@opam/result@opam:1.3@bee8bf2e", "@opam/ppxfind@opam:1.2@0443ec6f", "@opam/ppx_tools@opam:5.1+4.06.0@a9357225", "@opam/ppx_deriving@opam:4.2.1@7927b93a", - "@opam/dune@opam:1.8.2@511996a8", "@opam/cppo@opam:1.6.5@bec3dbd9", + "@opam/dune@opam:1.9.1@61bdaadf", "@opam/cppo@opam:1.6.5@bec3dbd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -519,7 +518,7 @@ "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", "@opam/ppx_tools@opam:5.1+4.06.0@a9357225", - "@opam/ppx_derivers@opam:1.0@78655ff8", + "@opam/ppx_derivers@opam:1.2.1@0b458500", "@opam/ocamlfind@opam:1.8.0@f744a0c5", "@opam/ocamlbuild@opam:0.14.0@427a2331", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", @@ -529,29 +528,29 @@ "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", "@opam/ppx_tools@opam:5.1+4.06.0@a9357225", - "@opam/ppx_derivers@opam:1.0@78655ff8", + "@opam/ppx_derivers@opam:1.2.1@0b458500", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71" ] }, - "@opam/ppx_derivers@opam:1.0@78655ff8": { - "id": "@opam/ppx_derivers@opam:1.0@78655ff8", + "@opam/ppx_derivers@opam:1.2.1@0b458500": { + "id": "@opam/ppx_derivers@opam:1.2.1@0b458500", "name": "@opam/ppx_derivers", - "version": "opam:1.0", + "version": "opam:1.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/4d/4ddce8f43fdb9b0ef0ab6a7cbfebc3e3#md5:4ddce8f43fdb9b0ef0ab6a7cbfebc3e3", - "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.0.tar.gz#md5:4ddce8f43fdb9b0ef0ab6a7cbfebc3e3" + "archive:https://opam.ocaml.org/cache/md5/5d/5dc2bf130c1db3c731fe0fffc5648b41#md5:5dc2bf130c1db3c731fe0fffc5648b41", + "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#md5:5dc2bf130c1db3c731fe0fffc5648b41" ], "opam": { "name": "ppx_derivers", - "version": "1.0", - "path": "esy.lock/opam/ppx_derivers.1.0" + "version": "1.2.1", + "path": "esy.lock/opam/ppx_derivers.1.2.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a", + "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] @@ -631,33 +630,33 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", - "@opam/ppx_derivers@opam:1.0@78655ff8", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ppx_derivers@opam:1.2.1@0b458500", + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", - "@opam/ppx_derivers@opam:1.0@78655ff8" + "@opam/ppx_derivers@opam:1.2.1@0b458500" ] }, - "@opam/mmap@opam:1.0.2@00138a87": { - "id": "@opam/mmap@opam:1.0.2@00138a87", + "@opam/mmap@opam:1.1.0@6f2a1426": { + "id": "@opam/mmap@opam:1.1.0@6f2a1426", "name": "@opam/mmap", - "version": "opam:1.0.2", + "version": "opam:1.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/78/7880d4d74b37664f9bb0906ae1cadf6b#md5:7880d4d74b37664f9bb0906ae1cadf6b", - "archive:https://github.com/mirage/mmap/releases/download/v1.0.2/mmap-v1.0.2.tbz#md5:7880d4d74b37664f9bb0906ae1cadf6b" + "archive:https://opam.ocaml.org/cache/md5/8c/8c5d5fbc537296dc525867535fb878ba#md5:8c5d5fbc537296dc525867535fb878ba", + "archive:https://github.com/mirage/mmap/releases/download/v1.1.0/mmap-v1.1.0.tbz#md5:8c5d5fbc537296dc525867535fb878ba" ], "opam": { "name": "mmap", - "version": "1.0.2", - "path": "esy.lock/opam/mmap.1.0.2" + "version": "1.1.0", + "path": "esy.lock/opam/mmap.1.1.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8", + "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] @@ -676,7 +675,7 @@ "@opam/yojson@opam:1.5.0@890db858", "@opam/ppx_deriving_yojson@opam:3.3@80aab5d8", "@opam/ocamlfind@opam:1.8.0@f744a0c5", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/yojson@opam:1.5.0@890db858", @@ -684,8 +683,8 @@ "@opam/ocamlfind@opam:1.8.0@f744a0c5" ] }, - "@opam/merlin-extend@opam:0.3@e1fc0d08": { - "id": "@opam/merlin-extend@opam:0.3@e1fc0d08", + "@opam/merlin-extend@opam:0.3@0af73a50": { + "id": "@opam/merlin-extend@opam:0.3@0af73a50", "name": "@opam/merlin-extend", "version": "opam:0.3", "source": { @@ -732,7 +731,7 @@ "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858", "@opam/ocamlfind@opam:1.8.0@f744a0c5", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858", @@ -782,7 +781,7 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:1.8.2@511996a8", + "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -809,46 +808,46 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", - "@opam/lwt@opam:4.2.0@3edaca61", "@opam/dune@opam:1.8.2@511996a8", + "@opam/lwt@opam:4.2.1@c1888ec9", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", - "@opam/ppx_tools_versioned@opam:5.2.1@95275a75", + "@opam/ppx_tools_versioned@opam:5.2.1@1eeea765", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", - "@opam/lwt@opam:4.2.0@3edaca61" + "@opam/lwt@opam:4.2.1@c1888ec9" ] }, - "@opam/lwt@opam:4.2.0@3edaca61": { - "id": "@opam/lwt@opam:4.2.0@3edaca61", + "@opam/lwt@opam:4.2.1@c1888ec9": { + "id": "@opam/lwt@opam:4.2.1@c1888ec9", "name": "@opam/lwt", - "version": "opam:4.2.0", + "version": "opam:4.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/2c/2ce7827948adc611319f9449e4519070#md5:2ce7827948adc611319f9449e4519070", - "archive:https://github.com/ocsigen/lwt/archive/4.2.0.tar.gz#md5:2ce7827948adc611319f9449e4519070" + "archive:https://opam.ocaml.org/cache/md5/9d/9d648386ca0a9978eb9487de36b781cc#md5:9d648386ca0a9978eb9487de36b781cc", + "archive:https://github.com/ocsigen/lwt/archive/4.2.1.tar.gz#md5:9d648386ca0a9978eb9487de36b781cc" ], "opam": { "name": "lwt", - "version": "4.2.0", - "path": "esy.lock/opam/lwt.4.2.0" + "version": "4.2.1", + "path": "esy.lock/opam/lwt.4.2.1" } }, "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/result@opam:1.3@bee8bf2e", "@opam/mmap@opam:1.0.2@00138a87", - "@opam/dune@opam:1.8.2@511996a8", "@opam/cppo@opam:1.6.5@bec3dbd9", + "@opam/result@opam:1.3@bee8bf2e", "@opam/mmap@opam:1.1.0@6f2a1426", + "@opam/dune@opam:1.9.1@61bdaadf", "@opam/cppo@opam:1.6.5@bec3dbd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/result@opam:1.3@bee8bf2e", "@opam/mmap@opam:1.0.2@00138a87" + "@opam/result@opam:1.3@bee8bf2e", "@opam/mmap@opam:1.1.0@6f2a1426" ] }, "@opam/junit@opam:2.0.1@c25e35a7": { @@ -869,11 +868,11 @@ }, "overrides": [], "dependencies": [ - "@opam/tyxml@opam:4.3.0@b35a7c40", "@opam/ptime@opam:0.8.4@23eca65b", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/tyxml@opam:4.3.0@15e44054", "@opam/ptime@opam:0.8.5@0051d642", + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/tyxml@opam:4.3.0@b35a7c40", "@opam/ptime@opam:0.8.4@23eca65b" + "@opam/tyxml@opam:4.3.0@15e44054", "@opam/ptime@opam:0.8.5@0051d642" ] }, "@opam/jbuilder@opam:transition@58bdfe0a": { @@ -891,11 +890,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8", + "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8" + "ocaml@4.7.1004@d41d8cd9", "@opam/dune@opam:1.9.1@61bdaadf" ] }, "@opam/gg@opam:0.9.3@063e5657": { @@ -949,26 +948,26 @@ ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ] }, - "@opam/dune@opam:1.8.2@511996a8": { - "id": "@opam/dune@opam:1.8.2@511996a8", + "@opam/dune@opam:1.9.1@61bdaadf": { + "id": "@opam/dune@opam:1.9.1@61bdaadf", "name": "@opam/dune", - "version": "opam:1.8.2", + "version": "opam:1.9.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/2b/2b7f45a6e14865f2318d34f12221ec1e#md5:2b7f45a6e14865f2318d34f12221ec1e", - "archive:https://github.com/ocaml/dune/releases/download/1.8.2/dune-1.8.2.tbz#md5:2b7f45a6e14865f2318d34f12221ec1e" + "archive:https://opam.ocaml.org/cache/sha256/c9/c9a1e258a14d96fd95fb525e7659c371e8b1d253905e3d39c5b2efa280b4927c#sha256:c9a1e258a14d96fd95fb525e7659c371e8b1d253905e3d39c5b2efa280b4927c", + "archive:https://github.com/ocaml/dune/releases/download/1.9.1/dune-1.9.1.tbz#sha256:c9a1e258a14d96fd95fb525e7659c371e8b1d253905e3d39c5b2efa280b4927c" ], "opam": { "name": "dune", - "version": "1.8.2", - "path": "esy.lock/opam/dune.1.8.2" + "version": "1.9.1", + "path": "esy.lock/opam/dune.1.9.1" } }, "overrides": [ { "opamoverride": - "esy.lock/overrides/opam__s__dune_opam__c__1.8.2_opam_override" + "esy.lock/overrides/opam__s__dune_opam__c__1.9.1_opam_override" } ], "dependencies": [ @@ -1089,7 +1088,7 @@ "overrides": [], "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/gg@opam:0.9.3@063e5657", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.7.1004@d41d8cd9", "@opam/gg@opam:0.9.3@063e5657" @@ -1202,9 +1201,9 @@ "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", "@opam/ocamlfind@opam:1.8.0@f744a0c5", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", - "@opam/merlin-extend@opam:0.3@e1fc0d08", + "@opam/merlin-extend@opam:0.3@0af73a50", "@opam/menhir@opam:20181113@0c8257a8", - "@opam/dune@opam:1.8.2@511996a8" + "@opam/dune@opam:1.9.1@61bdaadf" ], "devDependencies": [] }, @@ -1219,12 +1218,12 @@ "ocaml@4.7.1004@d41d8cd9", "brisk-reconciler@github:briskml/brisk-reconciler#be325c5@d41d8cd9", "@opam/markup@opam:0.8.0@e4958f14", - "@opam/lwt_ppx@opam:1.2.2@946c5ba2", "@opam/lwt@opam:4.2.0@3edaca61", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/reason@3.4.0@d41d8cd9", + "@opam/lwt_ppx@opam:1.2.2@946c5ba2", "@opam/lwt@opam:4.2.1@c1888ec9", + "@opam/dune@opam:1.9.1@61bdaadf", "@esy-ocaml/reason@3.4.0@d41d8cd9", "@brisk/core@link-dev:core" ], "devDependencies": [ - "@reason-native/rely@1.3.1@d41d8cd9", + "@reason-native/rely@2.1.0@d41d8cd9", "@opam/merlin@opam:3.2.2@829ee6dd" ] }, @@ -1237,7 +1236,7 @@ "dependencies": [ "ocaml@4.7.1004@d41d8cd9", "flex@github:briskml/flex#7042e49@d41d8cd9", - "@opam/dune@opam:1.8.2@511996a8", "@opam/color@opam:0.2.0@8ef09171", + "@opam/dune@opam:1.9.1@61bdaadf", "@opam/color@opam:0.2.0@8ef09171", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] diff --git a/esy.lock/opam/dune.1.8.2/opam b/esy.lock/opam/dune.1.9.1/opam similarity index 82% rename from esy.lock/opam/dune.1.8.2/opam rename to esy.lock/opam/dune.1.9.1/opam index 3e1720a..2db60bd 100644 --- a/esy.lock/opam/dune.1.8.2/opam +++ b/esy.lock/opam/dune.1.9.1/opam @@ -42,6 +42,9 @@ packages across several versions of OCaml and gives cross-compilation for free. """ url { - src: "https://github.com/ocaml/dune/releases/download/1.8.2/dune-1.8.2.tbz" - checksum: "md5=2b7f45a6e14865f2318d34f12221ec1e" + src: "https://github.com/ocaml/dune/releases/download/1.9.1/dune-1.9.1.tbz" + checksum: [ + "sha256=c9a1e258a14d96fd95fb525e7659c371e8b1d253905e3d39c5b2efa280b4927c" + "sha512=842d0aa7fbe97bc5a0fde974fa9ddd95d8e2f60a7018b60779cf782282e2bc362f4ae347cd7795b857a8e05ebb9d82f1236c0e4d1e7ec10d3b210028bc2058c1" + ] } diff --git a/esy.lock/opam/lwt.4.2.0/opam b/esy.lock/opam/lwt.4.2.1/opam similarity index 88% rename from esy.lock/opam/lwt.4.2.0/opam rename to esy.lock/opam/lwt.4.2.1/opam index 57fcf6f..0b30db9 100644 --- a/esy.lock/opam/lwt.4.2.0/opam +++ b/esy.lock/opam/lwt.4.2.1/opam @@ -21,7 +21,7 @@ dev-repo: "git+https://github.com/ocsigen/lwt.git" depends: [ "cppo" {build & >= "1.1.0"} "dune" {build} - "mmap" + "mmap" # mmap is needed as long as Lwt supports OCaml < 4.06.0. "ocaml" {>= "4.02.0"} "result" # result is needed as long as Lwt supports OCaml 4.02. "seq" # seq is needed as long as Lwt supports OCaml < 4.07.0. @@ -53,6 +53,6 @@ a single thread by default. This reduces the need for locks or other synchronization primitives. Code can be run in parallel on an opt-in basis." url { - src: "https://github.com/ocsigen/lwt/archive/4.2.0.tar.gz" - checksum: "md5=2ce7827948adc611319f9449e4519070" + src: "https://github.com/ocsigen/lwt/archive/4.2.1.tar.gz" + checksum: "md5=9d648386ca0a9978eb9487de36b781cc" } diff --git a/esy.lock/opam/merlin-extend.0.3/opam b/esy.lock/opam/merlin-extend.0.3/opam index db2b130..03ed72e 100644 --- a/esy.lock/opam/merlin-extend.0.3/opam +++ b/esy.lock/opam/merlin-extend.0.3/opam @@ -9,7 +9,7 @@ build: [make] install: [make "install"] remove: ["ocamlfind" "remove" "merlin_extend"] depends: [ - "ocaml" {>= "4.02.3"} + "ocaml" {>= "4.02.3" & < "4.08.0"} "ocamlfind" {build} "cppo" {build} ] diff --git a/esy.lock/opam/mmap.1.0.2/opam b/esy.lock/opam/mmap.1.1.0/opam similarity index 73% rename from esy.lock/opam/mmap.1.0.2/opam rename to esy.lock/opam/mmap.1.1.0/opam index 0384e35..0b515b4 100644 --- a/esy.lock/opam/mmap.1.0.2/opam +++ b/esy.lock/opam/mmap.1.1.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" maintainer: "jeremie@dimino.org" -authors: ["Jérémie Dimino "] +authors: ["Jérémie Dimino " "Anton Bachin" ] homepage: "https://github.com/mirage/mmap" bug-reports: "https://github.com/mirage/mmap/issues" doc: "https://mirage.github.io/mmap/" @@ -19,6 +19,6 @@ This project provides a Mmap.map_file functions for mapping files in memory. """ url { src: - "https://github.com/mirage/mmap/releases/download/v1.0.2/mmap-v1.0.2.tbz" - checksum: "md5=7880d4d74b37664f9bb0906ae1cadf6b" + "https://github.com/mirage/mmap/releases/download/v1.1.0/mmap-v1.1.0.tbz" + checksum: "md5=8c5d5fbc537296dc525867535fb878ba" } diff --git a/esy.lock/opam/ppx_derivers.1.0/opam b/esy.lock/opam/ppx_derivers.1.2.1/opam similarity index 73% rename from esy.lock/opam/ppx_derivers.1.0/opam rename to esy.lock/opam/ppx_derivers.1.2.1/opam index ac3aad9..19e8b0f 100644 --- a/esy.lock/opam/ppx_derivers.1.0/opam +++ b/esy.lock/opam/ppx_derivers.1.2.1/opam @@ -6,11 +6,11 @@ homepage: "https://github.com/ocaml-ppx/ppx_derivers" bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues" dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git" build: [ - ["jbuilder" "build" "-p" name "-j" jobs] + ["dune" "build" "-p" name "-j" jobs] ] depends: [ "ocaml" - "jbuilder" {build & >= "1.0+beta7"} + "dune" {build} ] synopsis: "Shared [@@deriving] plugin registry" description: """ @@ -18,6 +18,6 @@ Ppx_derivers is a tiny package whose sole purpose is to allow ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.""" url { - src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.0.tar.gz" - checksum: "md5=4ddce8f43fdb9b0ef0ab6a7cbfebc3e3" + src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz" + checksum: "md5=5dc2bf130c1db3c731fe0fffc5648b41" } diff --git a/esy.lock/opam/ppx_tools_versioned.5.2.1/opam b/esy.lock/opam/ppx_tools_versioned.5.2.1/opam index 0dd92b3..cbf8f4f 100644 --- a/esy.lock/opam/ppx_tools_versioned.5.2.1/opam +++ b/esy.lock/opam/ppx_tools_versioned.5.2.1/opam @@ -17,7 +17,7 @@ build: [ depends: [ "ocaml" {>= "4.02.0"} "jbuilder" {build & >= "1.0+beta17"} - "ocaml-migrate-parsetree" {>= "1.0.10"} + "ocaml-migrate-parsetree" {>= "1.0.10" & < "1.3.0"} ] synopsis: "A variant of ppx_tools based on ocaml-migrate-parsetree" url { diff --git a/esy.lock/opam/ptime.0.8.4/opam b/esy.lock/opam/ptime.0.8.5/opam similarity index 73% rename from esy.lock/opam/ptime.0.8.4/opam rename to esy.lock/opam/ptime.0.8.5/opam index f0a1a42..ed7c8d9 100644 --- a/esy.lock/opam/ptime.0.8.4/opam +++ b/esy.lock/opam/ptime.0.8.5/opam @@ -1,26 +1,29 @@ opam-version: "2.0" maintainer: "Daniel Bünzli " authors: ["The ptime programmers"] -homepage: "http://erratique.ch/software/ptime" -doc: "http://erratique.ch/software/ptime/doc" +homepage: "https://erratique.ch/software/ptime" +doc: "https://erratique.ch/software/ptime/doc" dev-repo: "git+http://erratique.ch/repos/ptime.git" bug-reports: "https://github.com/dbuenzli/ptime/issues" tags: [ "time" "posix" "system" "org:erratique" ] license: "ISC" depends: [ - "ocaml" {>= "4.01.0"} - "ocamlfind" {build} - "ocamlbuild" {build} - "topkg" {build} - "result" + "ocaml" {>= "4.01.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build} + "result" ] depopts: [ "js_of_ocaml" ] +conflicts: [ "js_of_ocaml" { < "3.3.0" } ] build:[[ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--with-js_of_ocaml" "%{js_of_ocaml:installed}%" ]] -synopsis: "POSIX time for OCaml" -description: """ + +synopsis: """POSIX time for OCaml""" +description: """\ + Ptime has platform independent POSIX time support in pure OCaml. It provides a type to represent a well-defined range of POSIX timestamps with picosecond precision, conversion with date-time values, @@ -38,8 +41,9 @@ support depends on [js_of_ocaml][jsoo]. Ptime and its libraries are distributed under the ISC license. [rfc3339]: http://tools.ietf.org/html/rfc3339 -[jsoo]: http://ocsigen.org/js_of_ocaml/""" +[jsoo]: http://ocsigen.org/js_of_ocaml/ +""" url { - src: "http://erratique.ch/software/ptime/releases/ptime-0.8.4.tbz" - checksum: "md5=12fb5e8c3eb1d2e6075ac31ce93f7dd6" +archive: "https://erratique.ch/software/ptime/releases/ptime-0.8.5.tbz" +checksum: "4d48055d623ecf2db792439b3e96a520" } diff --git a/esy.lock/opam/re.1.8.0/opam b/esy.lock/opam/re.1.9.0/opam similarity index 70% rename from esy.lock/opam/re.1.8.0/opam rename to esy.lock/opam/re.1.9.0/opam index 77b3fe2..28b376f 100644 --- a/esy.lock/opam/re.1.8.0/opam +++ b/esy.lock/opam/re.1.9.0/opam @@ -1,4 +1,5 @@ opam-version: "2.0" + maintainer: "rudi.grinberg@gmail.com" authors: [ "Jerome Vouillon" @@ -11,17 +12,20 @@ license: "LGPL-2.0 with OCaml linking exception" homepage: "https://github.com/ocaml/ocaml-re" bug-reports: "https://github.com/ocaml/ocaml-re/issues" dev-repo: "git+https://github.com/ocaml/ocaml-re.git" + build: [ - ["jbuilder" "subst" "-n" name] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] - ["jbuilder" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] + depends: [ - "ocaml" {>= "4.02.3"} - "jbuilder" {build & >= "1.0+beta10"} + "ocaml" {>= "4.02"} + "dune" {build} "ounit" {with-test} "seq" ] + synopsis: "RE is a regular expression library for OCaml" description: """ Pure OCaml regular expressions with: @@ -29,9 +33,10 @@ Pure OCaml regular expressions with: * Posix extended regular expressions (module Re.Posix) * Emacs-style regular expressions (module Re.Emacs) * Shell-style file globbing (module Re.Glob) -* Compatibility layer for OCaml's built-in Str module (module Re.Str)""" +* Compatibility layer for OCaml's built-in Str module (module Re.Str) +""" url { src: - "https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz" - checksum: "md5=765f6f8d3e6ab200866e719ed7e5178d" + "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz" + checksum: "md5=bddaed4f386a22cace7850c9c7dac296" } diff --git a/esy.lock/opam/tyxml.4.3.0/opam b/esy.lock/opam/tyxml.4.3.0/opam index 1333f05..aeac6c9 100644 --- a/esy.lock/opam/tyxml.4.3.0/opam +++ b/esy.lock/opam/tyxml.4.3.0/opam @@ -14,11 +14,12 @@ build: [ depends: [ "ocaml" {>= "4.02"} + "re" {>= "1.5.0"} + ("ocaml" {>= "4.07"} | "re" {>= "1.8.0"}) "dune" {build} "alcotest" {with-test} "seq" "uutf" {>= "1.0.0"} - "re" {>= "1.5.0"} ] synopsis:"TyXML is a library for building correct HTML and SVG documents" diff --git a/esy.lock/overrides/opam__s__dune_opam__c__1.8.2_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__1.9.1_opam_override/package.json similarity index 100% rename from esy.lock/overrides/opam__s__dune_opam__c__1.8.2_opam_override/package.json rename to esy.lock/overrides/opam__s__dune_opam__c__1.9.1_opam_override/package.json diff --git a/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch b/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch new file mode 100644 index 0000000..1e59ebb --- /dev/null +++ b/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch @@ -0,0 +1,34 @@ +--- ./extend_helper.ml ++++ ./extend_helper.ml +@@ -1,13 +1,6 @@ +-(*pp cppo -V OCAML:`ocamlc -version` *) + open Parsetree + open Extend_protocol + +-#if OCAML_VERSION < (4, 3, 0) +-# define CONST_STRING Asttypes.Const_string +-#else +-# define CONST_STRING Parsetree.Pconst_string +-#endif +- + (** Default implementation for [Reader_def.print_outcome] using + [Oprint] from compiler-libs *) + let print_outcome_using_oprint ppf = function +@@ -28,7 +21,7 @@ + pstr_loc = Location.none; + pstr_desc = Pstr_eval ({ + pexp_loc = Location.none; +- pexp_desc = Pexp_constant (CONST_STRING (msg, None)); ++ pexp_desc = Pexp_constant (Asttypes.Const_string (msg, None)); + pexp_attributes = []; + }, []); + }] +@@ -112,7 +105,7 @@ + let msg = match payload with + | PStr [{ + pstr_desc = Pstr_eval ({ +- pexp_desc = Pexp_constant (CONST_STRING (msg, _)); ++ pexp_desc = Pexp_constant (Asttypes.Const_string (msg, _)); + }, _); + }] -> msg + | _ -> "Warning: extension produced an incorrect syntax-error node" diff --git a/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json b/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json index 1675df2..acc90eb 100644 --- a/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json +++ b/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json @@ -1,9 +1,12 @@ { + "buildEnv": { + "PATCH_CMD": "#{ocaml.version == '4.2.3007' ? 'patch -p1 < merlin-extend-winfix-4.2.3007.patch' : 'patch -p1 < merlin-extend-winfix.patch'}" + }, "build": [ [ "bash", "-c", - "#{os == 'windows' ? 'patch -p1 < merlin-extend-winfix.patch' : 'true'}" + "#{os == 'windows' ? $PATCH_CMD : 'true'}" ], [ "make"