From de7ae18d6ae1e5b9aa165bcd12964b0c3ca723e4 Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Wed, 1 May 2024 06:23:15 +0900 Subject: [PATCH] Allow building with OCaml 5 --- cli.json | 2 +- cli.opam | 2 +- console.json | 5 +- console.opam | 2 +- dir.json | 3 +- dir.opam | 2 +- esy.json | 13 +- esy.lock/index.json | 999 +++++++++++------- esy.lock/opam/{atd.2.9.1 => atd.2.15.0}/opam | 12 +- .../opam | 11 +- .../opam/{atdgen.2.9.1 => atdgen.2.15.0}/opam | 13 +- esy.lock/opam/base-bytes.base/opam | 9 - .../opam/{biniou.1.2.1 => biniou.1.2.2}/opam | 8 +- .../opam | 11 +- .../{cmdliner.1.1.1 => cmdliner.1.2.0}/opam | 4 +- esy.lock/opam/crunch.3.3.1/opam | 53 + .../opam/{csexp.1.5.1 => csexp.1.5.2}/opam | 16 +- esy.lock/opam/dot-merlin-reader.4.1/opam | 30 - esy.lock/opam/dot-merlin-reader.4.9/opam | 30 + esy.lock/opam/dune-build-info.3.15.2/opam | 46 + .../opam/{dune.2.8.4 => dune.3.15.2}/opam | 33 +- .../opam | 46 +- .../opam/{fix.20220121 => fix.20230505}/opam | 6 +- esy.lock/opam/fmt.0.9.0/opam | 36 + .../{menhir.20220210 => menhir.20231231}/opam | 9 +- esy.lock/opam/menhirCST.20231231/opam | 29 + .../opam | 6 +- .../opam | 6 +- esy.lock/opam/merlin-lib.4.14-501/opam | 34 + .../{merlin.4.2-412 => merlin.4.14-501}/opam | 47 +- .../opam/ocaml-compiler-libs.v0.12.4/opam | 39 + .../opam | 7 +- .../files/0001-Harden-test-for-OCaml-5.patch | 12 + .../{ocamlfind.1.9.5 => ocamlfind.1.9.6}/opam | 13 +- esy.lock/opam/odoc-parser.2.4.2/opam | 45 + esy.lock/opam/odoc.1.5.3/opam | 53 - esy.lock/opam/odoc.2.4.2/opam | 84 ++ esy.lock/opam/ppxlib.0.32.1/opam | 63 ++ .../opam/{ptime.1.0.0 => ptime.1.1.0}/opam | 6 +- esy.lock/opam/qcheck-core.0.21.3/opam | 36 + esy.lock/opam/qcheck-core.0.9/opam | 35 - esy.lock/opam/{re.1.10.4 => re.1.11.0}/opam | 10 +- esy.lock/opam/reason.3.11.0/opam | 51 + esy.lock/opam/reason.3.8.0/opam | 37 - .../opam | 13 +- esy.lock/opam/stdlib-shims.0.3.0/opam | 31 + .../opam/{topkg.1.0.5 => topkg.1.0.7}/opam | 41 +- .../opam/{tyxml.4.5.0 => tyxml.4.6.0}/opam | 15 +- esy.lock/opam/yojson.1.7.0/opam | 38 - esy.lock/opam/yojson.2.1.2/opam | 48 + .../files/ocamlbuild-0.14.2.patch | 0 .../files/winpatch.patch | 0 .../package.json | 0 .../files/findlib.patch | 485 --------- .../files/findlib.patch | 11 + .../package.json | 0 .../package.json | 3 + file-context-printer.json | 2 +- file-context-printer.opam | 2 +- fp.json | 3 +- fp.opam | 2 +- frame.json | 3 +- fs.json | 3 +- fs.opam | 2 +- pastel-console.json | 5 +- pastel-console.opam | 2 +- pastel.json | 2 +- pastel.opam | 2 +- qcheck-rely.json | 2 +- qcheck-rely.opam | 2 +- refmterr.json | 3 +- refmterr.opam | 2 +- rely-junit-reporter.json | 2 +- rely.json | 2 +- rely.opam | 2 +- src/qcheck-rely/QCheckRely.re | 20 +- src/qcheck-rely/QCheckRely.rei | 4 +- unicode-config.json | 5 +- unicode.json | 5 +- unicode.opam | 2 +- utf8.json | 5 +- utf8.opam | 2 +- 82 files changed, 1497 insertions(+), 1288 deletions(-) rename esy.lock/opam/{atd.2.9.1 => atd.2.15.0}/opam (86%) rename esy.lock/opam/{atdgen-runtime.2.9.1 => atdgen-runtime.2.15.0}/opam (87%) rename esy.lock/opam/{atdgen.2.9.1 => atdgen.2.15.0}/opam (88%) delete mode 100644 esy.lock/opam/base-bytes.base/opam rename esy.lock/opam/{biniou.1.2.1 => biniou.1.2.2}/opam (79%) rename esy.lock/opam/{camlp-streams.5.0 => camlp-streams.5.0.1}/opam (85%) rename esy.lock/opam/{cmdliner.1.1.1 => cmdliner.1.2.0}/opam (90%) create mode 100644 esy.lock/opam/crunch.3.3.1/opam rename esy.lock/opam/{csexp.1.5.1 => csexp.1.5.2}/opam (70%) delete mode 100644 esy.lock/opam/dot-merlin-reader.4.1/opam create mode 100644 esy.lock/opam/dot-merlin-reader.4.9/opam create mode 100644 esy.lock/opam/dune-build-info.3.15.2/opam rename esy.lock/opam/{dune.2.8.4 => dune.3.15.2}/opam (51%) rename esy.lock/opam/{easy-format.1.3.2 => easy-format.1.3.4}/opam (54%) rename esy.lock/opam/{fix.20220121 => fix.20230505}/opam (67%) create mode 100644 esy.lock/opam/fmt.0.9.0/opam rename esy.lock/opam/{menhir.20220210 => menhir.20231231}/opam (66%) create mode 100644 esy.lock/opam/menhirCST.20231231/opam rename esy.lock/opam/{menhirLib.20220210 => menhirLib.20231231}/opam (73%) rename esy.lock/opam/{menhirSdk.20220210 => menhirSdk.20231231}/opam (73%) create mode 100644 esy.lock/opam/merlin-lib.4.14-501/opam rename esy.lock/opam/{merlin.4.2-412 => merlin.4.14-501}/opam (64%) create mode 100644 esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam rename esy.lock/opam/{ocamlbuild.0.14.1 => ocamlbuild.0.14.3}/opam (82%) create mode 100644 esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch rename esy.lock/opam/{ocamlfind.1.9.5 => ocamlfind.1.9.6}/opam (70%) create mode 100644 esy.lock/opam/odoc-parser.2.4.2/opam delete mode 100644 esy.lock/opam/odoc.1.5.3/opam create mode 100644 esy.lock/opam/odoc.2.4.2/opam create mode 100644 esy.lock/opam/ppxlib.0.32.1/opam rename esy.lock/opam/{ptime.1.0.0 => ptime.1.1.0}/opam (83%) create mode 100644 esy.lock/opam/qcheck-core.0.21.3/opam delete mode 100644 esy.lock/opam/qcheck-core.0.9/opam rename esy.lock/opam/{re.1.10.4 => re.1.11.0}/opam (69%) create mode 100644 esy.lock/opam/reason.3.11.0/opam delete mode 100644 esy.lock/opam/reason.3.8.0/opam rename esy.lock/opam/{sexplib0.v0.15.1 => sexplib0.v0.17.0}/opam (65%) create mode 100644 esy.lock/opam/stdlib-shims.0.3.0/opam rename esy.lock/opam/{topkg.1.0.5 => topkg.1.0.7}/opam (66%) rename esy.lock/opam/{tyxml.4.5.0 => tyxml.4.6.0}/opam (72%) delete mode 100644 esy.lock/opam/yojson.1.7.0/opam create mode 100644 esy.lock/opam/yojson.2.1.2/opam create mode 100644 esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.3_opam_override/files/ocamlbuild-0.14.2.patch rename esy.lock/overrides/{opam__s__ocamlbuild_opam__c__0.14.1_opam_override => opam__s__ocamlbuild_opam__c__0.14.3_opam_override}/files/winpatch.patch (100%) rename esy.lock/overrides/{opam__s__ocamlbuild_opam__c__0.14.1_opam_override => opam__s__ocamlbuild_opam__c__0.14.3_opam_override}/package.json (100%) delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/files/findlib.patch create mode 100644 esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch rename esy.lock/overrides/{opam__s__ocamlfind_opam__c__1.9.5_opam_override => opam__s__ocamlfind_opam__c__1.9.6_opam_override}/package.json (100%) create mode 100644 esy.lock/overrides/opam__s__ptime_opam__c__1.1.0_opam_override/package.json diff --git a/cli.json b/cli.json index 7d2e23d3..09850536 100644 --- a/cli.json +++ b/cli.json @@ -22,7 +22,7 @@ "@opam/re": "*", "@reason-native/pastel": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { "@opam/merlin": "*" diff --git a/cli.opam b/cli.opam index ea1a16fa..add60729 100644 --- a/cli.opam +++ b/cli.opam @@ -13,7 +13,7 @@ depends: [ "re" "pastel" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} ] synopsis: "Build Command Line Interfaces in Reason" description: "Build Command Line Interfaces in Reason" diff --git a/console.json b/console.json index d620195c..c8d6f56c 100644 --- a/console.json +++ b/console.json @@ -19,10 +19,9 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { - "@opam/merlin": "*", - "ocaml": "~4.12.0" + "@opam/merlin": "*" } } diff --git a/console.opam b/console.opam index 7ca6beb7..aa92a77c 100644 --- a/console.opam +++ b/console.opam @@ -11,7 +11,7 @@ build: [ ["dune" "build" "-p" "console" ] ] depends: [ "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} ] synopsis: "No effort, universal logger" description: "No effort, universal logger" diff --git a/dir.json b/dir.json index e02efee1..39211cae 100644 --- a/dir.json +++ b/dir.json @@ -29,12 +29,11 @@ "@reason-native/fp": "*", "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { "@reason-native/fp": "./fp.json", "@opam/merlin": "*", - "ocaml": "~4.6.0", "@reason-native/rely": "./rely.json" }, "resolutions": { diff --git a/dir.opam b/dir.opam index 9373550a..c0ed49c7 100644 --- a/dir.opam +++ b/dir.opam @@ -12,7 +12,7 @@ depends: [ "fp" {>= "0.0.0" & <= "1.0.0"} "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} ] synopsis: "Reason native system directories" description: "Reason native system directories" diff --git a/esy.json b/esy.json index 6f60cf9e..d88e53af 100644 --- a/esy.json +++ b/esy.json @@ -44,22 +44,19 @@ "test-ci": "esy x bash -cx ./scripts/test-ci.cmd", "doc": "esy refmterr dune build --profile=release @doc" }, - "dependencies": { + "devDependencies": { + "ocaml": "~5.1.0", "refmterr": "*", "@opam/re": "*", "@opam/atdgen": "*", "@opam/junit": "*", - "@opam/qcheck-core": "0.9", + "@opam/qcheck-core": "0.21.3", "@opam/merlin": "*", - "ocaml": "~4.6.4", - "@opam/dune": "2.8.4", - "@opam/reason": "3.8.0", + "@opam/dune": "3.15.2", + "@opam/reason": "3.11.0", "@opam/sexplib0": "*", "@opam/odoc": "*" }, - "devDependencies": { - "ocaml": "~4.12.0" - }, "resolutions": { "refmterr": "./refmterr.json", "@reason-native/pastel": "./pastel.json", diff --git a/esy.lock/index.json b/esy.lock/index.json index abee918f..08896dd7 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "762e0be23544db04b8859eb42961fdff", + "checksum": "904e92e3f000ba70fd14ca11f81fb273", "root": "reason-native-dev@link-dev:./esy.json", "node": { "refmterr@path:./refmterr.json@d41d8cd9": { @@ -9,15 +9,14 @@ "source": { "type": "install", "source": [ "path:./refmterr.json" ] }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", + "ocaml@5.1.1000@d41d8cd9", "@reason-native/pastel@path:./pastel.json@d41d8cd9", "@reason-native/console@path:./console.json@d41d8cd9", - "@opam/reason@opam:3.8.0@0af856e0", "@opam/re@opam:1.10.4@c4910ba6", - "@opam/dune@opam:2.8.4@4ac03159", "@opam/atdgen@opam:2.9.1@e79b04ba" + "@opam/reason@opam:3.11.0@6ad0e561", "@opam/re@opam:1.11.0@87deb463", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/atdgen@opam:2.15.0@2e0ae924" ], - "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/reason@opam:3.8.0@0af856e0" - ] + "devDependencies": [ "@opam/reason@opam:3.11.0@6ad0e561" ] }, "reason-native-dev@link-dev:./esy.json": { "id": "reason-native-dev@link-dev:./esy.json", @@ -25,26 +24,26 @@ "version": "link-dev:./esy.json", "source": { "type": "link-dev", "path": ".", "manifest": "esy.json" }, "overrides": [], - "dependencies": [ - "refmterr@path:./refmterr.json@d41d8cd9", "ocaml@4.12.1001@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/reason@opam:3.8.0@0af856e0", "@opam/re@opam:1.10.4@c4910ba6", - "@opam/qcheck-core@opam:0.9@3f95f89d", - "@opam/odoc@opam:1.5.3@122d8c31", - "@opam/merlin@opam:4.2-412@a614d045", - "@opam/junit@opam:2.0.2@500cf494", "@opam/dune@opam:2.8.4@4ac03159", - "@opam/atdgen@opam:2.9.1@e79b04ba" - ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "dependencies": [], + "devDependencies": [ + "refmterr@path:./refmterr.json@d41d8cd9", "ocaml@5.1.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.17.0@21847769", + "@opam/reason@opam:3.11.0@6ad0e561", "@opam/re@opam:1.11.0@87deb463", + "@opam/qcheck-core@opam:0.21.3@285ff2c8", + "@opam/odoc@opam:2.4.2@12b68179", + "@opam/merlin@opam:4.14-501@c3b7d93d", + "@opam/junit@opam:2.0.2@500cf494", "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/atdgen@opam:2.15.0@2e0ae924" + ] }, - "ocaml@4.12.1001@d41d8cd9": { - "id": "ocaml@4.12.1001@d41d8cd9", + "ocaml@5.1.1000@d41d8cd9": { + "id": "ocaml@5.1.1000@d41d8cd9", "name": "ocaml", - "version": "4.12.1001", + "version": "5.1.1000", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.12.1001.tgz#sha1:6fb89973e5f2e5c3131e4b95b76dfbccceb2c050" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-5.1.1000.tgz#sha1:9b6a5209b47f1eb23e828c325b115940240ee3df" ] }, "overrides": [], @@ -58,8 +57,8 @@ "source": { "type": "install", "source": [ "path:./pastel.json" ] }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/reason@opam:3.8.0@0af856e0", - "@opam/re@opam:1.10.4@c4910ba6", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/reason@opam:3.11.0@6ad0e561", + "@opam/re@opam:1.11.0@87deb463", "@opam/dune@opam:3.15.2@d8da42a0" ], "devDependencies": [] }, @@ -70,37 +69,36 @@ "source": { "type": "install", "source": [ "path:./console.json" ] }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/reason@opam:3.8.0@0af856e0", - "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/reason@opam:3.11.0@6ad0e561", + "@opam/dune@opam:3.15.2@d8da42a0" ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "devDependencies": [] }, - "@opam/yojson@opam:1.7.0@69d87312": { - "id": "@opam/yojson@opam:1.7.0@69d87312", + "@opam/yojson@opam:2.1.2@9fd14300": { + "id": "@opam/yojson@opam:2.1.2@9fd14300", "name": "@opam/yojson", - "version": "opam:1.7.0", + "version": "opam:2.1.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/b8/b89d39ca3f8c532abe5f547ad3b8f84d#md5:b89d39ca3f8c532abe5f547ad3b8f84d", - "archive:https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz#md5:b89d39ca3f8c532abe5f547ad3b8f84d" + "archive:https://opam.ocaml.org/cache/sha256/59/59f2f1abbfc8a7ccbdbf608894e5c75e8a76006e34899254446f83e200dfb4f9#sha256:59f2f1abbfc8a7ccbdbf608894e5c75e8a76006e34899254446f83e200dfb4f9", + "archive:https://github.com/ocaml-community/yojson/releases/download/2.1.2/yojson-2.1.2.tbz#sha256:59f2f1abbfc8a7ccbdbf608894e5c75e8a76006e34899254446f83e200dfb4f9" ], "opam": { "name": "yojson", - "version": "1.7.0", - "path": "esy.lock/opam/yojson.1.7.0" + "version": "2.1.2", + "path": "esy.lock/opam/yojson.2.1.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", - "@opam/dune@opam:2.8.4@4ac03159", "@opam/cppo@opam:1.6.9@db929a12", - "@opam/biniou@opam:1.2.1@420bda02", + "ocaml@5.1.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.15.2@d8da42a0", "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", - "@opam/dune@opam:2.8.4@4ac03159", "@opam/biniou@opam:1.2.1@420bda02" + "ocaml@5.1.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.15.2@d8da42a0" ] }, "@opam/uutf@opam:1.0.3@47c95a18": { @@ -121,91 +119,116 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/topkg@opam:1.0.5@0aa59f51", - "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@opam/ocamlbuild@opam:0.14.1@ead10f40", - "@opam/cmdliner@opam:1.1.1@03763729", + "ocaml@5.1.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.3@6ab20ab3", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "devDependencies": [ "ocaml@5.1.1000@d41d8cd9" ] }, - "@opam/tyxml@opam:4.5.0@0a609297": { - "id": "@opam/tyxml@opam:4.5.0@0a609297", + "@opam/tyxml@opam:4.6.0@5ced2c2c": { + "id": "@opam/tyxml@opam:4.6.0@5ced2c2c", "name": "@opam/tyxml", - "version": "opam:4.5.0", + "version": "opam:4.6.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c6/c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068#sha256:c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068", - "archive:https://github.com/ocsigen/tyxml/releases/download/4.5.0/tyxml-4.5.0.tbz#sha256:c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068" + "archive:https://opam.ocaml.org/cache/sha256/bf/bfeb673c6b4e120a4eca4c48448add47dc3f8d02c2b40f63ffdccc4e91c902dd#sha256:bfeb673c6b4e120a4eca4c48448add47dc3f8d02c2b40f63ffdccc4e91c902dd", + "archive:https://github.com/ocsigen/tyxml/releases/download/4.6.0/tyxml-4.6.0.tbz#sha256:bfeb673c6b4e120a4eca4c48448add47dc3f8d02c2b40f63ffdccc4e91c902dd" ], "opam": { "name": "tyxml", - "version": "4.5.0", - "path": "esy.lock/opam/tyxml.4.5.0" + "version": "4.6.0", + "path": "esy.lock/opam/tyxml.4.6.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.10.4@c4910ba6", - "@opam/dune@opam:2.8.4@4ac03159", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.11.0@87deb463", + "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.10.4@c4910ba6", - "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.11.0@87deb463", + "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/topkg@opam:1.0.5@0aa59f51": { - "id": "@opam/topkg@opam:1.0.5@0aa59f51", + "@opam/topkg@opam:1.0.7@7ee47d76": { + "id": "@opam/topkg@opam:1.0.7@7ee47d76", "name": "@opam/topkg", - "version": "opam:1.0.5", + "version": "opam:1.0.7", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/94/9450e9139209aacd8ddb4ba18e4225770837e526a52a56d94fd5c9c4c9941e83e0e7102e2292b440104f4c338fabab47cdd6bb51d69b41cc92cc7a551e6fefab#sha512:9450e9139209aacd8ddb4ba18e4225770837e526a52a56d94fd5c9c4c9941e83e0e7102e2292b440104f4c338fabab47cdd6bb51d69b41cc92cc7a551e6fefab", - "archive:https://erratique.ch/software/topkg/releases/topkg-1.0.5.tbz#sha512:9450e9139209aacd8ddb4ba18e4225770837e526a52a56d94fd5c9c4c9941e83e0e7102e2292b440104f4c338fabab47cdd6bb51d69b41cc92cc7a551e6fefab" + "archive:https://opam.ocaml.org/cache/sha512/09/09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535#sha512:09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535", + "archive:https://erratique.ch/software/topkg/releases/topkg-1.0.7.tbz#sha512:09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535" ], "opam": { "name": "topkg", - "version": "1.0.5", - "path": "esy.lock/opam/topkg.1.0.5" + "version": "1.0.7", + "path": "esy.lock/opam/topkg.1.0.7" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.3@6ab20ab3", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.3@6ab20ab3" + ] + }, + "@opam/stdlib-shims@opam:0.3.0@72c7bc98": { + "id": "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "name": "@opam/stdlib-shims", + "version": "opam:0.3.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/ba/babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a#sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a", + "archive:https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz#sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a" + ], + "opam": { + "name": "stdlib-shims", + "version": "0.3.0", + "path": "esy.lock/opam/stdlib-shims.0.3.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@opam/ocamlbuild@opam:0.14.1@ead10f40", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlbuild@opam:0.14.1@ead10f40" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/sexplib0@opam:v0.15.1@51111c0c": { - "id": "@opam/sexplib0@opam:v0.15.1@51111c0c", + "@opam/sexplib0@opam:v0.17.0@21847769": { + "id": "@opam/sexplib0@opam:v0.17.0@21847769", "name": "@opam/sexplib0", - "version": "opam:v0.15.1", + "version": "opam:v0.17.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/ab/ab8fd6273f35a792cad48cbb3024a7f9#md5:ab8fd6273f35a792cad48cbb3024a7f9", - "archive:https://github.com/janestreet/sexplib0/archive/refs/tags/v0.15.1.tar.gz#md5:ab8fd6273f35a792cad48cbb3024a7f9" + "archive:https://opam.ocaml.org/cache/md5/ab/abafe8fd1d6302e55a315f4d78960d2a#md5:abafe8fd1d6302e55a315f4d78960d2a", + "archive:https://github.com/janestreet/sexplib0/archive/refs/tags/v0.17.0.tar.gz#md5:abafe8fd1d6302e55a315f4d78960d2a" ], "opam": { "name": "sexplib0", - "version": "v0.15.1", - "path": "esy.lock/opam/sexplib0.v0.15.1" + "version": "v0.17.0", + "path": "esy.lock/opam/sexplib0.v0.17.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -223,9 +246,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "devDependencies": [ "ocaml@5.1.1000@d41d8cd9" ] }, "@opam/result@opam:1.5@1c6a6533": { "id": "@opam/result@opam:1.5@1c6a6533", @@ -245,126 +268,163 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/reason@opam:3.8.0@0af856e0": { - "id": "@opam/reason@opam:3.8.0@0af856e0", + "@opam/reason@opam:3.11.0@6ad0e561": { + "id": "@opam/reason@opam:3.11.0@6ad0e561", "name": "@opam/reason", - "version": "opam:3.8.0", + "version": "opam:3.11.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/94/9478724b01767320064ba950ddea24c5df0eefdcdd8ff1324ba9ccd646258979#sha256:9478724b01767320064ba950ddea24c5df0eefdcdd8ff1324ba9ccd646258979", - "archive:https://github.com/reasonml/reason/releases/download/3.8.0/reason-3.8.0.tbz#sha256:9478724b01767320064ba950ddea24c5df0eefdcdd8ff1324ba9ccd646258979" + "archive:https://opam.ocaml.org/cache/sha256/a5/a58837f14a79f047c8eb99d5518aeb16ee64353574286cfd5b284c98a1a27250#sha256:a58837f14a79f047c8eb99d5518aeb16ee64353574286cfd5b284c98a1a27250", + "archive:https://github.com/reasonml/reason/releases/download/3.11.0/reason-3.11.0.tbz#sha256:a58837f14a79f047c8eb99d5518aeb16ee64353574286cfd5b284c98a1a27250" ], "opam": { "name": "reason", - "version": "3.8.0", - "path": "esy.lock/opam/reason.3.8.0" + "version": "3.11.0", + "path": "esy.lock/opam/reason.3.11.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@5.1.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocamlfind@opam:1.9.5@c4562efc", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/merlin-extend@opam:0.6.1@7d979feb", - "@opam/menhir@opam:20220210@ff87a93b", - "@opam/fix@opam:20220121@17b9a1a4", "@opam/dune@opam:2.8.4@4ac03159", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/menhir@opam:20231231@f35eae6a", + "@opam/fix@opam:20230505@941a65ff", + "@opam/dune-build-info@opam:3.15.2@5f3c54ae", + "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@5.1.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/merlin-extend@opam:0.6.1@7d979feb", - "@opam/menhir@opam:20220210@ff87a93b", - "@opam/fix@opam:20220121@17b9a1a4", "@opam/dune@opam:2.8.4@4ac03159" + "@opam/menhir@opam:20231231@f35eae6a", + "@opam/fix@opam:20230505@941a65ff", + "@opam/dune-build-info@opam:3.15.2@5f3c54ae", + "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/re@opam:1.10.4@c4910ba6": { - "id": "@opam/re@opam:1.10.4@c4910ba6", + "@opam/re@opam:1.11.0@87deb463": { + "id": "@opam/re@opam:1.11.0@87deb463", "name": "@opam/re", - "version": "opam:1.10.4", + "version": "opam:1.11.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/83/83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c#sha256:83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c", - "archive:https://github.com/ocaml/ocaml-re/releases/download/1.10.4/re-1.10.4.tbz#sha256:83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c" + "archive:https://opam.ocaml.org/cache/sha256/01/01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f#sha256:01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f", + "archive:https://github.com/ocaml/ocaml-re/releases/download/1.11.0/re-1.11.0.tbz#sha256:01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f" ], "opam": { "name": "re", - "version": "1.10.4", - "path": "esy.lock/opam/re.1.10.4" + "version": "1.11.0", + "path": "esy.lock/opam/re.1.11.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.8.4@4ac03159", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/qcheck-core@opam:0.9@3f95f89d": { - "id": "@opam/qcheck-core@opam:0.9@3f95f89d", + "@opam/qcheck-core@opam:0.21.3@285ff2c8": { + "id": "@opam/qcheck-core@opam:0.21.3@285ff2c8", "name": "@opam/qcheck-core", - "version": "opam:0.9", + "version": "opam:0.21.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/77/7782c8cfce30a5fb766d933e99129ee7#md5:7782c8cfce30a5fb766d933e99129ee7", - "archive:https://github.com/c-cube/qcheck/archive/0.9.tar.gz#md5:7782c8cfce30a5fb766d933e99129ee7" + "archive:https://opam.ocaml.org/cache/md5/89/8930042156873aa8dfa433d7c1bf8463#md5:8930042156873aa8dfa433d7c1bf8463", + "archive:https://github.com/c-cube/qcheck/archive/v0.21.3.tar.gz#md5:8930042156873aa8dfa433d7c1bf8463" ], "opam": { "name": "qcheck-core", - "version": "0.9", - "path": "esy.lock/opam/qcheck-core.0.9" + "version": "0.21.3", + "path": "esy.lock/opam/qcheck-core.0.21.3" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@opam/base-unix@opam:base@87d0b2eb", - "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", - "@opam/base-unix@opam:base@87d0b2eb", - "@opam/base-bytes@opam:base@19d0c2ff" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/ptime@opam:1.0.0@e04fef10": { - "id": "@opam/ptime@opam:1.0.0@e04fef10", + "@opam/ptime@opam:1.1.0@d6f12219": { + "id": "@opam/ptime@opam:1.1.0@d6f12219", "name": "@opam/ptime", - "version": "opam:1.0.0", + "version": "opam:1.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/df/df2410d9cc25a33083fe968a584b8fb4d68ad5c077f3356da0a20427e6cd8756a5b946b921e5cf8ed4097f2c506e93345d9dca63b113be644d5a7cc0753d1534#sha512:df2410d9cc25a33083fe968a584b8fb4d68ad5c077f3356da0a20427e6cd8756a5b946b921e5cf8ed4097f2c506e93345d9dca63b113be644d5a7cc0753d1534", - "archive:https://erratique.ch/software/ptime/releases/ptime-1.0.0.tbz#sha512:df2410d9cc25a33083fe968a584b8fb4d68ad5c077f3356da0a20427e6cd8756a5b946b921e5cf8ed4097f2c506e93345d9dca63b113be644d5a7cc0753d1534" + "archive:https://opam.ocaml.org/cache/sha512/30/309b8383f61b58840e58a82802ec8fbc61b7cc95a4590d38ad427e484cbaaf66f03fa8e6484b5b6855468a87e745aed103bf6f1041ec05062230a9fa5fb86cc6#sha512:309b8383f61b58840e58a82802ec8fbc61b7cc95a4590d38ad427e484cbaaf66f03fa8e6484b5b6855468a87e745aed103bf6f1041ec05062230a9fa5fb86cc6", + "archive:https://erratique.ch/software/ptime/releases/ptime-1.1.0.tbz#sha512:309b8383f61b58840e58a82802ec8fbc61b7cc95a4590d38ad427e484cbaaf66f03fa8e6484b5b6855468a87e745aed103bf6f1041ec05062230a9fa5fb86cc6" ], "opam": { "name": "ptime", - "version": "1.0.0", - "path": "esy.lock/opam/ptime.1.0.0" + "version": "1.1.0", + "path": "esy.lock/opam/ptime.1.1.0" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": "esy.lock/overrides/opam__s__ptime_opam__c__1.1.0_opam_override" + } + ], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/topkg@opam:1.0.5@0aa59f51", - "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@opam/ocamlbuild@opam:0.14.1@ead10f40", + "ocaml@5.1.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.3@6ab20ab3", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "devDependencies": [ "ocaml@5.1.1000@d41d8cd9" ] + }, + "@opam/ppxlib@opam:0.32.1@9897cafd": { + "id": "@opam/ppxlib@opam:0.32.1@9897cafd", + "name": "@opam/ppxlib", + "version": "opam:0.32.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/9d/9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f#sha256:9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f", + "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.1/ppxlib-0.32.1.tbz#sha256:9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f" + ], + "opam": { + "name": "ppxlib", + "version": "0.32.1", + "path": "esy.lock/opam/ppxlib.0.32.1" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/sexplib0@opam:v0.17.0@21847769", + "@opam/ppx_derivers@opam:1.2.1@e2cbad12", + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/sexplib0@opam:v0.17.0@21847769", + "@opam/ppx_derivers@opam:1.2.1@e2cbad12", + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@opam/dune@opam:3.15.2@d8da42a0" + ] }, "@opam/ppx_derivers@opam:1.2.1@e2cbad12": { "id": "@opam/ppx_derivers@opam:1.2.1@e2cbad12", @@ -384,99 +444,185 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/odoc@opam:1.5.3@122d8c31": { - "id": "@opam/odoc@opam:1.5.3@122d8c31", + "@opam/odoc-parser@opam:2.4.2@1c1f2555": { + "id": "@opam/odoc-parser@opam:2.4.2@1c1f2555", + "name": "@opam/odoc-parser", + "version": "opam:2.4.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/56/563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b#sha256:563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b", + "archive:https://github.com/ocaml/odoc/releases/download/2.4.2/odoc-2.4.2.tbz#sha256:563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b" + ], + "opam": { + "name": "odoc-parser", + "version": "2.4.2", + "path": "esy.lock/opam/odoc-parser.2.4.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/camlp-streams@opam:5.0.1@daaa0f94", + "@opam/astring@opam:0.8.5@1300cee8", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/camlp-streams@opam:5.0.1@daaa0f94", + "@opam/astring@opam:0.8.5@1300cee8" + ] + }, + "@opam/odoc@opam:2.4.2@12b68179": { + "id": "@opam/odoc@opam:2.4.2@12b68179", "name": "@opam/odoc", - "version": "opam:1.5.3", + "version": "opam:2.4.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f2/f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45#sha256:f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45", - "archive:https://github.com/ocaml/odoc/releases/download/1.5.3/odoc-1.5.3.tbz#sha256:f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45" + "archive:https://opam.ocaml.org/cache/sha256/56/563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b#sha256:563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b", + "archive:https://github.com/ocaml/odoc/releases/download/2.4.2/odoc-2.4.2.tbz#sha256:563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b" ], "opam": { "name": "odoc", - "version": "1.5.3", - "path": "esy.lock/opam/odoc.1.5.3" + "version": "2.4.2", + "path": "esy.lock/opam/odoc.2.4.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/tyxml@opam:4.5.0@0a609297", - "@opam/result@opam:1.5@1c6a6533", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/dune@opam:2.8.4@4ac03159", "@opam/cppo@opam:1.6.9@db929a12", - "@opam/cmdliner@opam:1.1.1@03763729", + "ocaml@5.1.1000@d41d8cd9", "@opam/tyxml@opam:4.6.0@5ced2c2c", + "@opam/result@opam:1.5@1c6a6533", + "@opam/odoc-parser@opam:2.4.2@1c1f2555", + "@opam/fpath@opam:0.7.3@674d8125", "@opam/fmt@opam:0.9.0@87213963", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/crunch@opam:3.3.1@e6228a2b", "@opam/cppo@opam:1.6.9@db929a12", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/tyxml@opam:4.5.0@0a609297", - "@opam/result@opam:1.5@1c6a6533", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/dune@opam:2.8.4@4ac03159", - "@opam/cmdliner@opam:1.1.1@03763729", + "ocaml@5.1.1000@d41d8cd9", "@opam/tyxml@opam:4.6.0@5ced2c2c", + "@opam/result@opam:1.5@1c6a6533", + "@opam/odoc-parser@opam:2.4.2@1c1f2555", + "@opam/fpath@opam:0.7.3@674d8125", "@opam/fmt@opam:0.9.0@87213963", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/crunch@opam:3.3.1@e6228a2b", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@opam/astring@opam:0.8.5@1300cee8" ] }, - "@opam/ocamlfind@opam:1.9.5@c4562efc": { - "id": "@opam/ocamlfind@opam:1.9.5@c4562efc", + "@opam/ocamlfind@opam:1.9.6@da5169c7": { + "id": "@opam/ocamlfind@opam:1.9.6@da5169c7", "name": "@opam/ocamlfind", - "version": "opam:1.9.5", + "version": "opam:1.9.6", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/8b/8b893525ce36cb3d4d4952483bcc7cf4#md5:8b893525ce36cb3d4d4952483bcc7cf4", - "archive:http://download.camlcity.org/download/findlib-1.9.5.tar.gz#md5:8b893525ce36cb3d4d4952483bcc7cf4" + "archive:https://opam.ocaml.org/cache/md5/96/96c6ee50a32cca9ca277321262dbec57#md5:96c6ee50a32cca9ca277321262dbec57", + "archive:http://download.camlcity.org/download/findlib-1.9.6.tar.gz#md5:96c6ee50a32cca9ca277321262dbec57" ], "opam": { "name": "ocamlfind", - "version": "1.9.5", - "path": "esy.lock/opam/ocamlfind.1.9.5" + "version": "1.9.6", + "path": "esy.lock/opam/ocamlfind.1.9.6" } }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override" } ], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "devDependencies": [ "ocaml@5.1.1000@d41d8cd9" ] }, - "@opam/ocamlbuild@opam:0.14.1@ead10f40": { - "id": "@opam/ocamlbuild@opam:0.14.1@ead10f40", + "@opam/ocamlbuild@opam:0.14.3@6ab20ab3": { + "id": "@opam/ocamlbuild@opam:0.14.3@6ab20ab3", "name": "@opam/ocamlbuild", - "version": "opam:0.14.1", + "version": "opam:0.14.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/70/7027e507ed85f290923ad198f3d2cd1c#md5:7027e507ed85f290923ad198f3d2cd1c", - "archive:https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.1.tar.gz#md5:7027e507ed85f290923ad198f3d2cd1c" + "archive:https://opam.ocaml.org/cache/md5/22/220df59060c916e8aac2eb471c870485#md5:220df59060c916e8aac2eb471c870485", + "archive:https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.3.tar.gz#md5:220df59060c916e8aac2eb471c870485" ], "opam": { "name": "ocamlbuild", - "version": "0.14.1", - "path": "esy.lock/opam/ocamlbuild.0.14.1" + "version": "0.14.3", + "path": "esy.lock/opam/ocamlbuild.0.14.3" } }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.1_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.3_opam_override" } ], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@5.1.1000@d41d8cd9" ] + }, + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1": { + "id": "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "name": "@opam/ocaml-compiler-libs", + "version": "opam:v0.12.4", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/4e/4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760#sha256:4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760", + "archive:https://github.com/janestreet/ocaml-compiler-libs/releases/download/v0.12.4/ocaml-compiler-libs-v0.12.4.tbz#sha256:4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760" + ], + "opam": { + "name": "ocaml-compiler-libs", + "version": "v0.12.4", + "path": "esy.lock/opam/ocaml-compiler-libs.v0.12.4" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" + ] + }, + "@opam/merlin-lib@opam:4.14-501@006c5533": { + "id": "@opam/merlin-lib@opam:4.14-501@006c5533", + "name": "@opam/merlin-lib", + "version": "opam:4.14-501", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/b7/b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292#sha256:b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292", + "archive:https://github.com/ocaml/merlin/releases/download/v4.14-501/merlin-4.14-501.tbz#sha256:b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292" + ], + "opam": { + "name": "merlin-lib", + "version": "4.14-501", + "path": "esy.lock/opam/merlin-lib.4.14-501" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "devDependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/csexp@opam:1.5.2@46614bf4" + ] }, "@opam/merlin-extend@opam:0.6.1@7d979feb": { "id": "@opam/merlin-extend@opam:0.6.1@7d979feb", @@ -496,119 +642,147 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/merlin@opam:4.2-412@a614d045": { - "id": "@opam/merlin@opam:4.2-412@a614d045", + "@opam/merlin@opam:4.14-501@c3b7d93d": { + "id": "@opam/merlin@opam:4.14-501@c3b7d93d", "name": "@opam/merlin", - "version": "opam:4.2-412", + "version": "opam:4.14-501", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/86c30769277d3e2c09a8be6c68a98cd342bc0bdbde07c7225bfe2e6d0da2d394#sha256:86c30769277d3e2c09a8be6c68a98cd342bc0bdbde07c7225bfe2e6d0da2d394", - "archive:https://github.com/ocaml/merlin/releases/download/v4.2-412/merlin-v4.2-412.tbz#sha256:86c30769277d3e2c09a8be6c68a98cd342bc0bdbde07c7225bfe2e6d0da2d394" + "archive:https://opam.ocaml.org/cache/sha256/b7/b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292#sha256:b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292", + "archive:https://github.com/ocaml/merlin/releases/download/v4.14-501/merlin-4.14-501.tbz#sha256:b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292" ], "opam": { "name": "merlin", - "version": "4.2-412", - "path": "esy.lock/opam/merlin.4.2-412" + "version": "4.14-501", + "path": "esy.lock/opam/merlin.4.14-501" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/result@opam:1.5@1c6a6533", "@opam/dune@opam:2.8.4@4ac03159", - "@opam/dot-merlin-reader@opam:4.1@84436e1c", - "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@opam/yojson@opam:2.1.2@9fd14300", + "@opam/merlin-lib@opam:4.14-501@006c5533", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/dot-merlin-reader@opam:4.9@5671df8d", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/result@opam:1.5@1c6a6533", "@opam/dune@opam:2.8.4@4ac03159", - "@opam/dot-merlin-reader@opam:4.1@84436e1c", - "@opam/csexp@opam:1.5.1@8a8fb3a7" + "ocaml@5.1.1000@d41d8cd9", "@opam/yojson@opam:2.1.2@9fd14300", + "@opam/merlin-lib@opam:4.14-501@006c5533", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/dot-merlin-reader@opam:4.9@5671df8d" ] }, - "@opam/menhirSdk@opam:20220210@b8921e41": { - "id": "@opam/menhirSdk@opam:20220210@b8921e41", + "@opam/menhirSdk@opam:20231231@b20b8a51": { + "id": "@opam/menhirSdk@opam:20231231@b20b8a51", "name": "@opam/menhirSdk", - "version": "opam:20220210", + "version": "opam:20231231", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/e3/e3cef220f676c4b1c16cbccb174cefe3#md5:e3cef220f676c4b1c16cbccb174cefe3", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz#md5:e3cef220f676c4b1c16cbccb174cefe3" + "archive:https://opam.ocaml.org/cache/md5/79/799748bc3b7a542798a85956c7863865#md5:799748bc3b7a542798a85956c7863865", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz#md5:799748bc3b7a542798a85956c7863865" ], "opam": { "name": "menhirSdk", - "version": "20220210", - "path": "esy.lock/opam/menhirSdk.20220210" + "version": "20231231", + "path": "esy.lock/opam/menhirSdk.20231231" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/menhirLib@opam:20220210@e6562f4f": { - "id": "@opam/menhirLib@opam:20220210@e6562f4f", + "@opam/menhirLib@opam:20231231@14d79986": { + "id": "@opam/menhirLib@opam:20231231@14d79986", "name": "@opam/menhirLib", - "version": "opam:20220210", + "version": "opam:20231231", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/e3/e3cef220f676c4b1c16cbccb174cefe3#md5:e3cef220f676c4b1c16cbccb174cefe3", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz#md5:e3cef220f676c4b1c16cbccb174cefe3" + "archive:https://opam.ocaml.org/cache/md5/79/799748bc3b7a542798a85956c7863865#md5:799748bc3b7a542798a85956c7863865", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz#md5:799748bc3b7a542798a85956c7863865" ], "opam": { "name": "menhirLib", - "version": "20220210", - "path": "esy.lock/opam/menhirLib.20220210" + "version": "20231231", + "path": "esy.lock/opam/menhirLib.20231231" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" + ] + }, + "@opam/menhirCST@opam:20231231@0f42b5d1": { + "id": "@opam/menhirCST@opam:20231231@0f42b5d1", + "name": "@opam/menhirCST", + "version": "opam:20231231", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/md5/79/799748bc3b7a542798a85956c7863865#md5:799748bc3b7a542798a85956c7863865", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz#md5:799748bc3b7a542798a85956c7863865" + ], + "opam": { + "name": "menhirCST", + "version": "20231231", + "path": "esy.lock/opam/menhirCST.20231231" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/menhir@opam:20220210@ff87a93b": { - "id": "@opam/menhir@opam:20220210@ff87a93b", + "@opam/menhir@opam:20231231@f35eae6a": { + "id": "@opam/menhir@opam:20231231@f35eae6a", "name": "@opam/menhir", - "version": "opam:20220210", + "version": "opam:20231231", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/e3/e3cef220f676c4b1c16cbccb174cefe3#md5:e3cef220f676c4b1c16cbccb174cefe3", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz#md5:e3cef220f676c4b1c16cbccb174cefe3" + "archive:https://opam.ocaml.org/cache/md5/79/799748bc3b7a542798a85956c7863865#md5:799748bc3b7a542798a85956c7863865", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz#md5:799748bc3b7a542798a85956c7863865" ], "opam": { "name": "menhir", - "version": "20220210", - "path": "esy.lock/opam/menhir.20220210" + "version": "20231231", + "path": "esy.lock/opam/menhir.20231231" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/menhirSdk@opam:20220210@b8921e41", - "@opam/menhirLib@opam:20220210@e6562f4f", - "@opam/dune@opam:2.8.4@4ac03159", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@opam/menhirSdk@opam:20231231@b20b8a51", + "@opam/menhirLib@opam:20231231@14d79986", + "@opam/menhirCST@opam:20231231@0f42b5d1", + "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/menhirSdk@opam:20220210@b8921e41", - "@opam/menhirLib@opam:20220210@e6562f4f", - "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/menhirSdk@opam:20231231@b20b8a51", + "@opam/menhirLib@opam:20231231@14d79986", + "@opam/menhirCST@opam:20231231@0f42b5d1", + "@opam/dune@opam:3.15.2@d8da42a0" ] }, "@opam/junit@opam:2.0.2@500cf494": { @@ -629,12 +803,12 @@ }, "overrides": [], "dependencies": [ - "@opam/tyxml@opam:4.5.0@0a609297", "@opam/ptime@opam:1.0.0@e04fef10", - "@opam/dune@opam:2.8.4@4ac03159", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/tyxml@opam:4.6.0@5ced2c2c", "@opam/ptime@opam:1.1.0@d6f12219", + "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/tyxml@opam:4.5.0@0a609297", "@opam/ptime@opam:1.0.0@e04fef10", - "@opam/dune@opam:2.8.4@4ac03159" + "@opam/tyxml@opam:4.6.0@5ced2c2c", "@opam/ptime@opam:1.1.0@d6f12219", + "@opam/dune@opam:3.15.2@d8da42a0" ] }, "@opam/fpath@opam:0.7.3@674d8125": { @@ -655,147 +829,225 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/topkg@opam:1.0.5@0aa59f51", - "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@opam/ocamlbuild@opam:0.14.1@ead10f40", + "ocaml@5.1.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.3@6ab20ab3", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/astring@opam:0.8.5@1300cee8" + "ocaml@5.1.1000@d41d8cd9", "@opam/astring@opam:0.8.5@1300cee8" ] }, - "@opam/fix@opam:20220121@17b9a1a4": { - "id": "@opam/fix@opam:20220121@17b9a1a4", + "@opam/fmt@opam:0.9.0@87213963": { + "id": "@opam/fmt@opam:0.9.0@87213963", + "name": "@opam/fmt", + "version": "opam:0.9.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha512/66/66cf4b8bb92232a091dfda5e94d1c178486a358cdc34b1eec516d48ea5acb6209c0dfcb416f0c516c50ddbddb3c94549a45e4a6d5c5fd1c81d3374dec823a83b#sha512:66cf4b8bb92232a091dfda5e94d1c178486a358cdc34b1eec516d48ea5acb6209c0dfcb416f0c516c50ddbddb3c94549a45e4a6d5c5fd1c81d3374dec823a83b", + "archive:https://erratique.ch/software/fmt/releases/fmt-0.9.0.tbz#sha512:66cf4b8bb92232a091dfda5e94d1c178486a358cdc34b1eec516d48ea5acb6209c0dfcb416f0c516c50ddbddb3c94549a45e4a6d5c5fd1c81d3374dec823a83b" + ], + "opam": { + "name": "fmt", + "version": "0.9.0", + "path": "esy.lock/opam/fmt.0.9.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.3@6ab20ab3", + "@opam/cmdliner@opam:1.2.0@b0c6143c", + "@opam/base-unix@opam:base@87d0b2eb", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "ocaml@5.1.1000@d41d8cd9" ] + }, + "@opam/fix@opam:20230505@941a65ff": { + "id": "@opam/fix@opam:20230505@941a65ff", "name": "@opam/fix", - "version": "opam:20220121", + "version": "opam:20230505", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/48/48d8a5bdff23cf7fbf9288877df2b6aa#md5:48d8a5bdff23cf7fbf9288877df2b6aa", - "archive:https://gitlab.inria.fr/fpottier/fix/-/archive/20220121/archive.tar.gz#md5:48d8a5bdff23cf7fbf9288877df2b6aa" + "archive:https://opam.ocaml.org/cache/md5/2a/2a4afa633128c5010677222f7b3c9451#md5:2a4afa633128c5010677222f7b3c9451", + "archive:https://gitlab.inria.fr/fpottier/fix/-/archive/20230505/archive.tar.gz#md5:2a4afa633128c5010677222f7b3c9451" ], "opam": { "name": "fix", - "version": "20220121", - "path": "esy.lock/opam/fix.20220121" + "version": "20230505", + "path": "esy.lock/opam/fix.20230505" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/easy-format@opam:1.3.2@1ea9f987": { - "id": "@opam/easy-format@opam:1.3.2@1ea9f987", + "@opam/easy-format@opam:1.3.4@21f6fe23": { + "id": "@opam/easy-format@opam:1.3.4@21f6fe23", "name": "@opam/easy-format", - "version": "opam:1.3.2", + "version": "opam:1.3.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/34/3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926", - "archive:https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926" + "archive:https://opam.ocaml.org/cache/sha256/1d/1dbf051e9f68574dde6e2e254a66b9c524ca425e80b36e99af96ed964ab610c3#sha256:1dbf051e9f68574dde6e2e254a66b9c524ca425e80b36e99af96ed964ab610c3", + "archive:https://github.com/ocaml-community/easy-format/releases/download/1.3.4/easy-format-1.3.4.tbz#sha256:1dbf051e9f68574dde6e2e254a66b9c524ca425e80b36e99af96ed964ab610c3" ], "opam": { "name": "easy-format", - "version": "1.3.2", - "path": "esy.lock/opam/easy-format.1.3.2" + "version": "1.3.4", + "path": "esy.lock/opam/easy-format.1.3.4" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" + ] + }, + "@opam/dune-build-info@opam:3.15.2@5f3c54ae": { + "id": "@opam/dune-build-info@opam:3.15.2@5f3c54ae", + "name": "@opam/dune-build-info", + "version": "opam:3.15.2", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/f9/f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933#sha256:f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933", + "archive:https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz#sha256:f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933" + ], + "opam": { + "name": "dune-build-info", + "version": "3.15.2", + "path": "esy.lock/opam/dune-build-info.3.15.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/dune@opam:2.8.4@4ac03159": { - "id": "@opam/dune@opam:2.8.4@4ac03159", + "@opam/dune@opam:3.15.2@d8da42a0": { + "id": "@opam/dune@opam:3.15.2@d8da42a0", "name": "@opam/dune", - "version": "opam:2.8.4", + "version": "opam:3.15.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4e/4e6420177584aabdc3b7b37aee3026b094b82bf5d7ed175344a68e321f72e8ac#sha256:4e6420177584aabdc3b7b37aee3026b094b82bf5d7ed175344a68e321f72e8ac", - "archive:https://github.com/ocaml/dune/releases/download/2.8.4/dune-2.8.4.tbz#sha256:4e6420177584aabdc3b7b37aee3026b094b82bf5d7ed175344a68e321f72e8ac" + "archive:https://opam.ocaml.org/cache/sha256/f9/f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933#sha256:f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933", + "archive:https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz#sha256:f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933" ], "opam": { "name": "dune", - "version": "2.8.4", - "path": "esy.lock/opam/dune.2.8.4" + "version": "3.15.2", + "path": "esy.lock/opam/dune.3.15.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@5.1.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@5.1.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, - "@opam/dot-merlin-reader@opam:4.1@84436e1c": { - "id": "@opam/dot-merlin-reader@opam:4.1@84436e1c", + "@opam/dot-merlin-reader@opam:4.9@5671df8d": { + "id": "@opam/dot-merlin-reader@opam:4.9@5671df8d", "name": "@opam/dot-merlin-reader", - "version": "opam:4.1", + "version": "opam:4.9", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/14/14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd#sha256:14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd", - "archive:https://github.com/ocaml/merlin/releases/download/v4.1/dot-merlin-reader-v4.1.tbz#sha256:14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd" + "archive:https://opam.ocaml.org/cache/sha256/e2/e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd#sha256:e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd", + "archive:https://github.com/ocaml/merlin/releases/download/v4.9-414/merlin-4.9-414.tbz#sha256:e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd" ], "opam": { "name": "dot-merlin-reader", - "version": "4.1", - "path": "esy.lock/opam/dot-merlin-reader.4.1" + "version": "4.9", + "path": "esy.lock/opam/dot-merlin-reader.4.9" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@opam/dune@opam:2.8.4@4ac03159", "@opam/csexp@opam:1.5.1@8a8fb3a7", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/merlin-lib@opam:4.14-501@006c5533", + "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@opam/dune@opam:2.8.4@4ac03159", "@opam/csexp@opam:1.5.1@8a8fb3a7" + "ocaml@5.1.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/merlin-lib@opam:4.14-501@006c5533", + "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/csexp@opam:1.5.1@8a8fb3a7": { - "id": "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@opam/csexp@opam:1.5.2@46614bf4": { + "id": "@opam/csexp@opam:1.5.2@46614bf4", "name": "@opam/csexp", - "version": "opam:1.5.1", + "version": "opam:1.5.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d6/d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02#sha256:d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02", - "archive:https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz#sha256:d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02" + "archive:https://opam.ocaml.org/cache/sha256/1a/1a14dd04bb4379a41990248550628c77913a9c07f3c35c1370b6960e697787ff#sha256:1a14dd04bb4379a41990248550628c77913a9c07f3c35c1370b6960e697787ff", + "archive:https://github.com/ocaml-dune/csexp/releases/download/1.5.2/csexp-1.5.2.tbz#sha256:1a14dd04bb4379a41990248550628c77913a9c07f3c35c1370b6960e697787ff" ], "opam": { "name": "csexp", - "version": "1.5.1", - "path": "esy.lock/opam/csexp.1.5.1" + "version": "1.5.2", + "path": "esy.lock/opam/csexp.1.5.2" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" + ] + }, + "@opam/crunch@opam:3.3.1@e6228a2b": { + "id": "@opam/crunch@opam:3.3.1@e6228a2b", + "name": "@opam/crunch", + "version": "opam:3.3.1", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/2c/2c5ba0d4110bcbb7731cba4eafb6c44a7487c3f88c1ad47401271b69ffa8ed6a#sha256:2c5ba0d4110bcbb7731cba4eafb6c44a7487c3f88c1ad47401271b69ffa8ed6a", + "archive:https://github.com/mirage/ocaml-crunch/releases/download/v3.3.1/crunch-3.3.1.tbz#sha256:2c5ba0d4110bcbb7731cba4eafb6c44a7487c3f88c1ad47401271b69ffa8ed6a" + ], + "opam": { + "name": "crunch", + "version": "3.3.1", + "path": "esy.lock/opam/crunch.3.3.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/ptime@opam:1.1.0@d6f12219", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/ptime@opam:1.1.0@d6f12219", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/cmdliner@opam:1.2.0@b0c6143c" ] }, "@opam/cppo@opam:1.6.9@db929a12": { @@ -816,86 +1068,89 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/cmdliner@opam:1.1.1@03763729": { - "id": "@opam/cmdliner@opam:1.1.1@03763729", + "@opam/cmdliner@opam:1.2.0@b0c6143c": { + "id": "@opam/cmdliner@opam:1.2.0@b0c6143c", "name": "@opam/cmdliner", - "version": "opam:1.1.1", + "version": "opam:1.2.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/54/5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e#sha512:5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e", - "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-1.1.1.tbz#sha512:5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e" + "archive:https://opam.ocaml.org/cache/sha512/6f/6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b#sha512:6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b", + "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-1.2.0.tbz#sha512:6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b" ], "opam": { "name": "cmdliner", - "version": "1.1.1", - "path": "esy.lock/opam/cmdliner.1.1.1" + "version": "1.2.0", + "path": "esy.lock/opam/cmdliner.1.2.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "devDependencies": [ "ocaml@5.1.1000@d41d8cd9" ] }, - "@opam/camlp-streams@opam:5.0@e8d9adcd": { - "id": "@opam/camlp-streams@opam:5.0@e8d9adcd", + "@opam/camlp-streams@opam:5.0.1@daaa0f94": { + "id": "@opam/camlp-streams@opam:5.0.1@daaa0f94", "name": "@opam/camlp-streams", - "version": "opam:5.0", + "version": "opam:5.0.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/30/305d8eaf9cebaf137a8a63770f0ea162#md5:305d8eaf9cebaf137a8a63770f0ea162", - "archive:https://github.com/ocaml/camlp-streams/archive/refs/tags/v5.0.tar.gz#md5:305d8eaf9cebaf137a8a63770f0ea162" + "archive:https://opam.ocaml.org/cache/md5/af/afc874b25f7a1f13e8f5cfc1182b51a7#md5:afc874b25f7a1f13e8f5cfc1182b51a7", + "archive:https://github.com/ocaml/camlp-streams/archive/v5.0.1.tar.gz#md5:afc874b25f7a1f13e8f5cfc1182b51a7" ], "opam": { "name": "camlp-streams", - "version": "5.0", - "path": "esy.lock/opam/camlp-streams.5.0" + "version": "5.0.1", + "path": "esy.lock/opam/camlp-streams.5.0.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/dune@opam:3.15.2@d8da42a0" ] }, - "@opam/biniou@opam:1.2.1@420bda02": { - "id": "@opam/biniou@opam:1.2.1@420bda02", + "@opam/biniou@opam:1.2.2@c7862a8d": { + "id": "@opam/biniou@opam:1.2.2@c7862a8d", "name": "@opam/biniou", - "version": "opam:1.2.1", + "version": "opam:1.2.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/35/35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335", - "archive:https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335" + "archive:https://opam.ocaml.org/cache/sha256/8b/8bf3ff17cd0ecb2d6b6d1d94cb08ef089d44caef96e9bae6be6839d428fa318f#sha256:8bf3ff17cd0ecb2d6b6d1d94cb08ef089d44caef96e9bae6be6839d428fa318f", + "archive:https://github.com/mjambon/biniou/releases/download/1.2.2/biniou-1.2.2.tbz#sha256:8bf3ff17cd0ecb2d6b6d1d94cb08ef089d44caef96e9bae6be6839d428fa318f" ], "opam": { "name": "biniou", - "version": "1.2.1", - "path": "esy.lock/opam/biniou.1.2.1" + "version": "1.2.2", + "path": "esy.lock/opam/biniou.1.2.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", - "@opam/dune@opam:2.8.4@4ac03159", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@opam/easy-format@opam:1.3.4@21f6fe23", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/camlp-streams@opam:5.0.1@daaa0f94", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", - "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/easy-format@opam:1.3.4@21f6fe23", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/camlp-streams@opam:5.0.1@daaa0f94" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -932,121 +1187,99 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/base-bytes@opam:base@19d0c2ff": { - "id": "@opam/base-bytes@opam:base@19d0c2ff", - "name": "@opam/base-bytes", - "version": "opam:base", - "source": { - "type": "install", - "source": [ "no-source:" ], - "opam": { - "name": "base-bytes", - "version": "base", - "path": "esy.lock/opam/base-bytes.base" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c4562efc" - ] - }, - "@opam/atdgen-runtime@opam:2.9.1@21440789": { - "id": "@opam/atdgen-runtime@opam:2.9.1@21440789", + "@opam/atdgen-runtime@opam:2.15.0@05de7755": { + "id": "@opam/atdgen-runtime@opam:2.15.0@05de7755", "name": "@opam/atdgen-runtime", - "version": "opam:2.9.1", + "version": "opam:2.15.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/39/39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4#sha256:39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4", - "archive:https://github.com/ahrefs/atd/releases/download/2.9.1/atdts-2.9.1.tbz#sha256:39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4" + "archive:https://opam.ocaml.org/cache/sha256/ba/ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933#sha256:ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933", + "archive:https://github.com/ahrefs/atd/releases/download/2.15.0/atd-2.15.0.tbz#sha256:ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933" ], "opam": { "name": "atdgen-runtime", - "version": "2.9.1", - "path": "esy.lock/opam/atdgen-runtime.2.9.1" + "version": "2.15.0", + "path": "esy.lock/opam/atdgen-runtime.2.15.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/dune@opam:2.8.4@4ac03159", - "@opam/camlp-streams@opam:5.0@e8d9adcd", - "@opam/biniou@opam:1.2.1@420bda02", + "ocaml@5.1.1000@d41d8cd9", "@opam/yojson@opam:2.1.2@9fd14300", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/biniou@opam:1.2.2@c7862a8d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/dune@opam:2.8.4@4ac03159", - "@opam/camlp-streams@opam:5.0@e8d9adcd", - "@opam/biniou@opam:1.2.1@420bda02" + "ocaml@5.1.1000@d41d8cd9", "@opam/yojson@opam:2.1.2@9fd14300", + "@opam/dune@opam:3.15.2@d8da42a0", "@opam/biniou@opam:1.2.2@c7862a8d" ] }, - "@opam/atdgen@opam:2.9.1@e79b04ba": { - "id": "@opam/atdgen@opam:2.9.1@e79b04ba", + "@opam/atdgen@opam:2.15.0@2e0ae924": { + "id": "@opam/atdgen@opam:2.15.0@2e0ae924", "name": "@opam/atdgen", - "version": "opam:2.9.1", + "version": "opam:2.15.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/39/39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4#sha256:39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4", - "archive:https://github.com/ahrefs/atd/releases/download/2.9.1/atdts-2.9.1.tbz#sha256:39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4" + "archive:https://opam.ocaml.org/cache/sha256/ba/ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933#sha256:ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933", + "archive:https://github.com/ahrefs/atd/releases/download/2.15.0/atd-2.15.0.tbz#sha256:ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933" ], "opam": { "name": "atdgen", - "version": "2.9.1", - "path": "esy.lock/opam/atdgen.2.9.1" + "version": "2.15.0", + "path": "esy.lock/opam/atdgen.2.15.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/re@opam:1.10.4@c4910ba6", "@opam/dune@opam:2.8.4@4ac03159", - "@opam/biniou@opam:1.2.1@420bda02", - "@opam/atdgen-runtime@opam:2.9.1@21440789", - "@opam/atd@opam:2.9.1@1121672a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@opam/yojson@opam:2.1.2@9fd14300", + "@opam/re@opam:1.11.0@87deb463", "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/biniou@opam:1.2.2@c7862a8d", + "@opam/atdgen-runtime@opam:2.15.0@05de7755", + "@opam/atd@opam:2.15.0@28f203ef", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/re@opam:1.10.4@c4910ba6", "@opam/dune@opam:2.8.4@4ac03159", - "@opam/biniou@opam:1.2.1@420bda02", - "@opam/atdgen-runtime@opam:2.9.1@21440789", - "@opam/atd@opam:2.9.1@1121672a" + "ocaml@5.1.1000@d41d8cd9", "@opam/yojson@opam:2.1.2@9fd14300", + "@opam/re@opam:1.11.0@87deb463", "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/biniou@opam:1.2.2@c7862a8d", + "@opam/atdgen-runtime@opam:2.15.0@05de7755", + "@opam/atd@opam:2.15.0@28f203ef" ] }, - "@opam/atd@opam:2.9.1@1121672a": { - "id": "@opam/atd@opam:2.9.1@1121672a", + "@opam/atd@opam:2.15.0@28f203ef": { + "id": "@opam/atd@opam:2.15.0@28f203ef", "name": "@opam/atd", - "version": "opam:2.9.1", + "version": "opam:2.15.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/39/39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4#sha256:39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4", - "archive:https://github.com/ahrefs/atd/releases/download/2.9.1/atdts-2.9.1.tbz#sha256:39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4" + "archive:https://opam.ocaml.org/cache/sha256/ba/ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933#sha256:ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933", + "archive:https://github.com/ahrefs/atd/releases/download/2.15.0/atd-2.15.0.tbz#sha256:ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933" ], "opam": { "name": "atd", - "version": "2.9.1", - "path": "esy.lock/opam/atd.2.9.1" + "version": "2.15.0", + "path": "esy.lock/opam/atd.2.15.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/re@opam:1.10.4@c4910ba6", - "@opam/menhir@opam:20220210@ff87a93b", - "@opam/easy-format@opam:1.3.2@1ea9f987", - "@opam/dune@opam:2.8.4@4ac03159", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.1.1000@d41d8cd9", "@opam/yojson@opam:2.1.2@9fd14300", + "@opam/re@opam:1.11.0@87deb463", + "@opam/menhir@opam:20231231@f35eae6a", + "@opam/easy-format@opam:1.3.4@21f6fe23", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/cmdliner@opam:1.2.0@b0c6143c", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/re@opam:1.10.4@c4910ba6", - "@opam/menhir@opam:20220210@ff87a93b", - "@opam/easy-format@opam:1.3.2@1ea9f987", - "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@5.1.1000@d41d8cd9", "@opam/yojson@opam:2.1.2@9fd14300", + "@opam/re@opam:1.11.0@87deb463", + "@opam/menhir@opam:20231231@f35eae6a", + "@opam/easy-format@opam:1.3.4@21f6fe23", + "@opam/dune@opam:3.15.2@d8da42a0", + "@opam/cmdliner@opam:1.2.0@b0c6143c" ] }, "@opam/astring@opam:0.8.5@1300cee8": { @@ -1067,12 +1300,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/topkg@opam:1.0.5@0aa59f51", - "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@opam/ocamlbuild@opam:0.14.1@ead10f40", + "ocaml@5.1.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.3@6ab20ab3", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] + "devDependencies": [ "ocaml@5.1.1000@d41d8cd9" ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { "id": "@esy-ocaml/substs@0.0.1@d41d8cd9", diff --git a/esy.lock/opam/atd.2.9.1/opam b/esy.lock/opam/atd.2.15.0/opam similarity index 86% rename from esy.lock/opam/atd.2.9.1/opam rename to esy.lock/opam/atd.2.15.0/opam index e374a3fb..35edcd80 100644 --- a/esy.lock/opam/atd.2.9.1/opam +++ b/esy.lock/opam/atd.2.15.0/opam @@ -4,7 +4,8 @@ description: """ ATD is the OCaml library providing a parser for the ATD language and various utilities. ATD stands for Adjustable Type Definitions in reference to its main property of supporting annotations that allow a good fit with a variety of data -formats. """ +formats. This package also provides the 'atdcat' and 'atddiff' command-line +utilities.""" maintainer: [ "Louis Roché " "Martin Jambon " @@ -72,6 +73,7 @@ depends: [ "odoc" {with-doc} "re" {>= "1.9.0"} "yojson" {>= "1.6.0"} + "cmdliner" {>= "1.1.0"} ] dev-repo: "git+https://github.com/ahrefs/atd.git" build: [ @@ -89,10 +91,10 @@ build: [ ] url { src: - "https://github.com/ahrefs/atd/releases/download/2.9.1/atdts-2.9.1.tbz" + "https://github.com/ahrefs/atd/releases/download/2.15.0/atd-2.15.0.tbz" checksum: [ - "sha256=39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4" - "sha512=2149ddc53703a8c4c01c5571125ba66cce7305fac332357acfda36a44a67a7c9df2a0322cb05682fed3656067c26cdbe2e50071db5b2e5233abc1cfcf103e34e" + "sha256=ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933" + "sha512=33b7943ae6afd14e5a0709d9131d288e663d3f2b962caa065f1b11db8f6adfe081becba7968c8596b3ff2420577295ac248d521858cb0748e95971390eb29829" ] } -x-commit-hash: "31799bf3955b11d8d9c12334cb65e7609927e09c" +x-commit-hash: "91a5e6165d4741e19451c41189328f52d33e5c7d" diff --git a/esy.lock/opam/atdgen-runtime.2.9.1/opam b/esy.lock/opam/atdgen-runtime.2.15.0/opam similarity index 87% rename from esy.lock/opam/atdgen-runtime.2.9.1/opam rename to esy.lock/opam/atdgen-runtime.2.15.0/opam index c3572da0..979437c3 100644 --- a/esy.lock/opam/atdgen-runtime.2.9.1/opam +++ b/esy.lock/opam/atdgen-runtime.2.15.0/opam @@ -64,9 +64,8 @@ bug-reports: "https://github.com/ahrefs/atd/issues" depends: [ "dune" {>= "2.8"} "ocaml" {>= "4.08"} - "yojson" {>= "1.7.0" & < "2.0.0"} + "yojson" {>= "2.0.2"} "biniou" {>= "1.0.6"} - "camlp-streams" "odoc" {with-doc} ] dev-repo: "git+https://github.com/ahrefs/atd.git" @@ -85,10 +84,10 @@ build: [ ] url { src: - "https://github.com/ahrefs/atd/releases/download/2.9.1/atdts-2.9.1.tbz" + "https://github.com/ahrefs/atd/releases/download/2.15.0/atd-2.15.0.tbz" checksum: [ - "sha256=39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4" - "sha512=2149ddc53703a8c4c01c5571125ba66cce7305fac332357acfda36a44a67a7c9df2a0322cb05682fed3656067c26cdbe2e50071db5b2e5233abc1cfcf103e34e" + "sha256=ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933" + "sha512=33b7943ae6afd14e5a0709d9131d288e663d3f2b962caa065f1b11db8f6adfe081becba7968c8596b3ff2420577295ac248d521858cb0748e95971390eb29829" ] } -x-commit-hash: "31799bf3955b11d8d9c12334cb65e7609927e09c" +x-commit-hash: "91a5e6165d4741e19451c41189328f52d33e5c7d" diff --git a/esy.lock/opam/atdgen.2.9.1/opam b/esy.lock/opam/atdgen.2.15.0/opam similarity index 88% rename from esy.lock/opam/atdgen.2.9.1/opam rename to esy.lock/opam/atdgen.2.15.0/opam index 126b25c8..2b3ff62e 100644 --- a/esy.lock/opam/atdgen.2.9.1/opam +++ b/esy.lock/opam/atdgen.2.15.0/opam @@ -72,11 +72,12 @@ bug-reports: "https://github.com/ahrefs/atd/issues" depends: [ "dune" {>= "2.8"} "ocaml" {>= "4.08"} - "atd" {>= "2.7.0"} + "alcotest" {with-test} + "atd" {>= "2.14.0"} "atdgen-runtime" {>= "2.1.0"} "atdgen-codec-runtime" {with-test} "biniou" {>= "1.0.6"} - "yojson" {>= "1.7.0" & < "2.0.0"} + "yojson" {>= "2.0.1"} "odoc" {with-doc} "re" ] @@ -96,10 +97,10 @@ build: [ ] url { src: - "https://github.com/ahrefs/atd/releases/download/2.9.1/atdts-2.9.1.tbz" + "https://github.com/ahrefs/atd/releases/download/2.15.0/atd-2.15.0.tbz" checksum: [ - "sha256=39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4" - "sha512=2149ddc53703a8c4c01c5571125ba66cce7305fac332357acfda36a44a67a7c9df2a0322cb05682fed3656067c26cdbe2e50071db5b2e5233abc1cfcf103e34e" + "sha256=ba4279bed54d13dcf3f6703a4b31744db815df22c0502d9965d6c674ce083933" + "sha512=33b7943ae6afd14e5a0709d9131d288e663d3f2b962caa065f1b11db8f6adfe081becba7968c8596b3ff2420577295ac248d521858cb0748e95971390eb29829" ] } -x-commit-hash: "31799bf3955b11d8d9c12334cb65e7609927e09c" +x-commit-hash: "91a5e6165d4741e19451c41189328f52d33e5c7d" diff --git a/esy.lock/opam/base-bytes.base/opam b/esy.lock/opam/base-bytes.base/opam deleted file mode 100644 index f1cae506..00000000 --- a/esy.lock/opam/base-bytes.base/opam +++ /dev/null @@ -1,9 +0,0 @@ -opam-version: "2.0" -maintainer: " " -authors: " " -homepage: " " -depends: [ - "ocaml" {>= "4.02.0"} - "ocamlfind" {>= "1.5.3"} -] -synopsis: "Bytes library distributed with the OCaml compiler" diff --git a/esy.lock/opam/biniou.1.2.1/opam b/esy.lock/opam/biniou.1.2.2/opam similarity index 79% rename from esy.lock/opam/biniou.1.2.1/opam rename to esy.lock/opam/biniou.1.2.2/opam index ec7028f2..26c4cf6c 100644 --- a/esy.lock/opam/biniou.1.2.1/opam +++ b/esy.lock/opam/biniou.1.2.2/opam @@ -32,14 +32,16 @@ from type definitions. Biniou format specification: mjambon.github.io/atdgen-doc/biniou-format.txt""" depends: [ "easy-format" + "camlp-streams" "dune" {>= "1.10"} "ocaml" {>= "4.02.3"} ] url { src: - "https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz" + "https://github.com/mjambon/biniou/releases/download/1.2.2/biniou-1.2.2.tbz" checksum: [ - "sha256=35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335" - "sha512=82670cc77bf3e869ee26e5fbe5a5affa45a22bc8b6c4bd7e85473912780e0111baca59b34a2c14feae3543ce6e239d7fddaeab24b686a65bfe642cdb91d27ebf" + "sha256=8bf3ff17cd0ecb2d6b6d1d94cb08ef089d44caef96e9bae6be6839d428fa318f" + "sha512=7d03b3759a3a2e1c77713aa1b8375a1f1917f49d14fe5e3cb01d5e53a12e6385b7a3b0f4827f3be71182c31c416d780e1f9ef011dc205cb8f9b0ab2d8fc23cfd" ] } +x-commit-hash: "b434dd9ad488e042cf71554af7296b7bd98c9a6a" diff --git a/esy.lock/opam/camlp-streams.5.0/opam b/esy.lock/opam/camlp-streams.5.0.1/opam similarity index 85% rename from esy.lock/opam/camlp-streams.5.0/opam rename to esy.lock/opam/camlp-streams.5.0.1/opam index 5a451996..60e51311 100644 --- a/esy.lock/opam/camlp-streams.5.0/opam +++ b/esy.lock/opam/camlp-streams.5.0.1/opam @@ -27,12 +27,13 @@ maintainer: [ "Xavier Leroy " ] authors: ["Daniel de Rauglaudre" "Xavier Leroy"] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" homepage: "https://github.com/ocaml/camlp-streams" bug-reports: "https://github.com/ocaml/camlp-streams/issues" -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" depends: [ - "dune" {>= "2.5"} + "dune" {>= "2.7"} "ocaml" {>= "4.02.3"} + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} @@ -50,9 +51,9 @@ build: [ ] dev-repo: "git+https://github.com/ocaml/camlp-streams.git" url { - src: "https://github.com/ocaml/camlp-streams/archive/refs/tags/v5.0.tar.gz" + src: "https://github.com/ocaml/camlp-streams/archive/v5.0.1.tar.gz" checksum: [ - "md5=305d8eaf9cebaf137a8a63770f0ea162" - "sha512=f42e2f5e5ca353b3d647cd7e97a278c167c2d1abd185a634f155965cec29e35d9be7ce940b4c205b0577d7e9b6f714580bfd2e2fd79f1b1b461bc3fb96d26d36" + "md5=afc874b25f7a1f13e8f5cfc1182b51a7" + "sha512=2efa8dd4a636217c8d49bac1e4e7e5558fc2f45cfea66514140a59fd99dd08d61fb9f1e17804997ff648b71b13820a5d4a1eb70fed9d848aa2abd6e41f853c86" ] } diff --git a/esy.lock/opam/cmdliner.1.1.1/opam b/esy.lock/opam/cmdliner.1.2.0/opam similarity index 90% rename from esy.lock/opam/cmdliner.1.1.1/opam rename to esy.lock/opam/cmdliner.1.2.0/opam index 702b586b..b29bd296 100644 --- a/esy.lock/opam/cmdliner.1.1.1/opam +++ b/esy.lock/opam/cmdliner.1.2.0/opam @@ -33,7 +33,7 @@ install: [ ] dev-repo: "git+https://erratique.ch/repos/cmdliner.git" url { - src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.1.1.tbz" + src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.2.0.tbz" checksum: - "sha512=5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e" + "sha512=6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b" } \ No newline at end of file diff --git a/esy.lock/opam/crunch.3.3.1/opam b/esy.lock/opam/crunch.3.3.1/opam new file mode 100644 index 00000000..8905e643 --- /dev/null +++ b/esy.lock/opam/crunch.3.3.1/opam @@ -0,0 +1,53 @@ +opam-version: "2.0" +maintainer: "MirageOS team" +authors: ["Anil Madhavapeddy" "Thomas Gazagnaire" "Stefanie Schirmer" "Hannes Mehnert"] +homepage: "https://github.com/mirage/ocaml-crunch" +bug-reports: "https://github.com/mirage/ocaml-crunch/issues" +doc: "https://mirage.github.io/ocaml-crunch/" +license: "ISC" +dev-repo: "git+https://github.com/mirage/ocaml-crunch.git" +tags: ["org:mirage" "org:xapi-project"] + +depends: [ + "ocaml" {>= "4.08.0"} + "cmdliner" {>= "1.1"} + "ptime" + "dune" {>= "2.5"} + "lwt" {with-test} + "mirage-kv" {with-test & >= "3.0.0"} + "mirage-kv-mem" {with-test & >= "3.0.0"} + "fmt" {with-test} +] +conflicts: [ + "mirage-kv" {< "3.0.0"} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +synopsis: "Convert a filesystem into a static OCaml module" +description: """ +`ocaml-crunch` takes a directory of files and compiles them into a standalone +OCaml module which serves the contents directly from memory. This can be +convenient for libraries that need a few embedded files (such as a web server) +and do not want to deal with all the trouble of file configuration. +""" +url { + src: + "https://github.com/mirage/ocaml-crunch/releases/download/v3.3.1/crunch-3.3.1.tbz" + checksum: [ + "sha256=2c5ba0d4110bcbb7731cba4eafb6c44a7487c3f88c1ad47401271b69ffa8ed6a" + "sha512=5aaa1b67456dd2f5e3ab450ea547e62fba2b0341a49f3b24669162dce91b6ea1158c1594d60c6df3e416e719484411c50ae61017c40b2f75ee90401aa543bd08" + ] +} +x-commit-hash: "bd4f0195b35c602b8b83886bc8731e649b1e3f9c" diff --git a/esy.lock/opam/csexp.1.5.1/opam b/esy.lock/opam/csexp.1.5.2/opam similarity index 70% rename from esy.lock/opam/csexp.1.5.1/opam rename to esy.lock/opam/csexp.1.5.2/opam index 59324f9e..7d511ab8 100644 --- a/esy.lock/opam/csexp.1.5.1/opam +++ b/esy.lock/opam/csexp.1.5.2/opam @@ -20,7 +20,7 @@ module of this library is parameterised by the type of S-expressions. maintainer: ["Jeremie Dimino "] authors: [ "Quentin Hocquet " - "Jane Street Group, LLC" + "Jane Street Group, LLC " "Jeremie Dimino " ] license: "MIT" @@ -28,9 +28,8 @@ homepage: "https://github.com/ocaml-dune/csexp" doc: "https://ocaml-dune.github.io/csexp/" bug-reports: "https://github.com/ocaml-dune/csexp/issues" depends: [ - "dune" {>= "1.11"} + "dune" {>= "3.4"} "ocaml" {>= "4.03.0"} -# "ppx_expect" {with-test & >= "v0.14"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml-dune/csexp.git" @@ -44,17 +43,16 @@ build: [ "-j" jobs "@install" -# Tests disabled because of a cyclic dependency with csexp, dune-configurator and ppx_expect -# "@runtest" {with-test} +# "@runtest" {with-test & ocaml:version >= "4.04"} "@doc" {with-doc} ] ] -x-commit-hash: "7eeb86206819d2b1782d6cde1be9d6cf8b5fc851" url { src: - "https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz" + "https://github.com/ocaml-dune/csexp/releases/download/1.5.2/csexp-1.5.2.tbz" checksum: [ - "sha256=d605e4065fa90a58800440ef2f33a2d931398bf2c22061a8acb7df845c0aac02" - "sha512=d785bbabaff9f6bf601399149ef0a42e5e99647b54e27f97ef1625907793dda22a45bf83e0e8a1eba2c63634c5484b54739ff0904ef556f5fc592efa38af7505" + "sha256=1a14dd04bb4379a41990248550628c77913a9c07f3c35c1370b6960e697787ff" + "sha512=be281018bcfc20d4db14894ef51c4b836d6338d2fdfe22e63d46f405f8dea7349e16f1c0ecd65f73d4c85a2a80e618cdbb8c9dafcbb9f229f04f1adca5b1973c" ] } +x-commit-hash: "e6c4768e10c61bcb04d09748744dad55602149c6" diff --git a/esy.lock/opam/dot-merlin-reader.4.1/opam b/esy.lock/opam/dot-merlin-reader.4.1/opam deleted file mode 100644 index f860cab4..00000000 --- a/esy.lock/opam/dot-merlin-reader.4.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "defree@gmail.com" -authors: "The Merlin team" -synopsis: "Reads config files for merlin" -homepage: "https://github.com/ocaml/merlin" -bug-reports: "https://github.com/ocaml/merlin/issues" -dev-repo: "git+https://github.com/ocaml/merlin.git" -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "ocaml" {>= "4.06.1" } - "dune" {>= "2.7.0"} - "yojson" {>= "1.6.0"} - "ocamlfind" {>= "1.6.0"} - "csexp" {>= "1.2.3"} - "result" {>= "1.5"} -] -description: - "Helper process: reads .merlin files and gives the normalized content to merlin" -x-commit-hash: "ab02f60994c81166820791b5f465f467d752b8dc" -url { - src: - "https://github.com/ocaml/merlin/releases/download/v4.1/dot-merlin-reader-v4.1.tbz" - checksum: [ - "sha256=14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd" - "sha512=65fd4ab08904c05651a7ef8971802ffaa428daa920765dbcf162e3c56e8047e4c9e4356daa45efccce7c73a586635c8f6cf8118fd3059789de9aff68579bd436" - ] -} diff --git a/esy.lock/opam/dot-merlin-reader.4.9/opam b/esy.lock/opam/dot-merlin-reader.4.9/opam new file mode 100644 index 00000000..e2d4bf7b --- /dev/null +++ b/esy.lock/opam/dot-merlin-reader.4.9/opam @@ -0,0 +1,30 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +synopsis: "Reads config files for merlin" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +license: "MIT" +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.08" & < "6.0"} + "dune" {>= "2.9.0"} + "merlin-lib" {>= "4.9" & < "4.14-502"} + "ocamlfind" {>= "1.6.0"} +] +description: + "Helper process: reads .merlin files and outputs the normalized content to + stdout." +url { + src: + "https://github.com/ocaml/merlin/releases/download/v4.9-414/merlin-4.9-414.tbz" + checksum: [ + "sha256=e23fc47813591269ff9d27c820988e520a662c89dd0af7ea652b21517499cbfd" + "sha512=2199f963368597d10cc197e41ebb883f6a166018c9da3fe259c354550df41b713781003598a2fe5956b0a4ae96f8c07ba33831d3cf6f9d494b731944f87e491e" + ] +} +x-commit-hash: "df75a4550704c113ac29505fd68ef9b7893d4bf5" diff --git a/esy.lock/opam/dune-build-info.3.15.2/opam b/esy.lock/opam/dune-build-info.3.15.2/opam new file mode 100644 index 00000000..f29d3c6e --- /dev/null +++ b/esy.lock/opam/dune-build-info.3.15.2/opam @@ -0,0 +1,46 @@ +opam-version: "2.0" +synopsis: "Embed build information inside executable" +description: """ +The build-info library allows to access information about how the +executable was built, such as the version of the project at which it +was built or the list of statically linked libraries with their +versions. It supports reporting the version from the version control +system during development to get an precise reference of when the +executable was built. +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +depends: [ + "dune" {>= "3.12"} + "ocaml" {>= "4.08"} + "odoc" {with-doc} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {dev} + ["rm" "-rf" "vendor/csexp"] + ["rm" "-rf" "vendor/pp"] + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: + "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz" + checksum: [ + "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933" + "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e" + ] +} +x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1" diff --git a/esy.lock/opam/dune.2.8.4/opam b/esy.lock/opam/dune.3.15.2/opam similarity index 51% rename from esy.lock/opam/dune.2.8.4/opam rename to esy.lock/opam/dune.3.15.2/opam index 4ca967f5..499dbf38 100644 --- a/esy.lock/opam/dune.2.8.4/opam +++ b/esy.lock/opam/dune.3.15.2/opam @@ -2,25 +2,25 @@ opam-version: "2.0" synopsis: "Fast, portable, and opinionated build system" description: """ -dune is a build system that was designed to simplify the release of +Dune is a build system that was designed to simplify the release of Jane Street packages. It reads metadata from "dune" files following a very simple s-expression syntax. -dune is fast, has very low-overhead, and supports parallel builds on +Dune is fast, has very low-overhead, and supports parallel builds on all platforms. It has no system dependencies; all you need to build dune or packages using dune is OCaml. You don't need make or bash as long as the packages themselves don't use bash explicitly. -dune supports multi-package development by simply dropping multiple -repositories into the same directory. +Dune is composable; supporting multi-package development by simply +dropping multiple repositories into the same directory. -It also supports multi-context builds, such as building against +Dune also supports multi-context builds, such as building against several opam roots/switches simultaneously. This helps maintaining packages across several versions of OCaml and gives cross-compilation for free. """ -maintainer: ["Jane Street Group, LLC"] -authors: ["Jane Street Group, LLC"] +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] license: "MIT" homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" @@ -29,30 +29,29 @@ conflicts: [ "merlin" {< "3.4.0"} "ocaml-lsp-server" {< "1.3.0"} "dune-configurator" {< "2.3.0"} - "odoc" {< "1.3.0"} + "odoc" {< "2.0.1"} "dune-release" {< "1.3.0"} "js_of_ocaml-compiler" {< "3.6.0"} "jbuilder" {= "transition"} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path - ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} - ["ocaml" "bootstrap.ml" "-j" jobs] - ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] + ["ocaml" "boot/bootstrap.ml" "-j" jobs] + ["./_boot/dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs] ] depends: [ # Please keep the lower bound in sync with .github/workflows/workflow.yml, # dune-project and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.08" & < "4.13"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) + ("ocaml" {>= "4.08"} | ("ocaml" {>= "4.02" & < "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] -x-commit-hash: "b6a3f66fb15378fc7170e94778f4d2c0b142ad92" url { - src: "https://github.com/ocaml/dune/releases/download/2.8.4/dune-2.8.4.tbz" + src: + "https://github.com/ocaml/dune/releases/download/3.15.2/dune-3.15.2.tbz" checksum: [ - "sha256=4e6420177584aabdc3b7b37aee3026b094b82bf5d7ed175344a68e321f72e8ac" - "sha512=efc1834c4add40138a101734665a1f462c19fe76d1cbb457b1fc20f95991118a50b24d485fb98d39046e41bec03885a8dc071bf8add51083ac9780bff9f6668a" + "sha256=f959980542ca85909b3f3f8e9be65c2b8a375f3a4e3bd83c7ad7a07f2e077933" + "sha512=d752b8c09130cf3d564b3a524e3148783b581daa3f9a61d0f52bf4d6995ef73258e71877dbfd8b7516f9a4bac5ad973e80f4fed596df9446e704acc724aac55e" ] } +x-commit-hash: "c28817c416ac0b381f6a6938236419ab5d86d6e1" diff --git a/esy.lock/opam/easy-format.1.3.2/opam b/esy.lock/opam/easy-format.1.3.4/opam similarity index 54% rename from esy.lock/opam/easy-format.1.3.2/opam rename to esy.lock/opam/easy-format.1.3.4/opam index f55c2c8d..5d5f62ee 100644 --- a/esy.lock/opam/easy-format.1.3.2/opam +++ b/esy.lock/opam/easy-format.1.3.4/opam @@ -1,17 +1,4 @@ opam-version: "2.0" -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} - ["dune" "build" "-p" name "@doc"] {with-doc} -] -maintainer: ["martin@mjambon.com" "rudi.grinberg@gmail.com"] -authors: ["Martin Jambon"] -bug-reports: "https://github.com/mjambon/easy-format/issues" -homepage: "https://github.com/mjambon/easy-format" -doc: "https://mjambon.github.io/easy-format/" -license: "BSD-3-Clause" -dev-repo: "git+https://github.com/mjambon/easy-format.git" synopsis: "High-level and functional interface to the Format module of the OCaml standard library" description: """ @@ -32,15 +19,38 @@ nodes: Atoms represent any text that is guaranteed to be printed as-is. Lists can model any sequence of items such as arrays of data or lists of definitions that are labelled with something like "int main", "let x =" or "x:".""" +maintainer: ["martin@mjambon.com" "rudi.grinberg@gmail.com"] +authors: ["Martin Jambon"] +license: "BSD-3-Clause" +homepage: "https://github.com/ocaml-community/easy-format" +doc: "https://mjambon.github.io/mjambon2016/easy-format.html" +bug-reports: "https://github.com/ocaml-community/easy-format/issues" depends: [ - "dune" {>= "1.10"} - "ocaml" {>= "4.02.3"} + "dune" {>= "3.2" & >= "1.10"} + "ocaml" {>= "4.08"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] ] +dev-repo: "git+https://github.com/ocaml-community/easy-format.git" url { src: - "https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz" + "https://github.com/ocaml-community/easy-format/releases/download/1.3.4/easy-format-1.3.4.tbz" checksum: [ - "sha256=3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926" - "sha512=e39377a2ff020ceb9ac29e8515a89d9bdbc91dfcfa871c4e3baafa56753fac2896768e5d9822a050dc1e2ade43c8967afb69391a386c0a8ecd4e1f774e236135" + "sha256=1dbf051e9f68574dde6e2e254a66b9c524ca425e80b36e99af96ed964ab610c3" + "sha512=90264864dde4cbf51f60fb5c21cf033e11bdeb662e76b62ce27b496c298ca9102174885ed7a6d29a6b8e43089e27d5bb5be247f88d9739c15cfd8470fec29d33" ] } +x-commit-hash: "ba4962884509ceec63905dd6e0ccb429be4f9f66" diff --git a/esy.lock/opam/fix.20220121/opam b/esy.lock/opam/fix.20230505/opam similarity index 67% rename from esy.lock/opam/fix.20220121/opam rename to esy.lock/opam/fix.20230505/opam index 877b44e6..6278f49e 100644 --- a/esy.lock/opam/fix.20220121/opam +++ b/esy.lock/opam/fix.20230505/opam @@ -18,9 +18,9 @@ depends: [ synopsis: "Algorithmic building blocks for memoization, recursion, and more" url { src: - "https://gitlab.inria.fr/fpottier/fix/-/archive/20220121/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/fix/-/archive/20230505/archive.tar.gz" checksum: [ - "md5=48d8a5bdff23cf7fbf9288877df2b6aa" - "sha512=a851d8783c0c519c6e55359a5c471af433058872409c29a1a7bdfd0076813341ad2c0ebd1ce9e28bff4d4c729dfbc808c41c084fe12a42b45a2b5e391e77ccd2" + "md5=2a4afa633128c5010677222f7b3c9451" + "sha512=30d446ba6c19aef78b52d9831eb26f8f6ac10e88bd1eff36d16fbbfb32278b2637e31e63a160aec4abbbfdb1e7612ed25d68c936f4cbf2073e51d713ff3a8adf" ] } diff --git a/esy.lock/opam/fmt.0.9.0/opam b/esy.lock/opam/fmt.0.9.0/opam new file mode 100644 index 00000000..6424cf8a --- /dev/null +++ b/esy.lock/opam/fmt.0.9.0/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +synopsis: """OCaml Format pretty-printer combinators""" +maintainer: ["Daniel Bünzli "] +authors: ["The fmt programmers"] +homepage: "https://erratique.ch/software/fmt" +doc: "https://erratique.ch/software/fmt/doc/" +dev-repo: "git+https://erratique.ch/repos/fmt.git" +bug-reports: "https://github.com/dbuenzli/fmt/issues" +license: ["ISC"] +tags: ["string" "format" "pretty-print" "org:erratique"] +depends: ["ocaml" {>= "4.08.0"} + "ocamlfind" {build} + "ocamlbuild" {build} + "topkg" {build & >= "1.0.3"}] +depopts: ["base-unix" + "cmdliner"] +conflicts: ["cmdliner" {< "0.9.8"}] +build: [["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%" + "--with-base-unix" "%{base-unix:installed}%" + "--with-cmdliner" "%{cmdliner:installed}%"]] +url { + src: "https://erratique.ch/software/fmt/releases/fmt-0.9.0.tbz" + checksum: "sha512=66cf4b8bb92232a091dfda5e94d1c178486a358cdc34b1eec516d48ea5acb6209c0dfcb416f0c516c50ddbddb3c94549a45e4a6d5c5fd1c81d3374dec823a83b"} +description: """ +Fmt exposes combinators to devise `Format` pretty-printing functions. + +Fmt depends only on the OCaml standard library. The optional `Fmt_tty` +library that allows to setup formatters for terminal color output +depends on the Unix library. The optional `Fmt_cli` library that +provides command line support for Fmt depends on [`Cmdliner`][cmdliner]. + +Fmt is distributed under the ISC license. + +[cmdliner]: http://erratique.ch/software/cmdliner + +Home page: http://erratique.ch/software/fmt""" \ No newline at end of file diff --git a/esy.lock/opam/menhir.20220210/opam b/esy.lock/opam/menhir.20231231/opam similarity index 66% rename from esy.lock/opam/menhir.20220210/opam rename to esy.lock/opam/menhir.20231231/opam index 3cd79886..adf52bf1 100644 --- a/esy.lock/opam/menhir.20220210/opam +++ b/esy.lock/opam/menhir.20231231/opam @@ -8,7 +8,7 @@ authors: [ homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues" -license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" +license: "GPL-2.0-only" build: [ ["dune" "build" "-p" name "-j" jobs] ] @@ -17,13 +17,14 @@ depends: [ "dune" {>= "2.8.0"} "menhirLib" {= version} "menhirSdk" {= version} + "menhirCST" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz" checksum: [ - "md5=e3cef220f676c4b1c16cbccb174cefe3" - "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" + "md5=799748bc3b7a542798a85956c7863865" + "sha512=620ff3443143535e03ac98c5e8ee2ddf9ba48f8cfe441302118def1da3e03ffac7f48d4d4cb129766b625ecad0fb341da1baa0169dee8b6d07a5b0bbb735cf2f" ] } diff --git a/esy.lock/opam/menhirCST.20231231/opam b/esy.lock/opam/menhirCST.20231231/opam new file mode 100644 index 00000000..9a49a859 --- /dev/null +++ b/esy.lock/opam/menhirCST.20231231/opam @@ -0,0 +1,29 @@ + +opam-version: "2.0" +maintainer: "francois.pottier@inria.fr" +authors: [ + "François Pottier " +] +homepage: "http://gitlab.inria.fr/fpottier/menhir" +dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" +bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues" +license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" { >= "4.08" } + "dune" { >= "2.8.0" } +] +conflicts: [ + "menhir" { != version } +] +synopsis: "Runtime support library for parsers generated by Menhir" +url { + src: + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz" + checksum: [ + "md5=799748bc3b7a542798a85956c7863865" + "sha512=620ff3443143535e03ac98c5e8ee2ddf9ba48f8cfe441302118def1da3e03ffac7f48d4d4cb129766b625ecad0fb341da1baa0169dee8b6d07a5b0bbb735cf2f" + ] +} diff --git a/esy.lock/opam/menhirLib.20220210/opam b/esy.lock/opam/menhirLib.20231231/opam similarity index 73% rename from esy.lock/opam/menhirLib.20220210/opam rename to esy.lock/opam/menhirLib.20231231/opam index 895b5427..1f321b18 100644 --- a/esy.lock/opam/menhirLib.20220210/opam +++ b/esy.lock/opam/menhirLib.20231231/opam @@ -22,9 +22,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz" checksum: [ - "md5=e3cef220f676c4b1c16cbccb174cefe3" - "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" + "md5=799748bc3b7a542798a85956c7863865" + "sha512=620ff3443143535e03ac98c5e8ee2ddf9ba48f8cfe441302118def1da3e03ffac7f48d4d4cb129766b625ecad0fb341da1baa0169dee8b6d07a5b0bbb735cf2f" ] } diff --git a/esy.lock/opam/menhirSdk.20220210/opam b/esy.lock/opam/menhirSdk.20231231/opam similarity index 73% rename from esy.lock/opam/menhirSdk.20220210/opam rename to esy.lock/opam/menhirSdk.20231231/opam index d95c170d..0e2649fc 100644 --- a/esy.lock/opam/menhirSdk.20220210/opam +++ b/esy.lock/opam/menhirSdk.20231231/opam @@ -22,9 +22,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20231231/archive.tar.gz" checksum: [ - "md5=e3cef220f676c4b1c16cbccb174cefe3" - "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" + "md5=799748bc3b7a542798a85956c7863865" + "sha512=620ff3443143535e03ac98c5e8ee2ddf9ba48f8cfe441302118def1da3e03ffac7f48d4d4cb129766b625ecad0fb341da1baa0169dee8b6d07a5b0bbb735cf2f" ] } diff --git a/esy.lock/opam/merlin-lib.4.14-501/opam b/esy.lock/opam/merlin-lib.4.14-501/opam new file mode 100644 index 00000000..a2721f02 --- /dev/null +++ b/esy.lock/opam/merlin-lib.4.14-501/opam @@ -0,0 +1,34 @@ +opam-version: "2.0" +maintainer: "defree@gmail.com" +authors: "The Merlin team" +homepage: "https://github.com/ocaml/merlin" +bug-reports: "https://github.com/ocaml/merlin/issues" +dev-repo: "git+https://github.com/ocaml/merlin.git" +license: "MIT" +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "5.1.1" & < "5.2"} + "dune" {>= "2.9.0"} + "csexp" {>= "1.5.1"} + "menhir" {dev & >= "20201216"} + "menhirLib" {dev & >= "20201216"} + "menhirSdk" {dev & >= "20201216"} +] +synopsis: + "Merlin's libraries" +description: + "These libraries provides access to low-level compiler interfaces and the + standard higher-level merlin protocol. The library is provided as-is, is not + thoroughly documented, and its public API might break with any new release." +url { + src: + "https://github.com/ocaml/merlin/releases/download/v4.14-501/merlin-4.14-501.tbz" + checksum: [ + "sha256=b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292" + "sha512=734d760b1f73652bbd1d25736d08336c2df15f4eaa1d4c7aed345e83d1375b54266cb78dbeb698870a668633fbd2c7fece4dd161a50fba92f245dfad4b69c4c9" + ] +} +x-commit-hash: "7d7f525180f5979516e10c05d0cd49823edb5ef1" diff --git a/esy.lock/opam/merlin.4.2-412/opam b/esy.lock/opam/merlin.4.14-501/opam similarity index 64% rename from esy.lock/opam/merlin.4.2-412/opam rename to esy.lock/opam/merlin.4.14-501/opam index f6661353..28c1cd83 100644 --- a/esy.lock/opam/merlin.4.2-412/opam +++ b/esy.lock/opam/merlin.4.14-501/opam @@ -3,24 +3,25 @@ maintainer: "defree@gmail.com" authors: "The Merlin team" homepage: "https://github.com/ocaml/merlin" bug-reports: "https://github.com/ocaml/merlin/issues" -dev-repo: "git+https://github.com/ocaml/merlin.git" -license: "MIT" +dev-repo: "git+https://github.com/ocaml/merlin.git" +license: "MIT" build: [ ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" "merlin,dot-merlin-reader" "-j" "1"] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] depends: [ - "ocaml" {>= "4.12" & < "4.13"} - "dune" {>= "2.7.0"} - "dot-merlin-reader" {>= "4.0"} - "yojson" {>= "1.6.0" & < "2.0.0"} + "ocaml" {>= "5.1" & < "5.2"} + "dune" {>= "2.9.0"} + "merlin-lib" {= version} + "dot-merlin-reader" {>= "4.9"} + "yojson" {>= "2.0.0"} "conf-jq" {with-test} - "csexp" {>= "1.2.3"} - "result" {>= "1.5"} - "menhir" {dev} - "menhirLib" {dev} - "menhirSdk" {dev} + "ppxlib" {with-test} +] +conflicts: [ + "seq" {!= "base"} + "base-effects" ] synopsis: "Editor helper, provides completion, typing and source browsing in Vim and Emacs" @@ -41,7 +42,7 @@ Also run the following line in vim to index the documentation: Quick setup for EMACS ------------------- Add opam emacs directory to your load-path by appending this to your .emacs: - (let ((opam-share (ignore-errors (car (process-lines \"opam\" \"config\" \"var\" \"share\"))))) + (let ((opam-share (ignore-errors (car (process-lines \"opam\" \"var\" \"share\"))))) (when (and opam-share (file-directory-p opam-share)) ;; Register Merlin (add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share)) @@ -50,8 +51,11 @@ Add opam emacs directory to your load-path by appending this to your .emacs: (add-hook 'tuareg-mode-hook 'merlin-mode t) (add-hook 'caml-mode-hook 'merlin-mode t) ;; Use opam switch to lookup ocamlmerlin binary - (setq merlin-command 'opam))) - + (setq merlin-command 'opam) + ;; To easily change opam switches within a given Emacs session, you can + ;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode + ;; and use one of its \"OPSW\" menus. + )) Take a look at https://github.com/ocaml/merlin for more information Quick setup with opam-user-setup @@ -65,18 +69,13 @@ should take care of basic setup. See https://github.com/OCamlPro/opam-user-setup " {success & !user-setup:installed} -"Since version 4.2, Merlin integration with completion packages company -and auto-complete has moved to separate modules. Make sure to add -`(require 'merlin-company)` or `(require 'merlin-ac)` to your emacs -configuration if you were using one of these." - {success} ] -x-commit-hash: "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c" url { src: - "https://github.com/ocaml/merlin/releases/download/v4.2-412/merlin-v4.2-412.tbz" + "https://github.com/ocaml/merlin/releases/download/v4.14-501/merlin-4.14-501.tbz" checksum: [ - "sha256=86c30769277d3e2c09a8be6c68a98cd342bc0bdbde07c7225bfe2e6d0da2d394" - "sha512=27fbfb2ac50d7cd86807bd8cb02ff1e4661ee46abf071b9bec505e1df6d41f366c9c287988e66096fb7a14b67fd806df39c56b9f70c53ec40612192ba2a0e530" + "sha256=b7e9e96e924058c2ce429642788aa2e390720d441e224538bcf494a65203a292" + "sha512=734d760b1f73652bbd1d25736d08336c2df15f4eaa1d4c7aed345e83d1375b54266cb78dbeb698870a668633fbd2c7fece4dd161a50fba92f245dfad4b69c4c9" ] } +x-commit-hash: "7d7f525180f5979516e10c05d0cd49823edb5ef1" diff --git a/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam b/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam new file mode 100644 index 00000000..a2df8c61 --- /dev/null +++ b/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam @@ -0,0 +1,39 @@ +opam-version: "2.0" +synopsis: "OCaml compiler libraries repackaged" +description: """ +This packages exposes the OCaml compiler libraries repackages under +the toplevel names Ocaml_common, Ocaml_bytecomp, Ocaml_optcomp, ...""" +maintainer: ["Jane Street developers"] +authors: ["Jane Street Group, LLC"] +license: "MIT" +homepage: "https://github.com/janestreet/ocaml-compiler-libs" +bug-reports: "https://github.com/janestreet/ocaml-compiler-libs/issues" +depends: [ + "dune" {>= "2.8"} + "ocaml" {>= "4.04.1" & < "5.2.0"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/janestreet/ocaml-compiler-libs.git" +url { + src: + "https://github.com/janestreet/ocaml-compiler-libs/releases/download/v0.12.4/ocaml-compiler-libs-v0.12.4.tbz" + checksum: [ + "sha256=4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760" + "sha512=978dba8dfa61f98fa24fda7a9c26c2e837081f37d1685fe636dc19cfc3278a940cf01a10293504b185c406706bc1008bc54313d50f023bcdea6d5ac6c0788b35" + ] +} +x-commit-hash: "8cd12f18bb7171c2b67d661868c4271fae528d93" diff --git a/esy.lock/opam/ocamlbuild.0.14.1/opam b/esy.lock/opam/ocamlbuild.0.14.3/opam similarity index 82% rename from esy.lock/opam/ocamlbuild.0.14.1/opam rename to esy.lock/opam/ocamlbuild.0.14.3/opam index d7413780..d1c725b3 100644 --- a/esy.lock/opam/ocamlbuild.0.14.1/opam +++ b/esy.lock/opam/ocamlbuild.0.14.3/opam @@ -30,10 +30,11 @@ build: [ [make "check-if-preinstalled" "all" "opam-install"] ] dev-repo: "git+https://github.com/ocaml/ocamlbuild.git" +available: os != "win32" url { - src: "https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.1.tar.gz" + src: "https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.3.tar.gz" checksum: [ - "md5=7027e507ed85f290923ad198f3d2cd1c" - "sha512=1f5b43215b1d3dc427b9c64e005add9d423ed4bca9686d52c55912df8955647cb2d7d86622d44b41b14c4f0d657b770c27967c541c868eeb7c78e3bd35b827ad" + "md5=220df59060c916e8aac2eb471c870485" + "sha512=def8fa1d5488905fda31f72b7f6f0ebdccefa55a8e984a6ea4a7c1e0856e8ea1f7814410202e0f7f7d5e72aca7e8ae0d6623f7f2bade78b0dd82155de76ec4e5" ] } \ No newline at end of file diff --git a/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch b/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch new file mode 100644 index 00000000..8011238c --- /dev/null +++ b/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch @@ -0,0 +1,12 @@ +diff a/configure b/configure +--- a/configure ++++ b/configure +@@ -294,7 +294,7 @@ + # If findlib has been configured -sitelib $(ocamlc -where) then there's + # nothing to do, but otherwise we need to put OCaml's Standard Library + # into the path setting. +- if [ ! -e "${ocaml_sitelib}/stdlib/META" ]; then ++ if [ ! -e "${ocaml_sitelib}/stdlib.cmi" ]; then + ocamlpath="${ocaml_core_stdlib}${path_sep}${ocamlpath}" + fi + fi diff --git a/esy.lock/opam/ocamlfind.1.9.5/opam b/esy.lock/opam/ocamlfind.1.9.6/opam similarity index 70% rename from esy.lock/opam/ocamlfind.1.9.5/opam rename to esy.lock/opam/ocamlfind.1.9.6/opam index 678b7a23..a81f0c50 100644 --- a/esy.lock/opam/ocamlfind.1.9.5/opam +++ b/esy.lock/opam/ocamlfind.1.9.6/opam @@ -13,7 +13,7 @@ authors: "Gerd Stolpmann " homepage: "http://projects.camlcity.org/projects/findlib.html" bug-reports: "https://github.com/ocaml/ocamlfind/issues" depends: [ - "ocaml" {>= "4.00.0"} + "ocaml" {>= "3.08.0"} ] depopts: ["graphics"] build: [ @@ -34,12 +34,15 @@ install: [ [make "install"] ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} ] +extra-files: ["0001-Harden-test-for-OCaml-5.patch" "md5=3cddbf72164c29d4e50e077a92a37c6c"] +# See https://github.com/ocaml/ocamlfind/pull/61 +patches: ["0001-Harden-test-for-OCaml-5.patch"] dev-repo: "git+https://github.com/ocaml/ocamlfind.git" url { - src: "http://download.camlcity.org/download/findlib-1.9.5.tar.gz" + src: "http://download.camlcity.org/download/findlib-1.9.6.tar.gz" checksum: [ - "md5=8b893525ce36cb3d4d4952483bcc7cf4" - "sha512=03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715" + "md5=96c6ee50a32cca9ca277321262dbec57" + "sha512=cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027" ] } - +available: os != "win32" diff --git a/esy.lock/opam/odoc-parser.2.4.2/opam b/esy.lock/opam/odoc-parser.2.4.2/opam new file mode 100644 index 00000000..2d4aa7b9 --- /dev/null +++ b/esy.lock/opam/odoc-parser.2.4.2/opam @@ -0,0 +1,45 @@ +opam-version: "2.0" +synopsis: "Parser for ocaml documentation comments" +description: """ +Odoc_parser is a library for parsing the contents of OCaml documentation +comments, formatted using 'odoc' syntax, an extension of the language +understood by ocamldoc.""" +maintainer: ["Jon Ludlam "] +authors: ["Anton Bachin "] +license: "ISC" +homepage: "https://github.com/ocaml/odoc" +bug-reports: "https://github.com/ocaml/odoc/issues" +dev-repo: "git+https://github.com/ocaml/odoc.git" +doc: "https://ocaml.github.io/odoc/odoc_parser" +depends: [ + "dune" {>= "3.7"} + "ocaml" {>= "4.02.0"} + "astring" + "result" + "camlp-streams" + "ppx_expect" {with-test} + ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test}) +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + # Tests are not all associated with a package and would be run if using the + # default '@runtest'. + "@src/parser/runtest" {with-test} + ] +] +url { + src: "https://github.com/ocaml/odoc/releases/download/2.4.2/odoc-2.4.2.tbz" + checksum: [ + "sha256=563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b" + "sha512=8d48c99e0c253791177dd65287ce5cee47e7c6805e33f3ae0cf6c8e7d349128f26eebbe36459c31429c11519ad5979dbe36fbcb9403a5fde199a69976a3fb3a6" + ] +} +x-commit-hash: "85644b01ca86d1061766908bba3653ced2c15ce4" diff --git a/esy.lock/opam/odoc.1.5.3/opam b/esy.lock/opam/odoc.1.5.3/opam deleted file mode 100644 index 0e4c3746..00000000 --- a/esy.lock/opam/odoc.1.5.3/opam +++ /dev/null @@ -1,53 +0,0 @@ -opam-version: "2.0" - -homepage: "http://github.com/ocaml/odoc" -doc: "https://ocaml.github.io/odoc/" -bug-reports: "https://github.com/ocaml/odoc/issues" -license: "ISC" - -authors: [ - "Thomas Refis " - "David Sheets " - "Leo White " - "Anton Bachin " - "Jon Ludlam " -] -maintainer: "Jon Ludlam " -dev-repo: "git+https://github.com/ocaml/odoc.git" - -synopsis: "OCaml documentation generator" -description: """ -Odoc is a documentation generator for OCaml. It reads doc comments, -delimited with `(** ... *)`, and outputs HTML. -""" - -depends: [ - "astring" - "cmdliner" {>= "1.0.0"} - "cppo" {build & >= "1.1.0"} - "dune" - "fpath" - "ocaml" {>= "4.02.0" & < "4.14"} - "result" - "tyxml" {>= "4.3.0"} - - "alcotest" {dev & >= "0.8.3" & with-test} - "markup" {dev & >= "1.0.0" & with-test} - "ocamlfind" {dev} - "sexplib" {dev & >= "113.33.00" & with-test} - - "bisect_ppx" {dev & >= "1.3.0"} -] - -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: "https://github.com/ocaml/odoc/releases/download/1.5.3/odoc-1.5.3.tbz" - checksum: [ - "sha256=f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45" - "sha512=9e069590e0737c94813d25235b5cfe27feb5a0298a17ff9b9ee446c69827c3a0ea3b7da5d05b278639cd1f0202e0d83356707979edfaa2af73876fc000c23c4d" - ] -} -x-commit-hash: "8de4a36814533b25b461373fe5c0f54db55e5e7c" diff --git a/esy.lock/opam/odoc.2.4.2/opam b/esy.lock/opam/odoc.2.4.2/opam new file mode 100644 index 00000000..0998056c --- /dev/null +++ b/esy.lock/opam/odoc.2.4.2/opam @@ -0,0 +1,84 @@ +opam-version: "2.0" +homepage: "https://github.com/ocaml/odoc" +doc: "https://ocaml.github.io/odoc/" +bug-reports: "https://github.com/ocaml/odoc/issues" +license: "ISC" + +maintainer: [ + "Daniel Bünzli " + "Jon Ludlam " + "Jules Aguillon " + "Paul-Elliot Anglès d'Auriac " +] +authors: [ + "Anton Bachin " + "Daniel Bünzli " + "David Sheets " + "Jon Ludlam " + "Jules Aguillon " + "Leo White " + "Lubega Simon " + "Paul-Elliot Anglès d'Auriac " + "Thomas Refis " +] +dev-repo: "git+https://github.com/ocaml/odoc.git" + +synopsis: "OCaml Documentation Generator" +description: """ +**odoc** is a powerful and flexible documentation generator for OCaml. It reads *doc comments*, demarcated by `(** ... *)`, and transforms them into a variety of output formats, including HTML, LaTeX, and man pages. + +- **Output Formats:** Odoc generates HTML for web browsing, LaTeX for PDF generation, and man pages for use on Unix-like systems. +- **Cross-References:** odoc uses the `ocamldoc` markup, which allows to create links for functions, types, modules, and documentation pages. +- **Link to Source Code:** Documentation generated includes links to the source code of functions, providing an easy way to navigate from the docs to the actual implementation. +- **Code Highlighting:** odoc automatically highlights syntax in code snippets for different languages. + +odoc is part of the [OCaml Platform](https://ocaml.org/docs/platform), the recommended set of tools for OCaml. +""" + + +depends: [ + "odoc-parser" {= version} + "astring" + "cmdliner" {>= "1.0.0"} + "cppo" {build & >= "1.1.0"} + "dune" {>= "3.7.0"} + "fpath" + "ocaml" {>= "4.02.0"} + "result" + "tyxml" {>= "4.4.0"} + "fmt" + + "ocamlfind" {with-test} + "yojson" {>= "1.6.0" & with-test} + ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test}) + "conf-jq" {with-test} + + "ppx_expect" {with-test} + "bos" {with-test} + "crunch" {> "2.0.0"} + + ("ocaml" {< "4.07.0" & with-test} | "bisect_ppx" {with-test & > "2.5.0"}) +] + +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/odoc/releases/download/2.4.2/odoc-2.4.2.tbz" + checksum: [ + "sha256=563cfdbb26ec8a30e737a9cf285a06e0bbae953f48e25bbb0f69f7a99c2ba40b" + "sha512=8d48c99e0c253791177dd65287ce5cee47e7c6805e33f3ae0cf6c8e7d349128f26eebbe36459c31429c11519ad5979dbe36fbcb9403a5fde199a69976a3fb3a6" + ] +} +x-commit-hash: "85644b01ca86d1061766908bba3653ced2c15ce4" diff --git a/esy.lock/opam/ppxlib.0.32.1/opam b/esy.lock/opam/ppxlib.0.32.1/opam new file mode 100644 index 00000000..0db44e20 --- /dev/null +++ b/esy.lock/opam/ppxlib.0.32.1/opam @@ -0,0 +1,63 @@ +opam-version: "2.0" +synopsis: "Standard infrastructure for ppx rewriters" +description: """ +Ppxlib is the standard infrastructure for ppx rewriters +and other programs that manipulate the in-memory representation of +OCaml programs, a.k.a the "Parsetree". + +It also comes bundled with two ppx rewriters that are commonly used to +write tools that manipulate and/or generate Parsetree values; +`ppxlib.metaquot` which allows to construct Parsetree values using the +OCaml syntax directly and `ppxlib.traverse` which provides various +ways of automatically traversing values of a given type, in particular +allowing to inject a complex structured value into generated code. +""" +maintainer: ["opensource@janestreet.com"] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml-ppx/ppxlib" +doc: "https://ocaml-ppx.github.io/ppxlib/" +bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues" +depends: [ + "dune" {>= "2.7"} + "ocaml" {>= "4.04.1" & < "5.3.0"} + "ocaml-compiler-libs" {>= "v0.11.0"} + "ppx_derivers" {>= "1.0"} + "sexplib0" {>= "v0.12"} + "sexplib0" {with-test & >= "v0.15"} + "stdlib-shims" + "ocamlfind" {with-test} + "re" {with-test & >= "1.9.0"} + "cinaps" {with-test & >= "v0.12.1"} + "odoc" {with-doc} +] +conflicts: [ + "ocaml-migrate-parsetree" {< "2.0.0"} + "ocaml-base-compiler" {= "5.1.0~alpha1"} + "ocaml-variants" {= "5.1.0~alpha1+options"} + "base-effects" +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git" +url { + src: + "https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.1/ppxlib-0.32.1.tbz" + checksum: [ + "sha256=9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f" + "sha512=7b93b622b119478dde03adcf4993e73ea937c91c280e453ccee631c682d8589ecb31841f11d6a14966239954e22e000da8afbe25a0f089532c7210b698c52553" + ] +} +x-commit-hash: "cd138a752ae6f21ad649c531b3b2276f332b3bb0" diff --git a/esy.lock/opam/ptime.1.0.0/opam b/esy.lock/opam/ptime.1.1.0/opam similarity index 83% rename from esy.lock/opam/ptime.1.0.0/opam rename to esy.lock/opam/ptime.1.1.0/opam index 742e0f87..39796c2a 100644 --- a/esy.lock/opam/ptime.1.0.0/opam +++ b/esy.lock/opam/ptime.1.1.0/opam @@ -18,7 +18,7 @@ under the ISC license. [rfc3339]: http://tools.ietf.org/html/rfc3339 -Home page: http://erratique.ch/software/ptime""" +Home page: """ maintainer: "Daniel Bünzli " authors: "The ptime programmers" license: "ISC" @@ -35,7 +35,7 @@ depends: [ build: ["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"] dev-repo: "git+https://erratique.ch/repos/ptime.git" url { - src: "https://erratique.ch/software/ptime/releases/ptime-1.0.0.tbz" + src: "https://erratique.ch/software/ptime/releases/ptime-1.1.0.tbz" checksum: - "sha512=df2410d9cc25a33083fe968a584b8fb4d68ad5c077f3356da0a20427e6cd8756a5b946b921e5cf8ed4097f2c506e93345d9dca63b113be644d5a7cc0753d1534" + "sha512=309b8383f61b58840e58a82802ec8fbc61b7cc95a4590d38ad427e484cbaaf66f03fa8e6484b5b6855468a87e745aed103bf6f1041ec05062230a9fa5fb86cc6" } \ No newline at end of file diff --git a/esy.lock/opam/qcheck-core.0.21.3/opam b/esy.lock/opam/qcheck-core.0.21.3/opam new file mode 100644 index 00000000..372a1b97 --- /dev/null +++ b/esy.lock/opam/qcheck-core.0.21.3/opam @@ -0,0 +1,36 @@ +opam-version: "2.0" +maintainer: "simon.cruanes.2007@m4x.org" +homepage: "https://github.com/c-cube/qcheck/" +license: "BSD-2-Clause" +synopsis: "Core qcheck library" +doc: ["http://c-cube.github.io/qcheck/"] +tags: [ + "test" + "property" + "quickcheck" +] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +depends: [ + "dune" { >= "2.8.0" } + "base-unix" + "alcotest" {with-test} + "odoc" {with-doc} + "ocaml" {>= "4.08.0"} +] +dev-repo: "git+https://github.com/c-cube/qcheck.git" +bug-reports: "https://github.com/c-cube/qcheck/issues" +conflicts: [ + "ounit" { < "2.0" } +] +authors: "the qcheck contributors" +url { + src: "https://github.com/c-cube/qcheck/archive/v0.21.3.tar.gz" + checksum: [ + "md5=8930042156873aa8dfa433d7c1bf8463" + "sha512=89d8a8a1990cfa8cd839e732f4cc89d68811ae0cc04732668e1e2691e1eb6e3c525f75936bdb261aebdaa3a8845eb717128b0bf21884bbda80d64ba957d2e6e1" + ] +} diff --git a/esy.lock/opam/qcheck-core.0.9/opam b/esy.lock/opam/qcheck-core.0.9/opam deleted file mode 100644 index f25507cc..00000000 --- a/esy.lock/opam/qcheck-core.0.9/opam +++ /dev/null @@ -1,35 +0,0 @@ -opam-version: "2.0" -maintainer: "simon.cruanes.2007@m4x.org" -authors: "Simon Cruanes " -tags: ["test" "property" "quickcheck"] -homepage: "https://github.com/c-cube/qcheck/" -doc: "http://c-cube.github.io/qcheck/" -bug-reports: "https://github.com/c-cube/qcheck/issues" -depends: [ - "dune" - "ocaml" {>= "4.03.0"} - "base-bytes" - "base-unix" - "odoc" {with-doc} -] -conflicts: [ - "ounit" {< "2.0"} -] -build: [ - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} - ["dune" "build" "@doc" "-p" name] {with-doc} -] -dev-repo: "git+https://github.com/c-cube/qcheck.git" -synopsis: "QuickCheck inspired property-based testing for OCaml." -description: """ -This module allows to check invariants (properties of some types) over -randomly generated instances of the type. It provides combinators for -generating instances and printing them.""" -url { - src: "https://github.com/c-cube/qcheck/archive/0.9.tar.gz" - checksum: [ - "md5=7782c8cfce30a5fb766d933e99129ee7" - "sha512=e1007b4a3be338406d855efcf8d13ac4961963a6c77b794ab83973950e21c777cb66ab6020a0a714f96866597bc8bf7a76a84243e5062dab5b41978e78422e0b" - ] -} diff --git a/esy.lock/opam/re.1.10.4/opam b/esy.lock/opam/re.1.11.0/opam similarity index 69% rename from esy.lock/opam/re.1.10.4/opam rename to esy.lock/opam/re.1.11.0/opam index 9dad6613..303af008 100644 --- a/esy.lock/opam/re.1.10.4/opam +++ b/esy.lock/opam/re.1.11.0/opam @@ -8,7 +8,7 @@ authors: [ "Rudi Grinberg" "Gabriel Radanne" ] -license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception" +license: "LGPL-2.1-or-later WITH OCaml-LGPL-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" @@ -37,10 +37,10 @@ Pure OCaml regular expressions with: """ url { src: - "https://github.com/ocaml/ocaml-re/releases/download/1.10.4/re-1.10.4.tbz" + "https://github.com/ocaml/ocaml-re/releases/download/1.11.0/re-1.11.0.tbz" checksum: [ - "sha256=83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c" - "sha512=92b05cf92c389fa8c753f2acca837b15dd05a4a2e8e2bec7a269d2e14c35b1a786d394258376648f80b4b99250ba1900cfe68230b8385aeac153149d9ce56099" + "sha256=01fc244780c0f6be72ae796b1fb750f367de18624fd75d07ee79782ed6df8d4f" + "sha512=3e3712cc1266ec1f27620f3508ea2ebba338f4083b07d8a69dccee1facfdc1971a6c39f9deea664d2a62fd7f2cfd2eae816ca4c274acfadaee992a3befc4b757" ] } -x-commit-hash: "e9a4cecb8294c1839db18b1d0c30e755ec85ed5e" +x-commit-hash: "2dd38515c76c40299596d39f18d9b9a20f00d788" diff --git a/esy.lock/opam/reason.3.11.0/opam b/esy.lock/opam/reason.3.11.0/opam new file mode 100644 index 00000000..8ef3a861 --- /dev/null +++ b/esy.lock/opam/reason.3.11.0/opam @@ -0,0 +1,51 @@ +opam-version: "2.0" +synopsis: "Reason: Syntax & Toolchain for OCaml" +description: """ +Reason gives OCaml a new syntax that is remniscient of languages like +JavaScript. It's also the umbrella project for a set of tools for the OCaml & +JavaScript ecosystem.""" +maintainer: [ + "Jordan Walke " + "Antonio Nuno Monteiro " +] +authors: ["Jordan Walke "] +license: "MIT" +homepage: "https://reasonml.github.io/" +bug-reports: "https://github.com/reasonml/reason/issues" +depends: [ + "dune" {>= "2.9"} + "ocaml" {>= "4.03" & < "5.3"} + "ocamlfind" {build} + "dune-build-info" {>= "2.9.3"} + "menhir" {>= "20180523"} + "merlin-extend" {>= "0.6"} + "fix" + "ppx_derivers" + "ppxlib" {>= "0.28.0"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "--promote-install-files=false" + "@install" + "@doc" {with-doc} + ] + ["dune" "install" "-p" name "--create-install-files" name] +] +dev-repo: "git+https://github.com/reasonml/reason.git" +url { + src: + "https://github.com/reasonml/reason/releases/download/3.11.0/reason-3.11.0.tbz" + checksum: [ + "sha256=a58837f14a79f047c8eb99d5518aeb16ee64353574286cfd5b284c98a1a27250" + "sha512=28d6d1c3636e400614b1a7d8c78b0bbb5de143e259edf683139b75d2fd2013da8e1a6c58d11047e6853f1e559c387d233570665de0de646005197b5f4d6f4879" + ] +} +x-commit-hash: "3930092ac1cc04b7f3c62c71956592cf158ef8bb" diff --git a/esy.lock/opam/reason.3.8.0/opam b/esy.lock/opam/reason.3.8.0/opam deleted file mode 100644 index 8baba1f4..00000000 --- a/esy.lock/opam/reason.3.8.0/opam +++ /dev/null @@ -1,37 +0,0 @@ -opam-version: "2.0" -maintainer: "Jordan Walke " -authors: [ "Jordan Walke " ] -license: "MIT" -homepage: "https://github.com/reasonml/reason" -doc: "https://reasonml.github.io/" -bug-reports: "https://github.com/reasonml/reason/issues" -dev-repo: "git://github.com/reasonml/reason.git" -tags: [ "syntax" ] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "ocaml" {>= "4.03" & < "4.15"} - "dune" {>= "1.4"} - "ocamlfind" {build} - "menhir" {>= "20180523"} - "merlin-extend" {>= "0.6"} - "fix" - "result" - "ppx_derivers" -] -conflicts: [ "base-effects" ] -synopsis: "Reason: Syntax & Toolchain for OCaml" -description: """ -Reason gives OCaml a new syntax that is remniscient of languages like -JavaScript. It's also the umbrella project for a set of tools for the OCaml & -JavaScript ecosystem.""" -url { - src: - "https://github.com/reasonml/reason/releases/download/3.8.0/reason-3.8.0.tbz" - checksum: [ - "sha256=9478724b01767320064ba950ddea24c5df0eefdcdd8ff1324ba9ccd646258979" - "sha512=c5dcec810a1981b78b19271a8a255f4087628514725d6818419b141be6346a62b28fe8d0f10855efe420ede2839bfe562aa5abf21f29d66250e5c0d02323d6d8" - ] -} -x-commit-hash: "52fcae90ef3b304f55dce0a57125a2483e792a03" diff --git a/esy.lock/opam/sexplib0.v0.15.1/opam b/esy.lock/opam/sexplib0.v0.17.0/opam similarity index 65% rename from esy.lock/opam/sexplib0.v0.15.1/opam rename to esy.lock/opam/sexplib0.v0.17.0/opam index 123ccd03..4a8cdc5d 100644 --- a/esy.lock/opam/sexplib0.v0.15.1/opam +++ b/esy.lock/opam/sexplib0.v0.17.0/opam @@ -10,9 +10,10 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.08"} - "dune" {>= "2.0.0"} + "ocaml" {>= "4.14.0"} + "dune" {>= "3.11.0"} ] +available: arch != "arm32" & arch != "x86_32" synopsis: "Library containing the definition of S-expressions and some base converters" description: " Part of Jane Street's Core library @@ -21,6 +22,10 @@ OCaml's standard library that was developed by Jane Street, the largest industrial user of OCaml. " url { -src: "https://github.com/janestreet/sexplib0/archive/refs/tags/v0.15.1.tar.gz" -checksum: "md5=ab8fd6273f35a792cad48cbb3024a7f9" + src: + "https://github.com/janestreet/sexplib0/archive/refs/tags/v0.17.0.tar.gz" + checksum: [ + "md5=abafe8fd1d6302e55a315f4d78960d2a" + "sha512=ad387e40789fe70a11473db7e85fe017b801592624414e9030730b2e92ea08f98095fb6e9236430f33c801605ebee0a2a6284e0f618a26a7da4599d4fd9d395d" + ] } diff --git a/esy.lock/opam/stdlib-shims.0.3.0/opam b/esy.lock/opam/stdlib-shims.0.3.0/opam new file mode 100644 index 00000000..8c969571 --- /dev/null +++ b/esy.lock/opam/stdlib-shims.0.3.0/opam @@ -0,0 +1,31 @@ +opam-version: "2.0" +maintainer: "The stdlib-shims programmers" +authors: "The stdlib-shims programmers" +homepage: "https://github.com/ocaml/stdlib-shims" +doc: "https://ocaml.github.io/stdlib-shims/" +dev-repo: "git+https://github.com/ocaml/stdlib-shims.git" +bug-reports: "https://github.com/ocaml/stdlib-shims/issues" +tags: ["stdlib" "compatibility" "org:ocaml"] +license: ["LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] +depends: [ + "dune" + "ocaml" {>= "4.02.3"} +] +build: [ "dune" "build" "-p" name "-j" jobs ] +synopsis: "Backport some of the new stdlib features to older compiler" +description: """ +Backport some of the new stdlib features to older compiler, +such as the Stdlib module. + +This allows projects that require compatibility with older compiler to +use these new features in their code. +""" +x-commit-hash: "fb6815e5d745f07fd567c11671149de6ef2e74c8" +url { + src: + "https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz" + checksum: [ + "sha256=babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a" + "sha512=1151d7edc8923516e9a36995a3f8938d323aaade759ad349ed15d6d8501db61ffbe63277e97c4d86149cf371306ac23df0f581ec7e02611f58335126e1870980" + ] +} diff --git a/esy.lock/opam/topkg.1.0.5/opam b/esy.lock/opam/topkg.1.0.7/opam similarity index 66% rename from esy.lock/opam/topkg.1.0.5/opam rename to esy.lock/opam/topkg.1.0.7/opam index 3b2f63a0..83fc06f4 100644 --- a/esy.lock/opam/topkg.1.0.5/opam +++ b/esy.lock/opam/topkg.1.0.7/opam @@ -1,22 +1,6 @@ opam-version: "2.0" -synopsis: """The transitory OCaml software packager""" -maintainer: ["Daniel Bünzli "] -authors: ["The topkg programmers"] -homepage: "https://erratique.ch/software/topkg" -doc: "https://erratique.ch/software/topkg/doc" -dev-repo: "git+https://erratique.ch/repos/topkg.git" -bug-reports: "https://github.com/dbuenzli/topkg/issues" -license: ["ISC"] -tags: ["packaging" "ocamlbuild" "org:erratique"] -depends: ["ocaml" {>= "4.05.0"} - "ocamlfind" {build & >= "1.6.1"} - "ocamlbuild"] -build: [["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name - "--dev-pkg" "%{dev}%"]] -url { - src: "https://erratique.ch/software/topkg/releases/topkg-1.0.5.tbz" - checksum: "sha512=9450e9139209aacd8ddb4ba18e4225770837e526a52a56d94fd5c9c4c9941e83e0e7102e2292b440104f4c338fabab47cdd6bb51d69b41cc92cc7a551e6fefab"} -description: """ +synopsis: "The transitory OCaml software packager" +description: """\ Topkg is a packager for distributing OCaml software. It provides an API to describe the files a package installs in a given build configuration and to specify information about the package's @@ -41,4 +25,23 @@ Topkg-care is distributed under the ISC license it depends on [cmdliner]: http://erratique.ch/software/cmdliner [webbrowser]: http://erratique.ch/software/webbrowser -Home page: http://erratique.ch/software/topkg""" \ No newline at end of file +Home page: http://erratique.ch/software/topkg""" +maintainer: "Daniel Bünzli " +authors: "The topkg programmers" +license: "ISC" +tags: ["packaging" "ocamlbuild" "org:erratique"] +homepage: "https://erratique.ch/software/topkg" +doc: "https://erratique.ch/software/topkg/doc" +bug-reports: "https://github.com/dbuenzli/topkg/issues" +depends: [ + "ocaml" {>= "4.05.0"} + "ocamlfind" {build & >= "1.6.1"} + "ocamlbuild" +] +build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--dev-pkg" "%{dev}%"] +dev-repo: "git+https://erratique.ch/repos/topkg.git" +url { + src: "https://erratique.ch/software/topkg/releases/topkg-1.0.7.tbz" + checksum: + "sha512=09e59f1759bf4db8471f02d0aefd8db602b44932a291c05c312b1423796e7a15d1598d3c62a0cec7f083eff8e410fac09363533dc4bd2120914bb9664efea535" +} \ No newline at end of file diff --git a/esy.lock/opam/tyxml.4.5.0/opam b/esy.lock/opam/tyxml.4.6.0/opam similarity index 72% rename from esy.lock/opam/tyxml.4.5.0/opam rename to esy.lock/opam/tyxml.4.6.0/opam index 22c77607..a0e62e11 100644 --- a/esy.lock/opam/tyxml.4.5.0/opam +++ b/esy.lock/opam/tyxml.4.6.0/opam @@ -9,12 +9,13 @@ homepage: "https://github.com/ocsigen/tyxml" doc: "https://ocsigen.org/tyxml/latest/manual/intro" bug-reports: "https://github.com/ocsigen/tyxml/issues" depends: [ - "dune" {>= "2.0"} - "ocaml" {>= "4.02"} + "dune" {>= "2.7"} + "ocaml" {>= "4.04"} "alcotest" {with-test} - "re" {>= "1.5.0"} + "re" {>= "1.7.2"} "seq" "uutf" {>= "1.0.0"} + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} @@ -31,12 +32,12 @@ build: [ ] ] dev-repo: "git+https://github.com/ocsigen/tyxml.git" -x-commit-hash: "ef431a4bceaefb2d9248e79092e6c1a1a9420095" url { src: - "https://github.com/ocsigen/tyxml/releases/download/4.5.0/tyxml-4.5.0.tbz" + "https://github.com/ocsigen/tyxml/releases/download/4.6.0/tyxml-4.6.0.tbz" checksum: [ - "sha256=c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068" - "sha512=772535441b09c393d53c27152e65f404a0a541aa0cea1bda899a8d751ab64d1729237e583618c3ff33d75e3865d53503d1ea413c6bbc8c68c413347efd1709b3" + "sha256=bfeb673c6b4e120a4eca4c48448add47dc3f8d02c2b40f63ffdccc4e91c902dd" + "sha512=69750eeaf467014282087bf9628f3278f3e5f00f4c7400358750d208664cfc3f79a5cba16767d2935e53477d1a6862fe08c5b801b69052ec12e09d1a93a5e9b4" ] } +x-commit-hash: "d2916535536f2134bad7793a598ba5b7327cae41" diff --git a/esy.lock/opam/yojson.1.7.0/opam b/esy.lock/opam/yojson.1.7.0/opam deleted file mode 100644 index f5438059..00000000 --- a/esy.lock/opam/yojson.1.7.0/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "martin@mjambon.com" -authors: ["Martin Jambon"] -homepage: "https://github.com/ocaml-community/yojson" -bug-reports: "https://github.com/ocaml-community/yojson/issues" -dev-repo: "git+https://github.com/ocaml-community/yojson.git" -doc: "https://ocaml-community.github.io/yojson/" -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] -] -run-test: [["dune" "runtest" "-p" name "-j" jobs]] -depends: [ - "ocaml" {>= "4.02.3"} - "dune" - "cppo" {build} - "easy-format" - "biniou" {>= "1.2.0"} - "alcotest" {with-test & >= "0.8.5"} -] -synopsis: - "Yojson is an optimized parsing and printing library for the JSON format" -description: """ -Yojson is an optimized parsing and printing library for the JSON format. - -It addresses a few shortcomings of json-wheel including 2x speedup, -polymorphic variants and optional syntax for tuples and variants. - -ydump is a pretty-printing command-line program provided with the -yojson package. - -The program atdgen can be used to derive OCaml-JSON serializers and -deserializers from type definitions.""" -url { - src: - "https://github.com/ocaml-community/yojson/releases/download/1.7.0/yojson-1.7.0.tbz" - checksum: "md5=b89d39ca3f8c532abe5f547ad3b8f84d" -} diff --git a/esy.lock/opam/yojson.2.1.2/opam b/esy.lock/opam/yojson.2.1.2/opam new file mode 100644 index 00000000..df37a739 --- /dev/null +++ b/esy.lock/opam/yojson.2.1.2/opam @@ -0,0 +1,48 @@ +opam-version: "2.0" +synopsis: + "Yojson is an optimized parsing and printing library for the JSON format" +description: """ +Yojson is an optimized parsing and printing library for the JSON format. + +ydump is a pretty-printing command-line program provided with the +yojson package.""" +maintainer: [ + "paul-elliot@tarides.com" "nathan@tarides.com" "marek@tarides.com" +] +authors: ["Martin Jambon"] +license: "BSD-3-Clause" +homepage: "https://github.com/ocaml-community/yojson" +doc: "https://ocaml-community.github.io/yojson" +bug-reports: "https://github.com/ocaml-community/yojson/issues" +depends: [ + "dune" {>= "2.7"} + "ocaml" {>= "4.02.3"} + "cppo" {build} + "alcotest" {with-test & >= "0.8.5"} + "seq" {>= "0.2.2"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/ocaml-community/yojson.git" +url { + src: + "https://github.com/ocaml-community/yojson/releases/download/2.1.2/yojson-2.1.2.tbz" + checksum: [ + "sha256=59f2f1abbfc8a7ccbdbf608894e5c75e8a76006e34899254446f83e200dfb4f9" + "sha512=309cba7568dec51de20c7ab8df033258c275b8d58b0a36a66b26e673a3bc050cbd7e39ff8fe4796e89263e125bcc21e04dc36a394f3cc201956887eee1fb281a" + ] +} +x-commit-hash: "e51163ee04ad79408975545ec5fc3b7dc41f68eb" diff --git a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.3_opam_override/files/ocamlbuild-0.14.2.patch b/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.3_opam_override/files/ocamlbuild-0.14.2.patch new file mode 100644 index 00000000..e69de29b diff --git a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.1_opam_override/files/winpatch.patch b/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.3_opam_override/files/winpatch.patch similarity index 100% rename from esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.1_opam_override/files/winpatch.patch rename to esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.3_opam_override/files/winpatch.patch diff --git a/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.1_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.3_opam_override/package.json similarity index 100% rename from esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.1_opam_override/package.json rename to esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.3_opam_override/package.json diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/files/findlib.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/files/findlib.patch deleted file mode 100644 index 3aa5aa69..00000000 --- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/files/findlib.patch +++ /dev/null @@ -1,485 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -281,10 +281,8 @@ - - - let identify_dir d = -- if is_win then -- failwith "identify_dir"; (* not available *) - let s = Unix.stat d in -- (s.Unix.st_dev, s.Unix.st_ino) -+ (s.Unix.st_dev, s.Unix.st_ino) - ;; - - diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch new file mode 100644 index 00000000..d545632a --- /dev/null +++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch @@ -0,0 +1,11 @@ +--- ./Makefile ++++ ./Makefile +@@ -55,7 +55,7 @@ + export USE_CYGPATH; \ + cat findlib.conf.in | \ + $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' | \ +- $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' -p >findlib.conf ++ $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ + echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ + fi diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json similarity index 100% rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.5_opam_override/package.json rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json diff --git a/esy.lock/overrides/opam__s__ptime_opam__c__1.1.0_opam_override/package.json b/esy.lock/overrides/opam__s__ptime_opam__c__1.1.0_opam_override/package.json new file mode 100644 index 00000000..59515d3d --- /dev/null +++ b/esy.lock/overrides/opam__s__ptime_opam__c__1.1.0_opam_override/package.json @@ -0,0 +1,3 @@ +{ + "build": "bash -c 'ocaml pkg/pkg.ml build --dev-pkg false || (./_build/sanitize.sh; ocaml pkg/pkg.ml build --dev-pkg false)'" +} diff --git a/file-context-printer.json b/file-context-printer.json index 98b93a3b..030cc612 100644 --- a/file-context-printer.json +++ b/file-context-printer.json @@ -20,7 +20,7 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0", + "ocaml": "^4.2.0 || ^5.0.0", "@opam/re": "*", "@reason-native/pastel": "*" }, diff --git a/file-context-printer.opam b/file-context-printer.opam index d942a599..e40076f7 100644 --- a/file-context-printer.opam +++ b/file-context-printer.opam @@ -11,7 +11,7 @@ build: [ ["dune" "build" "-p" "file-context-printer" ] ] depends: [ "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} "re" "pastel" ] diff --git a/fp.json b/fp.json index 867e495e..9e22181b 100644 --- a/fp.json +++ b/fp.json @@ -29,11 +29,10 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { "@opam/merlin": "*", - "ocaml": "~4.12.0", "@reason-native/rely": "*" }, "resolutions": { diff --git a/fp.opam b/fp.opam index ab256c31..b34447f2 100644 --- a/fp.opam +++ b/fp.opam @@ -11,7 +11,7 @@ build: [ ["dune" "build" "-p" "fp" ] ] depends: [ "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} ] synopsis: "Reason Native file paths library." description: "Reason Native file paths library." diff --git a/frame.json b/frame.json index 5f7abe95..730c42b7 100644 --- a/frame.json +++ b/frame.json @@ -26,11 +26,10 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { "@opam/merlin": "*", - "ocaml": "~4.6.0", "@reason-native/rely": "./rely.json" }, "resolutions": { diff --git a/fs.json b/fs.json index e90716c5..4f922c78 100644 --- a/fs.json +++ b/fs.json @@ -30,11 +30,10 @@ "@reason-native/fp": "*", "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { "@opam/merlin": "*", - "ocaml": "~4.12.0", "@reason-native/rely": "*" }, "resolutions": { diff --git a/fs.opam b/fs.opam index fbae8368..0d68ea38 100644 --- a/fs.opam +++ b/fs.opam @@ -12,7 +12,7 @@ depends: [ "fp" {>= "0.0.0" & < "1.0.0"} "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} ] synopsis: "Reason Native file system API" description: "Reason Native file system API" diff --git a/pastel-console.json b/pastel-console.json index ce347c8e..bb5b6a05 100644 --- a/pastel-console.json +++ b/pastel-console.json @@ -18,11 +18,10 @@ "@reason-native/pastel": "*", "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { - "@opam/merlin": "*", - "ocaml": "~4.12.0" + "@opam/merlin": "*" }, "resolutions": { "@reason-native/console": "./console.json", diff --git a/pastel-console.opam b/pastel-console.opam index 4cd015c1..ce2c1429 100644 --- a/pastel-console.opam +++ b/pastel-console.opam @@ -13,7 +13,7 @@ depends: [ "pastel" "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} ] synopsis: "My Project" description: "My Project" diff --git a/pastel.json b/pastel.json index 6b9a443b..26e5699d 100644 --- a/pastel.json +++ b/pastel.json @@ -50,7 +50,7 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0", + "ocaml": "^4.2.0 || ^5.0.0", "@opam/re": "*" } } diff --git a/pastel.opam b/pastel.opam index 10e7ac3e..e1ef4db6 100644 --- a/pastel.opam +++ b/pastel.opam @@ -11,7 +11,7 @@ build: [ ["dune" "build" "-p" "pastel" ] ] depends: [ "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} "re" ] synopsis: "Native Reason ANSI terminal styling with an awesome API" diff --git a/qcheck-rely.json b/qcheck-rely.json index c03b2593..6e350c13 100644 --- a/qcheck-rely.json +++ b/qcheck-rely.json @@ -22,7 +22,7 @@ "@opam/dune": "*", "@opam/qcheck-core": ">= 0.9 < 0.10", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0", + "ocaml": "^4.2.0 || ^5.0.0", "@reason-native/rely": "*", "@reason-native/console": "*" }, diff --git a/qcheck-rely.opam b/qcheck-rely.opam index cf006b7f..4dcd3198 100644 --- a/qcheck-rely.opam +++ b/qcheck-rely.opam @@ -12,7 +12,7 @@ depends: [ "dune" "qcheck-core" {>= "0.9" & < "0.10"} "reason" - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} "rely" "console" ] diff --git a/refmterr.json b/refmterr.json index 7bebc56a..89b2ab37 100644 --- a/refmterr.json +++ b/refmterr.json @@ -9,14 +9,13 @@ "@opam/dune": "*", "@opam/re": "*", "@opam/reason": ">= 3.6.0", - "ocaml": " >= 4.2.0", + "ocaml": "^4.2.0 || ^5.0.0", "@reason-native/pastel": "*", "@opam/atdgen": "*", "@reason-native/console": "*" }, "devDependencies": { "@opam/merlin": "*", - "ocaml": ">= 4.2.0", "@opam/reason": "3.7.0" }, "resolutions": { diff --git a/refmterr.opam b/refmterr.opam index 311e058e..e82a6f09 100644 --- a/refmterr.opam +++ b/refmterr.opam @@ -12,7 +12,7 @@ depends: [ "dune" "re" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "4.10.0"} + "ocaml" {>= "4.2.0"} "pastel" "atdgen" "console" diff --git a/rely-junit-reporter.json b/rely-junit-reporter.json index 704010f2..14d6e945 100644 --- a/rely-junit-reporter.json +++ b/rely-junit-reporter.json @@ -35,7 +35,7 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.4.0", + "ocaml": "^4.4.0 || ^5.0.0", "@reason-native/rely": "*", "@opam/junit": "*" }, diff --git a/rely.json b/rely.json index 4142e479..8b12b747 100644 --- a/rely.json +++ b/rely.json @@ -33,7 +33,7 @@ "@opam/dune": "*", "@opam/reason": ">= 3.6.0", "@opam/re": "*", - "ocaml": "^4.4.0", + "ocaml": "^4.4.0 || ^5.0.0", "@reason-native/cli": "*", "@reason-native/pastel": "*", "@reason-native/file-context-printer": "*", diff --git a/rely.opam b/rely.opam index e89f57c8..952eea0d 100644 --- a/rely.opam +++ b/rely.opam @@ -12,7 +12,7 @@ depends: [ "dune" "reason" {< "4.0.0"} "re" - "ocaml" {>= "4.4.0" & < "5.0.0"} + "ocaml" {>= "4.4.0"} "cli" {"0.0.1-alpha"} "pastel" "file-context-printer" diff --git a/src/qcheck-rely/QCheckRely.re b/src/qcheck-rely/QCheckRely.re index 3757d30d..35e63f4c 100644 --- a/src/qcheck-rely/QCheckRely.re +++ b/src/qcheck-rely/QCheckRely.re @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */; -module T = QCheck.Test; +module T = QCheck2.Test; module Rely = Rely; open Rely.MatcherUtils; open Rely.MatcherTypes; @@ -40,10 +40,10 @@ let long_ = module Matchers = { type extension = { qCheckTest: - (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.t) => unit, + (~long: bool=?, ~rand: Random.State.t=?, QCheck2.Test.t) => unit, qCheckCell: 'a. - (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.cell('a)) => unit, + (~long: bool=?, ~rand: Random.State.t=?, QCheck2.Test.cell('a)) => unit, }; @@ -58,12 +58,12 @@ module Matchers = { let makeTestMatcher = (createMatcher, accessorPath) => createMatcher(({formatReceived, indent, _}, actualThunk, _) => { - let (QCheck.Test.Test(cell), rand: Random.State.t, long: bool) = + let (QCheck2.Test.Test(cell), rand: Random.State.t, long: bool) = actualThunk(); - switch (QCheck.Test.check_cell_exn(~long, ~rand, cell)) { + switch (QCheck2.Test.check_cell_exn(~long, ~rand, cell)) { | () => pass - | exception (QCheck.Test.Test_fail(name, input)) => + | exception (QCheck2.Test.Test_fail(name, input)) => let testNameFailureMessage = "QCheck test \"" ++ name ++ "\" failed"; let inputMessage = "generated input: \n" @@ -76,7 +76,7 @@ module Matchers = { let message = String.concat("\n", messageParts); ((() => message), false); - | exception (QCheck.Test.Test_error(name, input, e, _)) => + | exception (QCheck2.Test.Test_error(name, input, e, _)) => let testNameFailureMessage = "QCheck test \"" ++ name @@ -99,9 +99,9 @@ module Matchers = { createMatcher(({formatReceived, indent, _}, actualThunk, _) => { let (cell, rand: Random.State.t, long: bool) = actualThunk(); - switch (QCheck.Test.check_cell_exn(~long, ~rand, cell)) { + switch (QCheck2.Test.check_cell_exn(~long, ~rand, cell)) { | () => pass - | exception (QCheck.Test.Test_fail(name, input)) => + | exception (QCheck2.Test.Test_fail(name, input)) => let testNameFailureMessage = "QCheck test \"" ++ name ++ "\" failed"; let inputMessage = "generated input: \n" @@ -114,7 +114,7 @@ module Matchers = { let message = String.concat("\n", messageParts); ((() => message), false); - | exception (QCheck.Test.Test_error(name, input, e, _)) => + | exception (QCheck2.Test.Test_error(name, input, e, _)) => let testNameFailureMessage = "QCheck test \"" ++ name diff --git a/src/qcheck-rely/QCheckRely.rei b/src/qcheck-rely/QCheckRely.rei index 696a650a..6cc2392d 100644 --- a/src/qcheck-rely/QCheckRely.rei +++ b/src/qcheck-rely/QCheckRely.rei @@ -30,10 +30,10 @@ module Matchers: { type extension = { qCheckTest: - (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.t) => unit, + (~long: bool=?, ~rand: Random.State.t=?, QCheck2.Test.t) => unit, qCheckCell: 'a. - (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.cell('a)) => unit, + (~long: bool=?, ~rand: Random.State.t=?, QCheck2.Test.cell('a)) => unit, }; diff --git a/unicode-config.json b/unicode-config.json index 56223509..659cae02 100644 --- a/unicode-config.json +++ b/unicode-config.json @@ -17,10 +17,9 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { - "@opam/merlin": "*", - "ocaml": "~4.12.0" + "@opam/merlin": "*" } } diff --git a/unicode.json b/unicode.json index 88f69c2f..733e3ffb 100644 --- a/unicode.json +++ b/unicode.json @@ -20,10 +20,9 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { - "@opam/merlin": "*", - "ocaml": "~4.12.0" + "@opam/merlin": "*" } } diff --git a/unicode.opam b/unicode.opam index 85a3357d..8bf97cc1 100644 --- a/unicode.opam +++ b/unicode.opam @@ -11,7 +11,7 @@ build: [ ["dune" "build" "-p" "unicode" ] ] depends: [ "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} ] synopsis: "Easy to use and well documented Unicode symbols" description: "Easy to use and well documented Unicode symbols" diff --git a/utf8.json b/utf8.json index ffb80a09..c73216bb 100644 --- a/utf8.json +++ b/utf8.json @@ -16,10 +16,9 @@ "dependencies": { "@opam/dune": "*", "@opam/reason": ">= 3.6.0", - "ocaml": "^4.2.0" + "ocaml": "^4.2.0 || ^5.0.0" }, "devDependencies": { - "@opam/merlin": "*", - "ocaml": "~4.6.0" + "@opam/merlin": "*" } } diff --git a/utf8.opam b/utf8.opam index 867fec7e..7b206e8a 100644 --- a/utf8.opam +++ b/utf8.opam @@ -11,7 +11,7 @@ build: [ ["dune" "build" "-p" "utf8" ] ] depends: [ "dune" "reason" {< "4.0.0"} - "ocaml" {>= "4.2.0" & < "5.0.0"} + "ocaml" {>= "4.2.0"} ] synopsis: "Utf8 logic with minimal dependencies." description: "Utf8 logic with minimal dependencies."