From b42d66f5929a11739c13f849939007bf8610888b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20BRAMI?= Date: Wed, 29 Mar 2023 21:56:18 +0200 Subject: [PATCH 1/2] chore(deps): Bump to latest qcheck-core --- esy.json | 2 +- qcheck-rely.json | 2 +- qcheck-rely.opam | 2 +- src/qcheck-rely/QCheckRely.re | 5 +++-- src/qcheck-rely/QCheckRely.rei | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/esy.json b/esy.json index 6f60cf9e..72bc97e9 100644 --- a/esy.json +++ b/esy.json @@ -49,7 +49,7 @@ "@opam/re": "*", "@opam/atdgen": "*", "@opam/junit": "*", - "@opam/qcheck-core": "0.9", + "@opam/qcheck-core": "0.20", "@opam/merlin": "*", "ocaml": "~4.6.4", "@opam/dune": "2.8.4", diff --git a/qcheck-rely.json b/qcheck-rely.json index c03b2593..0df845b8 100644 --- a/qcheck-rely.json +++ b/qcheck-rely.json @@ -20,7 +20,7 @@ }, "dependencies": { "@opam/dune": "*", - "@opam/qcheck-core": ">= 0.9 < 0.10", + "@opam/qcheck-core": ">= 0.20 < 0.21", "@opam/reason": ">= 3.6.0", "ocaml": "^4.2.0", "@reason-native/rely": "*", diff --git a/qcheck-rely.opam b/qcheck-rely.opam index cf006b7f..55a58ce1 100644 --- a/qcheck-rely.opam +++ b/qcheck-rely.opam @@ -10,7 +10,7 @@ tags: ["qcheck" "rely" "unittest" "test" "property test"] build: [ ["dune" "build" "-p" "qcheck-rely" ] ] depends: [ "dune" - "qcheck-core" {>= "0.9" & < "0.10"} + "qcheck-core" {>= "0.20" & < "0.21"} "reason" "ocaml" {>= "4.2.0" & < "5.0.0"} "rely" diff --git a/src/qcheck-rely/QCheckRely.re b/src/qcheck-rely/QCheckRely.re index 3757d30d..73cb5063 100644 --- a/src/qcheck-rely/QCheckRely.re +++ b/src/qcheck-rely/QCheckRely.re @@ -40,7 +40,8 @@ let long_ = module Matchers = { type extension = { qCheckTest: - (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.t) => unit, + 'a. + (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.cell('a)) => unit, qCheckCell: 'a. (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.cell('a)) => unit, @@ -58,7 +59,7 @@ module Matchers = { let makeTestMatcher = (createMatcher, accessorPath) => createMatcher(({formatReceived, indent, _}, actualThunk, _) => { - let (QCheck.Test.Test(cell), rand: Random.State.t, long: bool) = + let (cell, rand: Random.State.t, long: bool) = actualThunk(); switch (QCheck.Test.check_cell_exn(~long, ~rand, cell)) { diff --git a/src/qcheck-rely/QCheckRely.rei b/src/qcheck-rely/QCheckRely.rei index 696a650a..abe2b860 100644 --- a/src/qcheck-rely/QCheckRely.rei +++ b/src/qcheck-rely/QCheckRely.rei @@ -30,7 +30,8 @@ module Matchers: { type extension = { qCheckTest: - (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.t) => unit, + 'a. + (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.cell('a)) => unit, qCheckCell: 'a. (~long: bool=?, ~rand: Random.State.t=?, QCheck.Test.cell('a)) => unit, From 8a942edf4cd79b7c68ee5313ca50e71020e32a34 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Wed, 29 Mar 2023 21:56:18 +0200 Subject: [PATCH 2/2] cmd: esy @qcheck-rely install; esy install --- esy.lock/index.json | 353 ++++++------- .../opam/{atdgen.2.9.1 => atdgen.2.8.0}/opam | 14 +- .../opam/{biniou.1.2.1 => biniou.1.2.2}/opam | 8 +- .../opam | 11 +- esy.lock/opam/dot-merlin-reader.4.1/opam | 2 +- esy.lock/opam/dune.2.8.4/opam | 2 - esy.lock/opam/easy-format.1.3.2/opam | 2 +- esy.lock/opam/menhir.20220210/opam | 2 +- esy.lock/opam/menhirLib.20220210/opam | 2 +- esy.lock/opam/menhirSdk.20220210/opam | 2 +- esy.lock/opam/merlin.4.2-412/opam | 3 + .../opam | 6 +- .../files/0001-Harden-test-for-OCaml-5.patch | 12 + .../{ocamlfind.1.9.5 => ocamlfind.1.9.6}/opam | 13 +- .../opam/{ptime.1.0.0 => ptime.1.1.0}/opam | 6 +- esy.lock/opam/qcheck-core.0.20/opam | 33 ++ esy.lock/opam/qcheck-core.0.9/opam | 35 -- .../opam/{topkg.1.0.5 => topkg.1.0.7}/opam | 41 +- .../files/winpatch.patch | 0 .../package.json | 0 .../files/findlib.patch | 485 ------------------ .../files/findlib.patch | 11 + .../package.json | 0 qcheck-rely.esy.lock/index.json | 339 ++++++------ .../opam/{cppo.1.6.7 => cppo.1.6.9}/opam | 44 +- .../opam/{dune.2.8.4 => dune.3.7.0}/opam | 16 +- .../opam/{fix.20201120 => fix.20220121}/opam | 12 +- .../{menhir.20210310 => menhir.20220210}/opam | 14 +- .../opam | 14 +- .../opam | 14 +- .../opam | 12 +- .../files/0001-Harden-test-for-OCaml-5.patch | 12 + .../{ocamlfind.1.9.1 => ocamlfind.1.9.6}/opam | 12 +- .../opam/ppx_derivers.1.2.1/opam | 2 +- .../opam/qcheck-core.0.20/opam | 33 ++ .../opam/qcheck-core.0.9/opam | 35 -- .../opam/{re.1.9.0 => re.1.10.4}/opam | 16 +- qcheck-rely.esy.lock/opam/reason.3.7.0/opam | 31 -- qcheck-rely.esy.lock/opam/reason.3.8.2/opam | 36 ++ qcheck-rely.esy.lock/opam/result.1.5/opam | 4 +- .../opam/stdlib-shims.0.3.0/opam | 31 ++ .../files/findlib-1.9.1.patch | 471 ----------------- .../files/findlib.patch | 11 + .../package.json | 2 +- 44 files changed, 685 insertions(+), 1519 deletions(-) rename esy.lock/opam/{atdgen.2.9.1 => atdgen.2.8.0}/opam (87%) 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/{ocamlbuild.0.14.1 => ocamlbuild.0.14.2}/opam (83%) 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%) rename esy.lock/opam/{ptime.1.0.0 => ptime.1.1.0}/opam (83%) create mode 100644 esy.lock/opam/qcheck-core.0.20/opam delete mode 100644 esy.lock/opam/qcheck-core.0.9/opam rename esy.lock/opam/{topkg.1.0.5 => topkg.1.0.7}/opam (66%) rename esy.lock/overrides/{opam__s__ocamlbuild_opam__c__0.14.1_opam_override => opam__s__ocamlbuild_opam__c__0.14.2_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.2_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%) rename qcheck-rely.esy.lock/opam/{cppo.1.6.7 => cppo.1.6.9}/opam (55%) rename qcheck-rely.esy.lock/opam/{dune.2.8.4 => dune.3.7.0}/opam (72%) rename qcheck-rely.esy.lock/opam/{fix.20201120 => fix.20220121}/opam (50%) rename qcheck-rely.esy.lock/opam/{menhir.20210310 => menhir.20220210}/opam (52%) rename qcheck-rely.esy.lock/opam/{menhirLib.20210310 => menhirLib.20220210}/opam (52%) rename qcheck-rely.esy.lock/opam/{menhirSdk.20210310 => menhirSdk.20220210}/opam (52%) rename qcheck-rely.esy.lock/opam/{merlin-extend.0.6 => merlin-extend.0.6.1}/opam (68%) create mode 100644 qcheck-rely.esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch rename qcheck-rely.esy.lock/opam/{ocamlfind.1.9.1 => ocamlfind.1.9.6}/opam (70%) create mode 100644 qcheck-rely.esy.lock/opam/qcheck-core.0.20/opam delete mode 100644 qcheck-rely.esy.lock/opam/qcheck-core.0.9/opam rename qcheck-rely.esy.lock/opam/{re.1.9.0 => re.1.10.4}/opam (63%) delete mode 100644 qcheck-rely.esy.lock/opam/reason.3.7.0/opam create mode 100644 qcheck-rely.esy.lock/opam/reason.3.8.2/opam create mode 100644 qcheck-rely.esy.lock/opam/stdlib-shims.0.3.0/opam delete mode 100644 qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/files/findlib-1.9.1.patch create mode 100644 qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch rename qcheck-rely.esy.lock/overrides/{opam__s__ocamlfind_opam__c__1.9.1_opam_override => opam__s__ocamlfind_opam__c__1.9.6_opam_override}/package.json (92%) diff --git a/esy.lock/index.json b/esy.lock/index.json index abee918f..955e713b 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "762e0be23544db04b8859eb42961fdff", + "checksum": "99321cd3c9d6b019bf0deb5b9d959876", "root": "reason-native-dev@link-dev:./esy.json", "node": { "refmterr@path:./refmterr.json@d41d8cd9": { @@ -13,7 +13,7 @@ "@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/dune@opam:2.8.4@264e4c78", "@opam/atdgen@opam:2.8.0@b9193ca1" ], "devDependencies": [ "ocaml@4.12.1001@d41d8cd9", "@opam/reason@opam:3.8.0@0af856e0" @@ -29,11 +29,11 @@ "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/qcheck-core@opam:0.20@a5d66dbf", "@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" + "@opam/merlin@opam:4.2-412@b9032922", + "@opam/junit@opam:2.0.2@500cf494", "@opam/dune@opam:2.8.4@264e4c78", + "@opam/atdgen@opam:2.8.0@b9193ca1" ], "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] }, @@ -59,7 +59,7 @@ "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" + "@opam/re@opam:1.10.4@c4910ba6", "@opam/dune@opam:2.8.4@264e4c78" ], "devDependencies": [] }, @@ -71,7 +71,7 @@ "overrides": [], "dependencies": [ "ocaml@4.12.1001@d41d8cd9", "@opam/reason@opam:3.8.0@0af856e0", - "@opam/dune@opam:2.8.4@4ac03159" + "@opam/dune@opam:2.8.4@264e4c78" ], "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] }, @@ -93,14 +93,14 @@ }, "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@4.12.1001@d41d8cd9", "@opam/easy-format@opam:1.3.2@dd953d8f", + "@opam/dune@opam:2.8.4@264e4c78", "@opam/cppo@opam:1.6.9@db929a12", + "@opam/biniou@opam:1.2.2@c7862a8d", "@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@4.12.1001@d41d8cd9", "@opam/easy-format@opam:1.3.2@dd953d8f", + "@opam/dune@opam:2.8.4@264e4c78", "@opam/biniou@opam:1.2.2@c7862a8d" ] }, "@opam/uutf@opam:1.0.3@47c95a18": { @@ -121,9 +121,9 @@ }, "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@4.12.1001@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@opam/cmdliner@opam:1.1.1@03763729", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -149,38 +149,38 @@ "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" + "@opam/dune@opam:2.8.4@264e4c78", "@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" + "@opam/dune@opam:2.8.4@264e4c78" ] }, - "@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@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c4562efc", - "@opam/ocamlbuild@opam:0.14.1@ead10f40", + "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlbuild@opam:0.14.1@ead10f40" + "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlbuild@opam:0.14.2@c6163b28" ] }, "@opam/sexplib0@opam:v0.15.1@51111c0c": { @@ -201,11 +201,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -245,11 +245,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, "@opam/reason@opam:3.8.0@0af856e0": { @@ -272,18 +272,18 @@ "dependencies": [ "ocaml@4.12.1001@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", "@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", + "@opam/menhir@opam:20220210@ff5ea9a7", + "@opam/fix@opam:20220121@17b9a1a4", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.12.1001@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", "@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:20220210@ff5ea9a7", + "@opam/fix@opam:20220121@17b9a1a4", "@opam/dune@opam:2.8.4@264e4c78" ] }, "@opam/re@opam:1.10.4@c4910ba6": { @@ -305,63 +305,63 @@ "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" + "@opam/dune@opam:2.8.4@264e4c78", "@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" + "@opam/dune@opam:2.8.4@264e4c78" ] }, - "@opam/qcheck-core@opam:0.9@3f95f89d": { - "id": "@opam/qcheck-core@opam:0.9@3f95f89d", + "@opam/qcheck-core@opam:0.20@a5d66dbf": { + "id": "@opam/qcheck-core@opam:0.20@a5d66dbf", "name": "@opam/qcheck-core", - "version": "opam:0.9", + "version": "opam:0.20", "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/41/413d7ca480a6aa6fb9061159d6f07103#md5:413d7ca480a6aa6fb9061159d6f07103", + "archive:https://github.com/c-cube/qcheck/archive/refs/tags/v0.20.tar.gz#md5:413d7ca480a6aa6fb9061159d6f07103" ], "opam": { "name": "qcheck-core", - "version": "0.9", - "path": "esy.lock/opam/qcheck-core.0.9" + "version": "0.20", + "path": "esy.lock/opam/qcheck-core.0.20" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@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", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-bytes@opam:base@19d0c2ff" ] }, - "@opam/ptime@opam:1.0.0@e04fef10": { - "id": "@opam/ptime@opam:1.0.0@e04fef10", + "@opam/ptime@opam:1.1.0@e83a4860": { + "id": "@opam/ptime@opam:1.1.0@e83a4860", "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": [], "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@4.12.1001@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] @@ -384,11 +384,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, "@opam/odoc@opam:1.5.3@122d8c31": { @@ -411,7 +411,7 @@ "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/dune@opam:2.8.4@264e4c78", "@opam/cppo@opam:1.6.9@db929a12", "@opam/cmdliner@opam:1.1.1@03763729", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -419,31 +419,31 @@ "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/dune@opam:2.8.4@264e4c78", "@opam/cmdliner@opam:1.1.1@03763729", "@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" + "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override" } ], "dependencies": [ @@ -451,26 +451,26 @@ ], "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] }, - "@opam/ocamlbuild@opam:0.14.1@ead10f40": { - "id": "@opam/ocamlbuild@opam:0.14.1@ead10f40", + "@opam/ocamlbuild@opam:0.14.2@c6163b28": { + "id": "@opam/ocamlbuild@opam:0.14.2@c6163b28", "name": "@opam/ocamlbuild", - "version": "opam:0.14.1", + "version": "opam:0.14.2", "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/2f/2f407fadd57b073155a6aead887d9676#md5:2f407fadd57b073155a6aead887d9676", + "archive:https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.2.tar.gz#md5:2f407fadd57b073155a6aead887d9676" ], "opam": { "name": "ocamlbuild", - "version": "0.14.1", - "path": "esy.lock/opam/ocamlbuild.0.14.1" + "version": "0.14.2", + "path": "esy.lock/opam/ocamlbuild.0.14.2" } }, "overrides": [ { "opamoverride": - "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.1_opam_override" + "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2_opam_override" } ], "dependencies": [ @@ -496,15 +496,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@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@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, - "@opam/merlin@opam:4.2-412@a614d045": { - "id": "@opam/merlin@opam:4.2-412@a614d045", + "@opam/merlin@opam:4.2-412@b9032922": { + "id": "@opam/merlin@opam:4.2-412@b9032922", "name": "@opam/merlin", "version": "opam:4.2-412", "source": { @@ -522,19 +522,19 @@ "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/result@opam:1.5@1c6a6533", "@opam/dune@opam:2.8.4@264e4c78", + "@opam/dot-merlin-reader@opam:4.1@506bdd9d", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@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/result@opam:1.5@1c6a6533", "@opam/dune@opam:2.8.4@264e4c78", + "@opam/dot-merlin-reader@opam:4.1@506bdd9d", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, - "@opam/menhirSdk@opam:20220210@b8921e41": { - "id": "@opam/menhirSdk@opam:20220210@b8921e41", + "@opam/menhirSdk@opam:20220210@fe146ed3": { + "id": "@opam/menhirSdk@opam:20220210@fe146ed3", "name": "@opam/menhirSdk", "version": "opam:20220210", "source": { @@ -551,15 +551,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, - "@opam/menhirLib@opam:20220210@e6562f4f": { - "id": "@opam/menhirLib@opam:20220210@e6562f4f", + "@opam/menhirLib@opam:20220210@9afeb270": { + "id": "@opam/menhirLib@opam:20220210@9afeb270", "name": "@opam/menhirLib", "version": "opam:20220210", "source": { @@ -576,15 +576,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, - "@opam/menhir@opam:20220210@ff87a93b": { - "id": "@opam/menhir@opam:20220210@ff87a93b", + "@opam/menhir@opam:20220210@ff5ea9a7": { + "id": "@opam/menhir@opam:20220210@ff5ea9a7", "name": "@opam/menhir", "version": "opam:20220210", "source": { @@ -601,14 +601,14 @@ }, "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@4.12.1001@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", + "@opam/menhirLib@opam:20220210@9afeb270", + "@opam/dune@opam:2.8.4@264e4c78", "@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@4.12.1001@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", + "@opam/menhirLib@opam:20220210@9afeb270", + "@opam/dune@opam:2.8.4@264e4c78" ] }, "@opam/junit@opam:2.0.2@500cf494": { @@ -629,12 +629,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.5.0@0a609297", "@opam/ptime@opam:1.1.0@e83a4860", + "@opam/dune@opam:2.8.4@264e4c78", "@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.5.0@0a609297", "@opam/ptime@opam:1.1.0@e83a4860", + "@opam/dune@opam:2.8.4@264e4c78" ] }, "@opam/fpath@opam:0.7.3@674d8125": { @@ -655,9 +655,9 @@ }, "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@4.12.1001@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -683,15 +683,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, - "@opam/easy-format@opam:1.3.2@1ea9f987": { - "id": "@opam/easy-format@opam:1.3.2@1ea9f987", + "@opam/easy-format@opam:1.3.2@dd953d8f": { + "id": "@opam/easy-format@opam:1.3.2@dd953d8f", "name": "@opam/easy-format", "version": "opam:1.3.2", "source": { @@ -708,15 +708,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, - "@opam/dune@opam:2.8.4@4ac03159": { - "id": "@opam/dune@opam:2.8.4@4ac03159", + "@opam/dune@opam:2.8.4@264e4c78": { + "id": "@opam/dune@opam:2.8.4@264e4c78", "name": "@opam/dune", "version": "opam:2.8.4", "source": { @@ -742,8 +742,8 @@ "@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.1@506bdd9d": { + "id": "@opam/dot-merlin-reader@opam:4.1@506bdd9d", "name": "@opam/dot-merlin-reader", "version": "opam:4.1", "source": { @@ -762,15 +762,15 @@ "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", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/dune@opam:2.8.4@264e4c78", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@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" + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/dune@opam:2.8.4@264e4c78", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, "@opam/csexp@opam:1.5.1@8a8fb3a7": { @@ -791,11 +791,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, "@opam/cppo@opam:1.6.9@db929a12": { @@ -816,12 +816,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159", + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@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@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -847,55 +847,58 @@ ], "devDependencies": [ "ocaml@4.12.1001@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@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@4ac03159" + "ocaml@4.12.1001@d41d8cd9", "@opam/dune@opam:2.8.4@264e4c78" ] }, - "@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@4.12.1001@d41d8cd9", "@opam/easy-format@opam:1.3.2@dd953d8f", + "@opam/dune@opam:2.8.4@264e4c78", + "@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@4.12.1001@d41d8cd9", "@opam/easy-format@opam:1.3.2@dd953d8f", + "@opam/dune@opam:2.8.4@264e4c78", + "@opam/camlp-streams@opam:5.0.1@daaa0f94" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -947,11 +950,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c4562efc", + "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.5@c4562efc" + "ocaml@4.12.1001@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7" ] }, "@opam/atdgen-runtime@opam:2.9.1@21440789": { @@ -973,46 +976,46 @@ "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", + "@opam/dune@opam:2.8.4@264e4c78", + "@opam/camlp-streams@opam:5.0.1@daaa0f94", + "@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" + "@opam/dune@opam:2.8.4@264e4c78", + "@opam/camlp-streams@opam:5.0.1@daaa0f94", + "@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.8.0@b9193ca1": { + "id": "@opam/atdgen@opam:2.8.0@b9193ca1", "name": "@opam/atdgen", - "version": "opam:2.9.1", + "version": "opam:2.8.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/d5/d5740e52a6e57f7720640cb8c26e018e59311e1de78a20feb7168a808660aaaa#sha256:d5740e52a6e57f7720640cb8c26e018e59311e1de78a20feb7168a808660aaaa", + "archive:https://github.com/ahrefs/atd/releases/download/2.8.0/atdts-2.8.0.tbz#sha256:d5740e52a6e57f7720640cb8c26e018e59311e1de78a20feb7168a808660aaaa" ], "opam": { "name": "atdgen", - "version": "2.9.1", - "path": "esy.lock/opam/atdgen.2.9.1" + "version": "2.8.0", + "path": "esy.lock/opam/atdgen.2.8.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/re@opam:1.10.4@c4910ba6", "@opam/dune@opam:2.8.4@264e4c78", + "@opam/biniou@opam:1.2.2@c7862a8d", "@opam/atdgen-runtime@opam:2.9.1@21440789", "@opam/atd@opam:2.9.1@1121672a", "@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/re@opam:1.10.4@c4910ba6", "@opam/dune@opam:2.8.4@264e4c78", + "@opam/biniou@opam:1.2.2@c7862a8d", "@opam/atdgen-runtime@opam:2.9.1@21440789", "@opam/atd@opam:2.9.1@1121672a" ] @@ -1037,16 +1040,16 @@ "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" + "@opam/menhir@opam:20220210@ff5ea9a7", + "@opam/easy-format@opam:1.3.2@dd953d8f", + "@opam/dune@opam:2.8.4@264e4c78", "@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" + "@opam/menhir@opam:20220210@ff5ea9a7", + "@opam/easy-format@opam:1.3.2@dd953d8f", + "@opam/dune@opam:2.8.4@264e4c78" ] }, "@opam/astring@opam:0.8.5@1300cee8": { @@ -1067,9 +1070,9 @@ }, "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@4.12.1001@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlbuild@opam:0.14.2@c6163b28", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.12.1001@d41d8cd9" ] diff --git a/esy.lock/opam/atdgen.2.9.1/opam b/esy.lock/opam/atdgen.2.8.0/opam similarity index 87% rename from esy.lock/opam/atdgen.2.9.1/opam rename to esy.lock/opam/atdgen.2.8.0/opam index 126b25c8..26eb9cc7 100644 --- a/esy.lock/opam/atdgen.2.9.1/opam +++ b/esy.lock/opam/atdgen.2.8.0/opam @@ -72,9 +72,9 @@ bug-reports: "https://github.com/ahrefs/atd/issues" depends: [ "dune" {>= "2.8"} "ocaml" {>= "4.08"} - "atd" {>= "2.7.0"} - "atdgen-runtime" {>= "2.1.0"} - "atdgen-codec-runtime" {with-test} + "atd" {>= "2.7.0" & < "2.10.0"} + "atdgen-runtime" {>= "2.1.0" & < "2.10.0"} + "atdgen-codec-runtime" {with-test & < "2.10.0"} "biniou" {>= "1.0.6"} "yojson" {>= "1.7.0" & < "2.0.0"} "odoc" {with-doc} @@ -96,10 +96,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.8.0/atdts-2.8.0.tbz" checksum: [ - "sha256=39dc1a511d08c743b3f0d0e6dfa9c8caf211cc5fabfe92a089e8f57e170e9ae4" - "sha512=2149ddc53703a8c4c01c5571125ba66cce7305fac332357acfda36a44a67a7c9df2a0322cb05682fed3656067c26cdbe2e50071db5b2e5233abc1cfcf103e34e" + "sha256=d5740e52a6e57f7720640cb8c26e018e59311e1de78a20feb7168a808660aaaa" + "sha512=db50c74f3a92078b96c6affbb6fd3a7568741ef2fca6694272c45de84eaf682cd3c22902b1f085db9327a8e77d6765e7d77bc2bb8030422c6c897ff553e69ed7" ] } -x-commit-hash: "31799bf3955b11d8d9c12334cb65e7609927e09c" +x-commit-hash: "07722f973664c27a043e8d9aec66deb960756a6c" 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/dot-merlin-reader.4.1/opam b/esy.lock/opam/dot-merlin-reader.4.1/opam index f860cab4..0de091eb 100644 --- a/esy.lock/opam/dot-merlin-reader.4.1/opam +++ b/esy.lock/opam/dot-merlin-reader.4.1/opam @@ -10,7 +10,7 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.06.1" } + "ocaml" {>= "4.06.1" & < "5.0.0"} "dune" {>= "2.7.0"} "yojson" {>= "1.6.0"} "ocamlfind" {>= "1.6.0"} diff --git a/esy.lock/opam/dune.2.8.4/opam b/esy.lock/opam/dune.2.8.4/opam index 4ca967f5..5ecd59f8 100644 --- a/esy.lock/opam/dune.2.8.4/opam +++ b/esy.lock/opam/dune.2.8.4/opam @@ -36,8 +36,6 @@ conflicts: [ ] 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] ] diff --git a/esy.lock/opam/easy-format.1.3.2/opam b/esy.lock/opam/easy-format.1.3.2/opam index f55c2c8d..7282c30a 100644 --- a/esy.lock/opam/easy-format.1.3.2/opam +++ b/esy.lock/opam/easy-format.1.3.2/opam @@ -34,7 +34,7 @@ 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:".""" depends: [ "dune" {>= "1.10"} - "ocaml" {>= "4.02.3"} + "ocaml" {>= "4.02.3" & < "5.0"} ] url { src: diff --git a/esy.lock/opam/menhir.20220210/opam b/esy.lock/opam/menhir.20220210/opam index 3cd79886..498658b4 100644 --- a/esy.lock/opam/menhir.20220210/opam +++ b/esy.lock/opam/menhir.20220210/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: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" build: [ ["dune" "build" "-p" name "-j" jobs] ] diff --git a/esy.lock/opam/menhirLib.20220210/opam b/esy.lock/opam/menhirLib.20220210/opam index 895b5427..d2097ae4 100644 --- a/esy.lock/opam/menhirLib.20220210/opam +++ b/esy.lock/opam/menhirLib.20220210/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: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" build: [ ["dune" "build" "-p" name "-j" jobs] ] diff --git a/esy.lock/opam/menhirSdk.20220210/opam b/esy.lock/opam/menhirSdk.20220210/opam index d95c170d..585d2ca3 100644 --- a/esy.lock/opam/menhirSdk.20220210/opam +++ b/esy.lock/opam/menhirSdk.20220210/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: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception" build: [ ["dune" "build" "-p" name "-j" jobs] ] diff --git a/esy.lock/opam/merlin.4.2-412/opam b/esy.lock/opam/merlin.4.2-412/opam index f6661353..8b4b944e 100644 --- a/esy.lock/opam/merlin.4.2-412/opam +++ b/esy.lock/opam/merlin.4.2-412/opam @@ -22,6 +22,9 @@ depends: [ "menhirLib" {dev} "menhirSdk" {dev} ] +conflicts: [ + "biniou" {>= "1.2.2"} +] synopsis: "Editor helper, provides completion, typing and source browsing in Vim and Emacs" description: diff --git a/esy.lock/opam/ocamlbuild.0.14.1/opam b/esy.lock/opam/ocamlbuild.0.14.2/opam similarity index 83% rename from esy.lock/opam/ocamlbuild.0.14.1/opam rename to esy.lock/opam/ocamlbuild.0.14.2/opam index d7413780..74bfbb27 100644 --- a/esy.lock/opam/ocamlbuild.0.14.1/opam +++ b/esy.lock/opam/ocamlbuild.0.14.2/opam @@ -31,9 +31,9 @@ build: [ ] dev-repo: "git+https://github.com/ocaml/ocamlbuild.git" 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.2.tar.gz" checksum: [ - "md5=7027e507ed85f290923ad198f3d2cd1c" - "sha512=1f5b43215b1d3dc427b9c64e005add9d423ed4bca9686d52c55912df8955647cb2d7d86622d44b41b14c4f0d657b770c27967c541c868eeb7c78e3bd35b827ad" + "md5=2f407fadd57b073155a6aead887d9676" + "sha512=f568bf10431a1f701e8bd7554dc662400a0d978411038bbad93d44dceab02874490a8a5886a9b44e017347e7949997f13f5c3752f74e1eb5e273d2beb19a75fd" ] } \ 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/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.20/opam b/esy.lock/opam/qcheck-core.0.20/opam new file mode 100644 index 00000000..beeda800 --- /dev/null +++ b/esy.lock/opam/qcheck-core.0.20/opam @@ -0,0 +1,33 @@ +opam-version: "2.0" +synopsis: "Core qcheck library" +maintainer: "simon.cruanes.2007@m4x.org" +authors: "the qcheck contributors" +license: "BSD-2-Clause" +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" {>= "2.2"} + "base-bytes" + "base-unix" + "alcotest" {with-test} + "odoc" {with-doc} + "ocaml" {>= "4.08.0"} +] +conflicts: [ + "ounit" {< "2.0"} +] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +dev-repo: "git+https://github.com/c-cube/qcheck.git" +url { + src: "https://github.com/c-cube/qcheck/archive/refs/tags/v0.20.tar.gz" + checksum: [ + "md5=413d7ca480a6aa6fb9061159d6f07103" + "sha512=1fb178bee5353b870fe55e5c5379982345c2e1b7f417733be4168e8a58d448d26464d73f8a4470655ddea2701a2a44bc5b08b0de422c0f88f229d8a1ed9c3e87" + ] +} \ No newline at end of file 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/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/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.2_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.2_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.2_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.2_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/qcheck-rely.esy.lock/index.json b/qcheck-rely.esy.lock/index.json index e6b51e75..42b5e48e 100644 --- a/qcheck-rely.esy.lock/index.json +++ b/qcheck-rely.esy.lock/index.json @@ -1,15 +1,15 @@ { - "checksum": "5000f31af8bc600a309dd6e1c82f4df0", + "checksum": "df07ba74fd0f0389309bd32c171cb7eb", "root": "@reason-native/qcheck-rely@link-dev:./qcheck-rely.json", "node": { - "ocaml@4.12.0@d41d8cd9": { - "id": "ocaml@4.12.0@d41d8cd9", + "ocaml@4.14.0@d41d8cd9": { + "id": "ocaml@4.14.0@d41d8cd9", "name": "ocaml", - "version": "4.12.0", + "version": "4.14.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.12.0.tgz#sha1:2a979f37535faaded8aa3fdf82b6f16f2c71e284" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.14.0.tgz#sha1:619afaeabcc8732cc1f4014a7251403927f44021" ] }, "overrides": [], @@ -23,18 +23,15 @@ "source": { "type": "install", "source": [ "path:./rely.json" ] }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", + "ocaml@4.14.0@d41d8cd9", "@reason-native/pastel@path:./pastel.json@d41d8cd9", "@reason-native/file-context-printer@path:./file-context-printer.json@d41d8cd9", "@reason-native/cli@path:./cli.json@d41d8cd9", - "@opam/reason@opam:3.7.0@191be014", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.8.4@ee414d6c" + "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/reason@opam:3.8.2@19b5db6d", "@opam/re@opam:1.10.4@c4910ba6", + "@opam/dune@opam:3.7.0@95218dc4" ], - "devDependencies": [ - "@reason-native/pastel@path:./pastel.json@d41d8cd9", - "@reason-native/file-context-printer@path:./file-context-printer.json@d41d8cd9", - "@reason-native/cli@path:./cli.json@d41d8cd9" - ] + "devDependencies": [] }, "@reason-native/qcheck-rely@link-dev:./qcheck-rely.json": { "id": "@reason-native/qcheck-rely@link-dev:./qcheck-rely.json", @@ -47,17 +44,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", + "ocaml@4.14.0@d41d8cd9", "@reason-native/rely@path:./rely.json@d41d8cd9", "@reason-native/console@path:./console.json@d41d8cd9", - "@opam/reason@opam:3.7.0@191be014", - "@opam/qcheck-core@opam:0.9@3f95f89d", - "@opam/dune@opam:2.8.4@ee414d6c" + "@opam/reason@opam:3.8.2@19b5db6d", + "@opam/qcheck-core@opam:0.20@a5d66dbf", + "@opam/dune@opam:3.7.0@95218dc4" ], - "devDependencies": [ - "@reason-native/rely@path:./rely.json@d41d8cd9", - "@reason-native/console@path:./console.json@d41d8cd9" - ] + "devDependencies": [ "@reason-native/rely@path:./rely.json@d41d8cd9" ] }, "@reason-native/pastel@path:./pastel.json@d41d8cd9": { "id": "@reason-native/pastel@path:./pastel.json@d41d8cd9", @@ -66,8 +60,8 @@ "source": { "type": "install", "source": [ "path:./pastel.json" ] }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/reason@opam:3.7.0@191be014", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/reason@opam:3.8.2@19b5db6d", + "@opam/re@opam:1.10.4@c4910ba6", "@opam/dune@opam:3.7.0@95218dc4" ], "devDependencies": [] }, @@ -82,10 +76,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", + "ocaml@4.14.0@d41d8cd9", "@reason-native/pastel@path:./pastel.json@d41d8cd9", - "@opam/reason@opam:3.7.0@191be014", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.8.4@ee414d6c" + "@opam/reason@opam:3.8.2@19b5db6d", "@opam/re@opam:1.10.4@c4910ba6", + "@opam/dune@opam:3.7.0@95218dc4" ], "devDependencies": [] }, @@ -96,10 +90,10 @@ "source": { "type": "install", "source": [ "path:./console.json" ] }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/reason@opam:3.7.0@191be014", - "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/reason@opam:3.8.2@19b5db6d", + "@opam/dune@opam:3.7.0@95218dc4" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, "@reason-native/cli@path:./cli.json@d41d8cd9": { "id": "@reason-native/cli@path:./cli.json@d41d8cd9", @@ -108,13 +102,36 @@ "source": { "type": "install", "source": [ "path:./cli.json" ] }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", + "ocaml@4.14.0@d41d8cd9", "@reason-native/pastel@path:./pastel.json@d41d8cd9", - "@opam/reason@opam:3.7.0@191be014", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.8.4@ee414d6c" + "@opam/reason@opam:3.8.2@19b5db6d", "@opam/re@opam:1.10.4@c4910ba6", + "@opam/dune@opam:3.7.0@95218dc4" + ], + "devDependencies": [] + }, + "@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": "qcheck-rely.esy.lock/opam/stdlib-shims.0.3.0" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@reason-native/pastel@path:./pastel.json@d41d8cd9" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -132,12 +149,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, - "@opam/result@opam:1.5@6b753c82": { - "id": "@opam/result@opam:1.5@6b753c82", + "@opam/result@opam:1.5@1c6a6533": { + "id": "@opam/result@opam:1.5@1c6a6533", "name": "@opam/result", "version": "opam:1.5", "source": { @@ -154,104 +171,104 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/reason@opam:3.7.0@191be014": { - "id": "@opam/reason@opam:3.7.0@191be014", + "@opam/reason@opam:3.8.2@19b5db6d": { + "id": "@opam/reason@opam:3.8.2@19b5db6d", "name": "@opam/reason", - "version": "opam:3.7.0", + "version": "opam:3.8.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/7e/7eb8cbbff8565b93ebfabf4eca7254d4#md5:7eb8cbbff8565b93ebfabf4eca7254d4", - "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.7.0.tgz#md5:7eb8cbbff8565b93ebfabf4eca7254d4" + "archive:https://opam.ocaml.org/cache/sha256/7a/7adcc45db20b8def82adf2712211fb8ed844328489752e8edf74281bc1eb2ef2#sha256:7adcc45db20b8def82adf2712211fb8ed844328489752e8edf74281bc1eb2ef2", + "archive:https://github.com/reasonml/reason/releases/download/3.8.2/reason-3.8.2.tbz#sha256:7adcc45db20b8def82adf2712211fb8ed844328489752e8edf74281bc1eb2ef2" ], "opam": { "name": "reason", - "version": "3.7.0", - "path": "qcheck-rely.esy.lock/opam/reason.3.7.0" + "version": "3.8.2", + "path": "qcheck-rely.esy.lock/opam/reason.3.8.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/ocamlfind@opam:1.9.1@b748edf6", - "@opam/merlin-extend@opam:0.6@404f814c", - "@opam/menhir@opam:20210310@50de9216", - "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "@opam/ppx_derivers@opam:1.2.1@e2cbad12", + "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/merlin-extend@opam:0.6.1@7d979feb", + "@opam/menhir@opam:20220210@ff5ea9a7", + "@opam/fix@opam:20220121@17b9a1a4", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/merlin-extend@opam:0.6@404f814c", - "@opam/menhir@opam:20210310@50de9216", - "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "@opam/ppx_derivers@opam:1.2.1@e2cbad12", + "@opam/merlin-extend@opam:0.6.1@7d979feb", + "@opam/menhir@opam:20220210@ff5ea9a7", + "@opam/fix@opam:20220121@17b9a1a4", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/re@opam:1.9.0@d4d5e13d": { - "id": "@opam/re@opam:1.9.0@d4d5e13d", + "@opam/re@opam:1.10.4@c4910ba6": { + "id": "@opam/re@opam:1.10.4@c4910ba6", "name": "@opam/re", - "version": "opam:1.9.0", + "version": "opam:1.10.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/bd/bddaed4f386a22cace7850c9c7dac296#md5:bddaed4f386a22cace7850c9c7dac296", - "archive:https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz#md5:bddaed4f386a22cace7850c9c7dac296" + "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" ], "opam": { "name": "re", - "version": "1.9.0", - "path": "qcheck-rely.esy.lock/opam/re.1.9.0" + "version": "1.10.4", + "path": "qcheck-rely.esy.lock/opam/re.1.10.4" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.8.4@ee414d6c", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/qcheck-core@opam:0.9@3f95f89d": { - "id": "@opam/qcheck-core@opam:0.9@3f95f89d", + "@opam/qcheck-core@opam:0.20@a5d66dbf": { + "id": "@opam/qcheck-core@opam:0.20@a5d66dbf", "name": "@opam/qcheck-core", - "version": "opam:0.9", + "version": "opam:0.20", "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/41/413d7ca480a6aa6fb9061159d6f07103#md5:413d7ca480a6aa6fb9061159d6f07103", + "archive:https://github.com/c-cube/qcheck/archive/refs/tags/v0.20.tar.gz#md5:413d7ca480a6aa6fb9061159d6f07103" ], "opam": { "name": "qcheck-core", - "version": "0.9", - "path": "qcheck-rely.esy.lock/opam/qcheck-core.0.9" + "version": "0.20", + "path": "qcheck-rely.esy.lock/opam/qcheck-core.0.20" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-bytes@opam:base@19d0c2ff" ] }, - "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { - "id": "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", + "@opam/ppx_derivers@opam:1.2.1@e2cbad12": { + "id": "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "name": "@opam/ppx_derivers", "version": "opam:1.2.1", "source": { @@ -268,219 +285,219 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/ocamlfind@opam:1.9.1@b748edf6": { - "id": "@opam/ocamlfind@opam:1.9.1@b748edf6", + "@opam/ocamlfind@opam:1.9.6@da5169c7": { + "id": "@opam/ocamlfind@opam:1.9.6@da5169c7", "name": "@opam/ocamlfind", - "version": "opam:1.9.1", + "version": "opam:1.9.6", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/65/65e6dc9b305ccbed1267275fe180f538#md5:65e6dc9b305ccbed1267275fe180f538", - "archive:http://download.camlcity.org/download/findlib-1.9.1.tar.gz#md5:65e6dc9b305ccbed1267275fe180f538" + "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.1", - "path": "qcheck-rely.esy.lock/opam/ocamlfind.1.9.1" + "version": "1.9.6", + "path": "qcheck-rely.esy.lock/opam/ocamlfind.1.9.6" } }, "overrides": [ { "opamoverride": - "qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override" + "qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override" } ], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.14.0@d41d8cd9" ] }, - "@opam/merlin-extend@opam:0.6@404f814c": { - "id": "@opam/merlin-extend@opam:0.6@404f814c", + "@opam/merlin-extend@opam:0.6.1@7d979feb": { + "id": "@opam/merlin-extend@opam:0.6.1@7d979feb", "name": "@opam/merlin-extend", - "version": "opam:0.6", + "version": "opam:0.6.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c2/c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43", - "archive:https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz#sha256:c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" + "archive:https://opam.ocaml.org/cache/sha256/5e/5ec84b355ddb2d129a5948b132bfacc93adcbde2158c7de695f7bfc3650bead7#sha256:5ec84b355ddb2d129a5948b132bfacc93adcbde2158c7de695f7bfc3650bead7", + "archive:https://github.com/let-def/merlin-extend/releases/download/v0.6.1/merlin-extend-0.6.1.tbz#sha256:5ec84b355ddb2d129a5948b132bfacc93adcbde2158c7de695f7bfc3650bead7" ], "opam": { "name": "merlin-extend", - "version": "0.6", - "path": "qcheck-rely.esy.lock/opam/merlin-extend.0.6" + "version": "0.6.1", + "path": "qcheck-rely.esy.lock/opam/merlin-extend.0.6.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", - "@opam/cppo@opam:1.6.7@c28ac3ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", + "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/menhirSdk@opam:20210310@5abaafca": { - "id": "@opam/menhirSdk@opam:20210310@5abaafca", + "@opam/menhirSdk@opam:20220210@fe146ed3": { + "id": "@opam/menhirSdk@opam:20220210@fe146ed3", "name": "@opam/menhirSdk", - "version": "opam:20210310", + "version": "opam:20220210", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/1c/1cbc71c0bc1f3ddc3e71d5c1f919fd1a#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a" + "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" ], "opam": { "name": "menhirSdk", - "version": "20210310", - "path": "qcheck-rely.esy.lock/opam/menhirSdk.20210310" + "version": "20220210", + "path": "qcheck-rely.esy.lock/opam/menhirSdk.20220210" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/menhirLib@opam:20210310@f9315713": { - "id": "@opam/menhirLib@opam:20210310@f9315713", + "@opam/menhirLib@opam:20220210@9afeb270": { + "id": "@opam/menhirLib@opam:20220210@9afeb270", "name": "@opam/menhirLib", - "version": "opam:20210310", + "version": "opam:20220210", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/1c/1cbc71c0bc1f3ddc3e71d5c1f919fd1a#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a" + "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" ], "opam": { "name": "menhirLib", - "version": "20210310", - "path": "qcheck-rely.esy.lock/opam/menhirLib.20210310" + "version": "20220210", + "path": "qcheck-rely.esy.lock/opam/menhirLib.20220210" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/menhir@opam:20210310@50de9216": { - "id": "@opam/menhir@opam:20210310@50de9216", + "@opam/menhir@opam:20220210@ff5ea9a7": { + "id": "@opam/menhir@opam:20220210@ff5ea9a7", "name": "@opam/menhir", - "version": "opam:20210310", + "version": "opam:20220210", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/1c/1cbc71c0bc1f3ddc3e71d5c1f919fd1a#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a", - "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz#md5:1cbc71c0bc1f3ddc3e71d5c1f919fd1a" + "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" ], "opam": { "name": "menhir", - "version": "20210310", - "path": "qcheck-rely.esy.lock/opam/menhir.20210310" + "version": "20220210", + "path": "qcheck-rely.esy.lock/opam/menhir.20220210" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/menhirSdk@opam:20210310@5abaafca", - "@opam/menhirLib@opam:20210310@f9315713", - "@opam/dune@opam:2.8.4@ee414d6c", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.0@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", + "@opam/menhirLib@opam:20220210@9afeb270", + "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/menhirSdk@opam:20210310@5abaafca", - "@opam/menhirLib@opam:20210310@f9315713", - "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", + "@opam/menhirLib@opam:20220210@9afeb270", + "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/fix@opam:20201120@5c318621": { - "id": "@opam/fix@opam:20201120@5c318621", + "@opam/fix@opam:20220121@17b9a1a4": { + "id": "@opam/fix@opam:20220121@17b9a1a4", "name": "@opam/fix", - "version": "opam:20201120", + "version": "opam:20220121", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3", - "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3" + "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" ], "opam": { "name": "fix", - "version": "20201120", - "path": "qcheck-rely.esy.lock/opam/fix.20201120" + "version": "20220121", + "path": "qcheck-rely.esy.lock/opam/fix.20220121" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c" + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4" ] }, - "@opam/dune@opam:2.8.4@ee414d6c": { - "id": "@opam/dune@opam:2.8.4@ee414d6c", + "@opam/dune@opam:3.7.0@95218dc4": { + "id": "@opam/dune@opam:3.7.0@95218dc4", "name": "@opam/dune", - "version": "opam:2.8.4", + "version": "opam:3.7.0", "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/e2/e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8", + "archive:https://github.com/ocaml/dune/releases/download/3.7.0/dune-3.7.0.tbz#sha256:e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" ], "opam": { "name": "dune", - "version": "2.8.4", - "path": "qcheck-rely.esy.lock/opam/dune.2.8.4" + "version": "3.7.0", + "path": "qcheck-rely.esy.lock/opam/dune.3.7.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.14.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.14.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, - "@opam/cppo@opam:1.6.7@c28ac3ae": { - "id": "@opam/cppo@opam:1.6.7@c28ac3ae", + "@opam/cppo@opam:1.6.9@db929a12": { + "id": "@opam/cppo@opam:1.6.9@db929a12", "name": "@opam/cppo", - "version": "opam:1.6.7", + "version": "opam:1.6.9", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/db/db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d#sha256:db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d", - "archive:https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz#sha256:db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d" + "archive:https://opam.ocaml.org/cache/md5/d2/d23ffe85ac7dc8f0afd1ddf622770d09#md5:d23ffe85ac7dc8f0afd1ddf622770d09", + "archive:https://github.com/ocaml-community/cppo/archive/v1.6.9.tar.gz#md5:d23ffe85ac7dc8f0afd1ddf622770d09" ], "opam": { "name": "cppo", - "version": "1.6.7", - "path": "qcheck-rely.esy.lock/opam/cppo.1.6.7" + "version": "1.6.9", + "path": "qcheck-rely.esy.lock/opam/cppo.1.6.9" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.8.4@ee414d6c", + "ocaml@4.14.0@d41d8cd9", "@opam/dune@opam:3.7.0@95218dc4", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -533,11 +550,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.1@b748edf6", + "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.1@b748edf6" + "ocaml@4.14.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7" ] }, "@esy-ocaml/substs@0.0.1@d41d8cd9": { diff --git a/qcheck-rely.esy.lock/opam/cppo.1.6.7/opam b/qcheck-rely.esy.lock/opam/cppo.1.6.9/opam similarity index 55% rename from qcheck-rely.esy.lock/opam/cppo.1.6.7/opam rename to qcheck-rely.esy.lock/opam/cppo.1.6.9/opam index eddcc1ef..9c51ec6d 100644 --- a/qcheck-rely.esy.lock/opam/cppo.1.6.7/opam +++ b/qcheck-rely.esy.lock/opam/cppo.1.6.9/opam @@ -1,39 +1,39 @@ opam-version: "2.0" -maintainer: "martin@mjambon.com" +synopsis: "Code preprocessor like cpp for OCaml" +description: """\ +Cppo is an equivalent of the C preprocessor for OCaml programs. +It allows the definition of simple macros and file inclusion. + +Cppo is: + +* more OCaml-friendly than cpp +* easy to learn without consulting a manual +* reasonably fast +* simple to install and to maintain""" +maintainer: [ + "Martin Jambon " "Yishuai Li " +] authors: "Martin Jambon" license: "BSD-3-Clause" homepage: "https://github.com/ocaml-community/cppo" -doc: "https://ocaml-community.github.io/cppo/" +doc: "https://ocaml-community.github.io/cppo" bug-reports: "https://github.com/ocaml-community/cppo/issues" depends: [ "ocaml" {>= "4.02.3"} - "dune" {>= "1.0"} + "dune" {>= "1.10"} "base-unix" ] build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "-p" name "@doc"] {with-doc} ] dev-repo: "git+https://github.com/ocaml-community/cppo.git" -synopsis: "Code preprocessor like cpp for OCaml" -description: """ -Cppo is an equivalent of the C preprocessor for OCaml programs. -It allows the definition of simple macros and file inclusion. - -Cppo is: - -* more OCaml-friendly than cpp -* easy to learn without consulting a manual -* reasonably fast -* simple to install and to maintain -""" -x-commit-hash: "7d217864a5fdc4551699e248137a2f8b719d2078" url { - src: - "https://github.com/ocaml-community/cppo/releases/download/v1.6.7/cppo-v1.6.7.tbz" + src: "https://github.com/ocaml-community/cppo/archive/v1.6.9.tar.gz" checksum: [ - "sha256=db553e3e6c206df09b1858c3aef5e21e56564d593642a3c78bcedb6af36f529d" - "sha512=9722b50fd23aaccf86816313333a3bf8fc7c6b4ef06b153e5e1e1aaf14670cf51a4aac52fb1b4a0e5531699c4047a1eff6c24c969f7e5063e78096c2195b5819" + "md5=d23ffe85ac7dc8f0afd1ddf622770d09" + "sha512=26ff5a7b7f38c460661974b23ca190f0feae3a99f1974e0fd12ccf08745bd7d91b7bc168c70a5385b837bfff9530e0e4e41cf269f23dd8cf16ca658008244b44" ] -} +} \ No newline at end of file diff --git a/qcheck-rely.esy.lock/opam/dune.2.8.4/opam b/qcheck-rely.esy.lock/opam/dune.3.7.0/opam similarity index 72% rename from qcheck-rely.esy.lock/opam/dune.2.8.4/opam rename to qcheck-rely.esy.lock/opam/dune.3.7.0/opam index 1a351753..c9207f2c 100644 --- a/qcheck-rely.esy.lock/opam/dune.2.8.4/opam +++ b/qcheck-rely.esy.lock/opam/dune.3.7.0/opam @@ -29,17 +29,15 @@ 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, @@ -48,11 +46,11 @@ depends: [ "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.7.0/dune-3.7.0.tbz" checksum: [ - "sha256=4e6420177584aabdc3b7b37aee3026b094b82bf5d7ed175344a68e321f72e8ac" - "sha512=efc1834c4add40138a101734665a1f462c19fe76d1cbb457b1fc20f95991118a50b24d485fb98d39046e41bec03885a8dc071bf8add51083ac9780bff9f6668a" + "sha256=e2d637c9d080318fedf5e71d2a29fb367624f82ac4a26e83df2b3a03550528b8" + "sha512=586e47ee45cd53a8c13095bde0b47de99aad9462d0a52199362140b5b654ca862597fa9f27f729a8cc594684ac46858848f9fa76f8f06dc8dc8ab8b1186a3295" ] } +x-commit-hash: "d3d628f2eda2278bd2df6e37452d8693f367fcfd" diff --git a/qcheck-rely.esy.lock/opam/fix.20201120/opam b/qcheck-rely.esy.lock/opam/fix.20220121/opam similarity index 50% rename from qcheck-rely.esy.lock/opam/fix.20201120/opam rename to qcheck-rely.esy.lock/opam/fix.20220121/opam index 31c8a641..877b44e6 100644 --- a/qcheck-rely.esy.lock/opam/fix.20201120/opam +++ b/qcheck-rely.esy.lock/opam/fix.20220121/opam @@ -1,3 +1,4 @@ + opam-version: "2.0" maintainer: "francois.pottier@inria.fr" authors: [ @@ -6,19 +7,20 @@ authors: [ homepage: "https://gitlab.inria.fr/fpottier/fix" dev-repo: "git+https://gitlab.inria.fr/fpottier/fix.git" bug-reports: "francois.pottier@inria.fr" +license: "LGPL-2.0-only" build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ "ocaml" { >= "4.03" } - "dune" {>= "1.3" } + "dune" { >= "1.3" } ] -synopsis: "Facilities for memoization and fixed points" +synopsis: "Algorithmic building blocks for memoization, recursion, and more" url { src: - "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/fix/-/archive/20220121/archive.tar.gz" checksum: [ - "md5=7eb570b759635fe66f3556d2b1cc88e3" - "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4" + "md5=48d8a5bdff23cf7fbf9288877df2b6aa" + "sha512=a851d8783c0c519c6e55359a5c471af433058872409c29a1a7bdfd0076813341ad2c0ebd1ce9e28bff4d4c729dfbc808c41c084fe12a42b45a2b5e391e77ccd2" ] } diff --git a/qcheck-rely.esy.lock/opam/menhir.20210310/opam b/qcheck-rely.esy.lock/opam/menhir.20220210/opam similarity index 52% rename from qcheck-rely.esy.lock/opam/menhir.20210310/opam rename to qcheck-rely.esy.lock/opam/menhir.20220210/opam index d7958657..498658b4 100644 --- a/qcheck-rely.esy.lock/opam/menhir.20210310/opam +++ b/qcheck-rely.esy.lock/opam/menhir.20220210/opam @@ -1,3 +1,4 @@ + opam-version: "2.0" maintainer: "francois.pottier@inria.fr" authors: [ @@ -6,22 +7,23 @@ authors: [ ] homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" -bug-reports: "menhir@inria.fr" +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.02.3"} - "dune" { >= "2.2.0"} + "ocaml" {>= "4.03.0"} + "dune" {>= "2.8.0"} "menhirLib" {= version} "menhirSdk" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" checksum: [ - "md5=1cbc71c0bc1f3ddc3e71d5c1f919fd1a" - "sha512=3c309fa2cc4ad7c6fba85107bd946a542894882fa39741496b150307e93455b717418f19e94b5dad06ab269f5c55e8dc25705c96c0a5092e623fa38f1ce43c7f" + "md5=e3cef220f676c4b1c16cbccb174cefe3" + "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" ] } diff --git a/qcheck-rely.esy.lock/opam/menhirLib.20210310/opam b/qcheck-rely.esy.lock/opam/menhirLib.20220210/opam similarity index 52% rename from qcheck-rely.esy.lock/opam/menhirLib.20210310/opam rename to qcheck-rely.esy.lock/opam/menhirLib.20220210/opam index 3dc8fb97..d2097ae4 100644 --- a/qcheck-rely.esy.lock/opam/menhirLib.20210310/opam +++ b/qcheck-rely.esy.lock/opam/menhirLib.20220210/opam @@ -1,3 +1,4 @@ + opam-version: "2.0" maintainer: "francois.pottier@inria.fr" authors: [ @@ -6,13 +7,14 @@ authors: [ ] homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" -bug-reports: "menhir@inria.fr" +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.02.3" } - "dune" { >= "2.0.0" } + "ocaml" { >= "4.03.0" } + "dune" { >= "2.8.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +22,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" checksum: [ - "md5=1cbc71c0bc1f3ddc3e71d5c1f919fd1a" - "sha512=3c309fa2cc4ad7c6fba85107bd946a542894882fa39741496b150307e93455b717418f19e94b5dad06ab269f5c55e8dc25705c96c0a5092e623fa38f1ce43c7f" + "md5=e3cef220f676c4b1c16cbccb174cefe3" + "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" ] } diff --git a/qcheck-rely.esy.lock/opam/menhirSdk.20210310/opam b/qcheck-rely.esy.lock/opam/menhirSdk.20220210/opam similarity index 52% rename from qcheck-rely.esy.lock/opam/menhirSdk.20210310/opam rename to qcheck-rely.esy.lock/opam/menhirSdk.20220210/opam index 02a480f3..585d2ca3 100644 --- a/qcheck-rely.esy.lock/opam/menhirSdk.20210310/opam +++ b/qcheck-rely.esy.lock/opam/menhirSdk.20220210/opam @@ -1,3 +1,4 @@ + opam-version: "2.0" maintainer: "francois.pottier@inria.fr" authors: [ @@ -6,13 +7,14 @@ authors: [ ] homepage: "http://gitlab.inria.fr/fpottier/menhir" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" -bug-reports: "menhir@inria.fr" +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.02.3" } - "dune" { >= "2.0.0" } + "ocaml" { >= "4.03.0" } + "dune" { >= "2.8.0" } ] conflicts: [ "menhir" { != version } @@ -20,9 +22,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/repository/20210310/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/archive.tar.gz" checksum: [ - "md5=1cbc71c0bc1f3ddc3e71d5c1f919fd1a" - "sha512=3c309fa2cc4ad7c6fba85107bd946a542894882fa39741496b150307e93455b717418f19e94b5dad06ab269f5c55e8dc25705c96c0a5092e623fa38f1ce43c7f" + "md5=e3cef220f676c4b1c16cbccb174cefe3" + "sha512=3063fec1d8b9fe092c8461b0689d426c7fe381a2bf3fd258dc42ceecca1719d32efbb8a18d94ada5555c38175ea352da3adbb239fdbcbcf52c3a5c85a4d9586f" ] } diff --git a/qcheck-rely.esy.lock/opam/merlin-extend.0.6/opam b/qcheck-rely.esy.lock/opam/merlin-extend.0.6.1/opam similarity index 68% rename from qcheck-rely.esy.lock/opam/merlin-extend.0.6/opam rename to qcheck-rely.esy.lock/opam/merlin-extend.0.6.1/opam index 39b33757..9f993650 100644 --- a/qcheck-rely.esy.lock/opam/merlin-extend.0.6/opam +++ b/qcheck-rely.esy.lock/opam/merlin-extend.0.6.1/opam @@ -6,12 +6,12 @@ bug-reports: "https://github.com/let-def/merlin-extend" license: "MIT" dev-repo: "git+https://github.com/let-def/merlin-extend.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] ] depends: [ "dune" {>= "1.0"} - "cppo" {build} + "cppo" {build & >= "1.1.0"} "ocaml" {>= "4.02.3"} ] synopsis: "A protocol to provide custom frontend to Merlin" @@ -19,12 +19,12 @@ description: """ This protocol allows to replace the OCaml frontend of Merlin. It extends what used to be done with the `-pp' flag to handle a few more cases.""" doc: "https://let-def.github.io/merlin-extend" -x-commit-hash: "640620568a5f5c7798239ecf7c707c813e3df3cf" url { src: - "https://github.com/let-def/merlin-extend/releases/download/v0.6/merlin-extend-v0.6.tbz" + "https://github.com/let-def/merlin-extend/releases/download/v0.6.1/merlin-extend-0.6.1.tbz" checksum: [ - "sha256=c2f236ae97feb6ba0bc90f33beb7b7343e42f9871b66de9ba07974917e256c43" - "sha512=4c64a490e2ece04fc89aef679c1d9202175df4fe045b5fdc7a37cd7cebe861226fddd9648c1bf4f06175ecfcd2ed7686c96bd6a8cae003a5096f6134c240f857" + "sha256=5ec84b355ddb2d129a5948b132bfacc93adcbde2158c7de695f7bfc3650bead7" + "sha512=631fc96aab2f35e12a078c9b4907ca7b0db9f1e3a4026040e6c23b82e0171c256a89fb5d4c887f1d156eb9e3152783cdf7a546b2496051007a1bcf5777417396" ] } +x-commit-hash: "cf2707bbe8e034c6ecf5d0fecd3fd889f6ab14bf" diff --git a/qcheck-rely.esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch b/qcheck-rely.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/qcheck-rely.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/qcheck-rely.esy.lock/opam/ocamlfind.1.9.1/opam b/qcheck-rely.esy.lock/opam/ocamlfind.1.9.6/opam similarity index 70% rename from qcheck-rely.esy.lock/opam/ocamlfind.1.9.1/opam rename to qcheck-rely.esy.lock/opam/ocamlfind.1.9.6/opam index 4b6e5c6f..a81f0c50 100644 --- a/qcheck-rely.esy.lock/opam/ocamlfind.1.9.1/opam +++ b/qcheck-rely.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,11 +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.1.tar.gz" + src: "http://download.camlcity.org/download/findlib-1.9.6.tar.gz" checksum: [ - "md5=65e6dc9b305ccbed1267275fe180f538" - "sha512=83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84" + "md5=96c6ee50a32cca9ca277321262dbec57" + "sha512=cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027" ] } +available: os != "win32" diff --git a/qcheck-rely.esy.lock/opam/ppx_derivers.1.2.1/opam b/qcheck-rely.esy.lock/opam/ppx_derivers.1.2.1/opam index 3d10814e..484b2654 100644 --- a/qcheck-rely.esy.lock/opam/ppx_derivers.1.2.1/opam +++ b/qcheck-rely.esy.lock/opam/ppx_derivers.1.2.1/opam @@ -4,7 +4,7 @@ authors: ["Jérémie Dimino"] license: "BSD-3-Clause" homepage: "https://github.com/ocaml-ppx/ppx_derivers" bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues" -dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git" +dev-repo: "git+https://github.com/ocaml-ppx/ppx_derivers.git" build: [ ["dune" "build" "-p" name "-j" jobs] ] diff --git a/qcheck-rely.esy.lock/opam/qcheck-core.0.20/opam b/qcheck-rely.esy.lock/opam/qcheck-core.0.20/opam new file mode 100644 index 00000000..beeda800 --- /dev/null +++ b/qcheck-rely.esy.lock/opam/qcheck-core.0.20/opam @@ -0,0 +1,33 @@ +opam-version: "2.0" +synopsis: "Core qcheck library" +maintainer: "simon.cruanes.2007@m4x.org" +authors: "the qcheck contributors" +license: "BSD-2-Clause" +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" {>= "2.2"} + "base-bytes" + "base-unix" + "alcotest" {with-test} + "odoc" {with-doc} + "ocaml" {>= "4.08.0"} +] +conflicts: [ + "ounit" {< "2.0"} +] +build: [ + ["dune" "build" "-p" name "-j" jobs] + ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +dev-repo: "git+https://github.com/c-cube/qcheck.git" +url { + src: "https://github.com/c-cube/qcheck/archive/refs/tags/v0.20.tar.gz" + checksum: [ + "md5=413d7ca480a6aa6fb9061159d6f07103" + "sha512=1fb178bee5353b870fe55e5c5379982345c2e1b7f417733be4168e8a58d448d26464d73f8a4470655ddea2701a2a44bc5b08b0de422c0f88f229d8a1ed9c3e87" + ] +} \ No newline at end of file diff --git a/qcheck-rely.esy.lock/opam/qcheck-core.0.9/opam b/qcheck-rely.esy.lock/opam/qcheck-core.0.9/opam deleted file mode 100644 index f25507cc..00000000 --- a/qcheck-rely.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/qcheck-rely.esy.lock/opam/re.1.9.0/opam b/qcheck-rely.esy.lock/opam/re.1.10.4/opam similarity index 63% rename from qcheck-rely.esy.lock/opam/re.1.9.0/opam rename to qcheck-rely.esy.lock/opam/re.1.10.4/opam index f7987544..9dad6613 100644 --- a/qcheck-rely.esy.lock/opam/re.1.9.0/opam +++ b/qcheck-rely.esy.lock/opam/re.1.10.4/opam @@ -8,20 +8,20 @@ authors: [ "Rudi Grinberg" "Gabriel Radanne" ] -license: "LGPL-2.0-only with OCaml-LGPL-linking-exception" +license: "LGPL-2.0-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" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] depends: [ - "ocaml" {>= "4.02"} - "dune" + "ocaml" {>= "4.03"} + "dune" {>= "2.0"} "ounit" {with-test} "seq" ] @@ -37,6 +37,10 @@ Pure OCaml regular expressions with: """ url { src: - "https://github.com/ocaml/ocaml-re/releases/download/1.9.0/re-1.9.0.tbz" - checksum: "md5=bddaed4f386a22cace7850c9c7dac296" + "https://github.com/ocaml/ocaml-re/releases/download/1.10.4/re-1.10.4.tbz" + checksum: [ + "sha256=83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c" + "sha512=92b05cf92c389fa8c753f2acca837b15dd05a4a2e8e2bec7a269d2e14c35b1a786d394258376648f80b4b99250ba1900cfe68230b8385aeac153149d9ce56099" + ] } +x-commit-hash: "e9a4cecb8294c1839db18b1d0c30e755ec85ed5e" diff --git a/qcheck-rely.esy.lock/opam/reason.3.7.0/opam b/qcheck-rely.esy.lock/opam/reason.3.7.0/opam deleted file mode 100644 index 1ad963af..00000000 --- a/qcheck-rely.esy.lock/opam/reason.3.7.0/opam +++ /dev/null @@ -1,31 +0,0 @@ -opam-version: "2.0" -maintainer: "Jordan Walke " -authors: [ "Jordan Walke " ] -license: "MIT" -homepage: "https://github.com/facebook/reason" -doc: "http://reasonml.github.io/" -bug-reports: "https://github.com/facebook/reason/issues" -dev-repo: "git://github.com/facebook/reason.git" -tags: [ "syntax" ] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "ocaml" {>= "4.03" & < "4.13"} - "dune" {>= "1.4"} - "ocamlfind" {build} - "menhir" {>= "20170418"} - "merlin-extend" {>= "0.6"} - "ppx_derivers" {< "2.0"} - "fix" - "result" -] -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://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.7.0.tgz" - checksum: "md5=7eb8cbbff8565b93ebfabf4eca7254d4" -} diff --git a/qcheck-rely.esy.lock/opam/reason.3.8.2/opam b/qcheck-rely.esy.lock/opam/reason.3.8.2/opam new file mode 100644 index 00000000..83b706fe --- /dev/null +++ b/qcheck-rely.esy.lock/opam/reason.3.8.2/opam @@ -0,0 +1,36 @@ +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+https://github.com/reasonml/reason.git" +tags: [ "syntax" ] +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +depends: [ + "ocaml" {>= "4.03" & < "5.1"} + "dune" {>= "2.3"} + "ocamlfind" {build} + "menhir" {>= "20180523"} + "merlin-extend" {>= "0.6"} + "fix" + "result" + "ppx_derivers" +] +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.2/reason-3.8.2.tbz" + checksum: [ + "sha256=7adcc45db20b8def82adf2712211fb8ed844328489752e8edf74281bc1eb2ef2" + "sha512=45822ecf4b19b892e1d150fd7f7a80af18df576b204647d4bbb9a18ac591a690f9b5338789ecccacb2d6b6354dbc32ff4a3574cc8b82b777e21cb8729f502f95" + ] +} +x-commit-hash: "6e6c3a7c2714aeaee93b421b3ffc040874bd3b3a" diff --git a/qcheck-rely.esy.lock/opam/result.1.5/opam b/qcheck-rely.esy.lock/opam/result.1.5/opam index 671af042..6b7b68d7 100644 --- a/qcheck-rely.esy.lock/opam/result.1.5/opam +++ b/qcheck-rely.esy.lock/opam/result.1.5/opam @@ -1,6 +1,6 @@ opam-version: "2.0" -maintainer: "opensource@janestreet.com" -authors: ["Jane Street Group, LLC "] +maintainer: "Jane Street developers" +authors: ["Jane Street Group, LLC"] homepage: "https://github.com/janestreet/result" dev-repo: "git+https://github.com/janestreet/result.git" bug-reports: "https://github.com/janestreet/result/issues" diff --git a/qcheck-rely.esy.lock/opam/stdlib-shims.0.3.0/opam b/qcheck-rely.esy.lock/opam/stdlib-shims.0.3.0/opam new file mode 100644 index 00000000..8c969571 --- /dev/null +++ b/qcheck-rely.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/qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/files/findlib-1.9.1.patch b/qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/files/findlib-1.9.1.patch deleted file mode 100644 index 3e3ee5a2..00000000 --- a/qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/files/findlib-1.9.1.patch +++ /dev/null @@ -1,471 +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 diff --git a/qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch b/qcheck-rely.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/qcheck-rely.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/qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/package.json b/qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json similarity index 92% rename from qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/package.json rename to qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json index 741211a4..bf169e50 100644 --- a/qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.1_opam_override/package.json +++ b/qcheck-rely.esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json @@ -3,7 +3,7 @@ [ "bash", "-c", - "#{os == 'windows' ? 'patch -p1 < findlib-1.9.1.patch' : 'true'}" + "#{os == 'windows' ? 'patch -p1 < findlib.patch' : 'true'}" ], [ "./configure",