diff --git a/compiler/esy.json b/compiler/esy.json index 9f2e90db0e..a882cf8b0a 100644 --- a/compiler/esy.json +++ b/compiler/esy.json @@ -32,8 +32,8 @@ "check-format": "dune build @fmt" }, "dependencies": { - "@grain/binaryen.ml": ">= 0.34.0 < 0.35.0", - "@opam/cmdliner": ">= 1.1.1 < 2.0.0", + "@grain/binaryen.ml": ">= 0.37.0 < 0.38.0", + "@opam/cmdliner": ">= 2.1.1 < 3.0.0", "@opam/dune": ">= 3.17.1 < 4.0.0", "@opam/dune-build-info": ">= 3.17.1 < 4.0.0", "@opam/dune-configurator": ">= 3.17.1 < 4.0.0", @@ -42,7 +42,6 @@ "@opam/menhir": "20240715", "@opam/ocamlgraph": ">= 2.0.0 < 3.0.0", "@opam/ppx_deriving": ">= 5.2.1 < 6.0.0", - "@opam/ppx_deriving_cmdliner": ">= 0.6.1", "@opam/ppx_deriving_yojson": ">= 3.7.0 < 4.0.0", "@opam/ppx_sexp_conv": "v0.17.0", "@opam/reason": ">= 3.11.0 <= 3.15.0", @@ -54,14 +53,13 @@ "ocaml": "5.2.0" }, "devDependencies": { - "@opam/js_of_ocaml-compiler": "6.0.1", + "@opam/js_of_ocaml-compiler": "6.4.1", "@opam/ocaml-lsp-server": "1.21.0", "@opam/rely": "^4.0.0" }, "resolutions": { "@opam/fp": "reasonml/reason-native:fp.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8", "@opam/fs": "reasonml/reason-native:fs.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8", - "@opam/ppx_deriving_cmdliner": "hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c", "@opam/utf8": "reasonml/reason-native:utf8.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8", "@opam/cli": "reasonml/reason-native:cli.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8", "@opam/file-context-printer": "reasonml/reason-native:file-context-printer.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8", diff --git a/compiler/esy.lock/index.json b/compiler/esy.lock/index.json index a4722ab74f..d55edb3242 100644 --- a/compiler/esy.lock/index.json +++ b/compiler/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "bb066c853767eab7790b8d96f29bc1b3", + "checksum": "e583b6b532042bb8a6abf28d19f4dd27", "root": "@grain/compiler@link-dev:./esy.json", "node": { "ocaml@5.2.0@d41d8cd9": { @@ -41,12 +41,12 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.20.2@8daef28d", "@opam/cppo@opam:1.8.0@b48266ea", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/cppo@opam:1.8.0@1dba4c9c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -55,29 +55,29 @@ [ "windows", "x86_64" ] ] }, - "@opam/xdg@opam:3.20.2@ade9ef81": { - "id": "@opam/xdg@opam:3.20.2@ade9ef81", + "@opam/xdg@opam:3.24.2@cb11774c": { + "id": "@opam/xdg@opam:3.24.2@cb11774c", "name": "@opam/xdg", - "version": "opam:3.20.2", + "version": "opam:3.24.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/b1/b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549", - "archive:https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" + "archive:https://opam.ocaml.org/cache/sha256/47/472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a", + "archive:https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" ], "opam": { "name": "xdg", - "version": "3.20.2", - "path": "esy.lock/opam/xdg.3.20.2" + "version": "3.24.2", + "path": "esy.lock/opam/xdg.3.24.2" } }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -105,9 +105,9 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/topkg@opam:1.1.1@2377d2f8", - "@opam/ocamlfind@opam:1.9.8@ee910ff5", - "@opam/ocamlbuild@opam:0.16.1@b3fc8209", - "@opam/cmdliner@opam:1.3.0@8e6dd99f", + "@opam/ocamlfind@opam:1.9.8@c9de249d", + "@opam/ocamlbuild@opam:0.16.1@6ccbffe8", + "@opam/cmdliner@opam:2.1.1@071b019b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9" ], @@ -131,11 +131,11 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -163,13 +163,13 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/stringext@opam:1.6.0@ac4f328b", - "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/angstrom@opam:0.16.1@7454dd18", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/stringext@opam:1.6.0@ac4f328b", - "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/angstrom@opam:0.16.1@7454dd18" ], "available": [ @@ -197,12 +197,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@ee910ff5", - "@opam/ocamlbuild@opam:0.16.1@b3fc8209", + "ocaml@5.2.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.8@c9de249d", + "@opam/ocamlbuild@opam:0.16.1@6ccbffe8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/ocamlbuild@opam:0.16.1@b3fc8209" + "ocaml@5.2.0@d41d8cd9", "@opam/ocamlbuild@opam:0.16.1@6ccbffe8" ], "available": [ [ "darwin", "x86_64" ], @@ -229,11 +229,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -262,7 +262,7 @@ "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", - "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -270,7 +270,7 @@ "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", - "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ], @@ -299,11 +299,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -330,11 +330,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -343,8 +343,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/sexplib0@opam:v0.17.0@75dcb697": { - "id": "@opam/sexplib0@opam:v0.17.0@75dcb697", + "@opam/sexplib0@opam:v0.17.0@db8af2c0": { + "id": "@opam/sexplib0@opam:v0.17.0@db8af2c0", "name": "@opam/sexplib0", "version": "opam:v0.17.0", "source": { @@ -361,11 +361,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -374,8 +374,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/sexplib@opam:v0.17.0@4be4450b": { - "id": "@opam/sexplib@opam:v0.17.0@4be4450b", + "@opam/sexplib@opam:v0.17.0@a275c991": { + "id": "@opam/sexplib@opam:v0.17.0@a275c991", "name": "@opam/sexplib", "version": "opam:v0.17.0", "source": { @@ -392,14 +392,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", - "@opam/parsexp@opam:v0.17.0@abd42128", "@opam/num@opam:1.5@fe3ec2a0", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@db8af2c0", + "@opam/parsexp@opam:v0.17.0@a8ef5428", "@opam/num@opam:1.5@fe3ec2a0", + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", - "@opam/parsexp@opam:v0.17.0@abd42128", "@opam/num@opam:1.5@fe3ec2a0", - "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@db8af2c0", + "@opam/parsexp@opam:v0.17.0@a8ef5428", "@opam/num@opam:1.5@fe3ec2a0", + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -464,12 +464,12 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.20.2@8daef28d", + "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.20.2@8daef28d" + "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -478,8 +478,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/result@opam:1.5@5a755845": { - "id": "@opam/result@opam:1.5@5a755845", + "@opam/result@opam:1.5@3a31c126": { + "id": "@opam/result@opam:1.5@3a31c126", "name": "@opam/result", "version": "opam:1.5", "source": { @@ -496,11 +496,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -525,7 +525,7 @@ "@opam/re@opam:1.14.0@62aa9f42", "@opam/pastel@github:reasonml/reason-native:pastel.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/cli@github:reasonml/reason-native:cli.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -534,7 +534,7 @@ "@opam/re@opam:1.14.0@62aa9f42", "@opam/pastel@github:reasonml/reason-native:pastel.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/cli@github:reasonml/reason-native:cli.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9" ], "available": [ @@ -564,12 +564,12 @@ "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", "@opam/ppx_derivers@opam:1.2.1@d78727cd", - "@opam/ocamlfind@opam:1.9.8@ee910ff5", + "@opam/ocamlfind@opam:1.9.8@c9de249d", "@opam/merlin-extend@opam:0.6.2@f9530fc0", "@opam/menhir@opam:20240715@454ed5d1", - "@opam/fix@opam:20250919@2cb92ccc", - "@opam/dune-build-info@opam:3.20.2@a53d0f1c", - "@opam/dune@opam:3.20.2@8daef28d", "@opam/cppo@opam:1.8.0@b48266ea", + "@opam/fix@opam:20250919@c2fe39ac", + "@opam/dune-build-info@opam:3.24.2@e3506498", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/cppo@opam:1.8.0@1dba4c9c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -577,9 +577,9 @@ "@opam/ppx_derivers@opam:1.2.1@d78727cd", "@opam/merlin-extend@opam:0.6.2@f9530fc0", "@opam/menhir@opam:20240715@454ed5d1", - "@opam/fix@opam:20250919@2cb92ccc", - "@opam/dune-build-info@opam:3.20.2@a53d0f1c", - "@opam/dune@opam:3.20.2@8daef28d", "@opam/cppo@opam:1.8.0@b48266ea" + "@opam/fix@opam:20250919@c2fe39ac", + "@opam/dune-build-info@opam:3.24.2@e3506498", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/cppo@opam:1.8.0@1dba4c9c" ], "available": [ [ "darwin", "x86_64" ], @@ -606,11 +606,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -638,11 +638,11 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -670,17 +670,17 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/sexplib0@opam:v0.17.0@75dcb697", + "@opam/sexplib0@opam:v0.17.0@db8af2c0", "@opam/ppx_derivers@opam:1.2.1@d78727cd", "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/sexplib0@opam:v0.17.0@75dcb697", + "@opam/sexplib0@opam:v0.17.0@db8af2c0", "@opam/ppx_derivers@opam:1.2.1@d78727cd", "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -689,8 +689,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e": { - "id": "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@e7e988bb": { + "id": "@opam/ppx_yojson_conv_lib@opam:v0.17.0@e7e988bb", "name": "@opam/ppx_yojson_conv_lib", "version": "opam:v0.17.0", "source": { @@ -708,11 +708,11 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -721,8 +721,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/ppx_sexp_conv@opam:v0.17.0@4ebeb9aa": { - "id": "@opam/ppx_sexp_conv@opam:v0.17.0@4ebeb9aa", + "@opam/ppx_sexp_conv@opam:v0.17.0@ffcb9022": { + "id": "@opam/ppx_sexp_conv@opam:v0.17.0@ffcb9022", "name": "@opam/ppx_sexp_conv", "version": "opam:v0.17.0", "source": { @@ -739,18 +739,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@db8af2c0", "@opam/ppxlib_jane@opam:v0.17.0@9e98e420", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/dune@opam:3.20.2@8daef28d", - "@opam/base@opam:v0.17.3@78923773", + "@opam/dune@opam:3.24.2@dc9091c2", + "@opam/base@opam:v0.17.3@1b4d501e", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@db8af2c0", "@opam/ppxlib_jane@opam:v0.17.0@9e98e420", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/dune@opam:3.20.2@8daef28d", "@opam/base@opam:v0.17.3@78923773" + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/base@opam:v0.17.3@1b4d501e" ], "available": [ [ "darwin", "x86_64" ], @@ -780,46 +780,13 @@ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/ppxlib@opam:0.35.0@8cd01f8f", "@opam/ppx_deriving@opam:5.2.1@709e53c3", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/ppxlib@opam:0.35.0@8cd01f8f", "@opam/ppx_deriving@opam:5.2.1@709e53c3", - "@opam/dune@opam:3.20.2@8daef28d" - ], - "available": [ - [ "darwin", "x86_64" ], - [ "darwin", "arm64" ], - [ "linux", "x86_64" ], - [ "windows", "x86_64" ] - ] - }, - "@opam/ppx_deriving_cmdliner@github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c@d41d8cd9": { - "id": "@opam/ppx_deriving_cmdliner@github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c@d41d8cd9", - "name": "@opam/ppx_deriving_cmdliner", - "version": "github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c", - "source": { - "type": "install", - "source": [ - "github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/result@opam:1.5@5a755845", - "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/ppx_deriving@opam:5.2.1@709e53c3", - "@opam/dune@opam:3.20.2@8daef28d", - "@opam/cmdliner@opam:1.3.0@8e6dd99f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/result@opam:1.5@5a755845", - "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/ppx_deriving@opam:5.2.1@709e53c3", - "@opam/dune@opam:3.20.2@8daef28d", - "@opam/cmdliner@opam:1.3.0@8e6dd99f" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -846,19 +813,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/result@opam:1.5@5a755845", + "ocaml@5.2.0@d41d8cd9", "@opam/result@opam:1.5@3a31c126", "@opam/ppxlib@opam:0.35.0@8cd01f8f", "@opam/ppx_derivers@opam:1.2.1@d78727cd", - "@opam/ocamlfind@opam:1.9.8@ee910ff5", - "@opam/dune@opam:3.20.2@8daef28d", "@opam/cppo@opam:1.8.0@b48266ea", + "@opam/ocamlfind@opam:1.9.8@c9de249d", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/cppo@opam:1.8.0@1dba4c9c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/result@opam:1.5@5a755845", + "ocaml@5.2.0@d41d8cd9", "@opam/result@opam:1.5@3a31c126", "@opam/ppxlib@opam:0.35.0@8cd01f8f", "@opam/ppx_derivers@opam:1.2.1@d78727cd", - "@opam/ocamlfind@opam:1.9.8@ee910ff5", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/ocamlfind@opam:1.9.8@c9de249d", + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -885,11 +852,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -916,11 +883,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -942,12 +909,12 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", - "@opam/re@opam:1.14.0@62aa9f42", "@opam/dune@opam:3.20.2@8daef28d", + "@opam/re@opam:1.14.0@62aa9f42", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", - "@opam/re@opam:1.14.0@62aa9f42", "@opam/dune@opam:3.20.2@8daef28d" + "@opam/re@opam:1.14.0@62aa9f42", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -956,8 +923,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/parsexp@opam:v0.17.0@abd42128": { - "id": "@opam/parsexp@opam:v0.17.0@abd42128", + "@opam/parsexp@opam:v0.17.0@a8ef5428": { + "id": "@opam/parsexp@opam:v0.17.0@a8ef5428", "name": "@opam/parsexp", "version": "opam:v0.17.0", "source": { @@ -974,12 +941,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@db8af2c0", + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", - "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@db8af2c0", + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1006,11 +973,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1019,8 +986,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/ocamlgraph@opam:2.2.0@b56b4f3c": { - "id": "@opam/ocamlgraph@opam:2.2.0@b56b4f3c", + "@opam/ocamlgraph@opam:2.2.0@de98ff8c": { + "id": "@opam/ocamlgraph@opam:2.2.0@de98ff8c", "name": "@opam/ocamlgraph", "version": "opam:2.2.0", "source": { @@ -1037,11 +1004,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1050,29 +1017,29 @@ [ "windows", "x86_64" ] ] }, - "@opam/ocamlformat-rpc-lib@opam:0.28.1@4c691df7": { - "id": "@opam/ocamlformat-rpc-lib@opam:0.28.1@4c691df7", + "@opam/ocamlformat-rpc-lib@opam:0.29.0@6c183c49": { + "id": "@opam/ocamlformat-rpc-lib@opam:0.29.0@6c183c49", "name": "@opam/ocamlformat-rpc-lib", - "version": "opam:0.28.1", + "version": "opam:0.29.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/70/70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb#sha256:70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb", - "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.28.1/ocamlformat-0.28.1.tbz#sha256:70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb" + "archive:https://opam.ocaml.org/cache/sha256/da/dac77f0a957ae782bb4b869b07b9803a872a34f8c1eae8901b42d21b623c9db5#sha256:dac77f0a957ae782bb4b869b07b9803a872a34f8c1eae8901b42d21b623c9db5", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.29.0/ocamlformat-0.29.0.tbz#sha256:dac77f0a957ae782bb4b869b07b9803a872a34f8c1eae8901b42d21b623c9db5" ], "opam": { "name": "ocamlformat-rpc-lib", - "version": "0.28.1", - "path": "esy.lock/opam/ocamlformat-rpc-lib.0.28.1" + "version": "0.29.0", + "path": "esy.lock/opam/ocamlformat-rpc-lib.0.29.0" } }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4" ], "available": [ @@ -1082,8 +1049,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/ocamlfind@opam:1.9.8@ee910ff5": { - "id": "@opam/ocamlfind@opam:1.9.8@ee910ff5", + "@opam/ocamlfind@opam:1.9.8@c9de249d": { + "id": "@opam/ocamlfind@opam:1.9.8@c9de249d", "name": "@opam/ocamlfind", "version": "opam:1.9.8", "source": { @@ -1133,11 +1100,11 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/dyn@opam:3.20.2@a43d3aee", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/dyn@opam:3.20.2@a43d3aee", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1146,8 +1113,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/ocamlbuild@opam:0.16.1@b3fc8209": { - "id": "@opam/ocamlbuild@opam:0.16.1@b3fc8209", + "@opam/ocamlbuild@opam:0.16.1@6ccbffe8": { + "id": "@opam/ocamlbuild@opam:0.16.1@6ccbffe8", "name": "@opam/ocamlbuild", "version": "opam:0.16.1", "source": { @@ -1174,29 +1141,29 @@ [ "windows", "x86_64" ] ] }, - "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73": { - "id": "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.2@c97ac62b": { + "id": "@opam/ocaml_intrinsics_kernel@opam:v0.17.2@c97ac62b", "name": "@opam/ocaml_intrinsics_kernel", - "version": "opam:v0.17.1", + "version": "opam:v0.17.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/56/56ed7d0b0331e5bcfa4e016515c0267d#md5:56ed7d0b0331e5bcfa4e016515c0267d", - "archive:https://github.com/janestreet/ocaml_intrinsics_kernel/archive/refs/tags/v0.17.1.tar.gz#md5:56ed7d0b0331e5bcfa4e016515c0267d" + "archive:https://opam.ocaml.org/cache/md5/94/94d4734d6844417053e93ef0e3b26e33#md5:94d4734d6844417053e93ef0e3b26e33", + "archive:https://github.com/janestreet/ocaml_intrinsics_kernel/archive/refs/tags/v0.17.2.tar.gz#md5:94d4734d6844417053e93ef0e3b26e33" ], "opam": { "name": "ocaml_intrinsics_kernel", - "version": "v0.17.1", - "path": "esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1" + "version": "v0.17.2", + "path": "esy.lock/opam/ocaml_intrinsics_kernel.v0.17.2" } }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1223,11 +1190,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1236,8 +1203,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/ocaml-lsp-server@opam:1.21.0@3b310a8b": { - "id": "@opam/ocaml-lsp-server@opam:1.21.0@3b310a8b", + "@opam/ocaml-lsp-server@opam:1.21.0@72b2aa14": { + "id": "@opam/ocaml-lsp-server@opam:1.21.0@72b2aa14", "name": "@opam/ocaml-lsp-server", "version": "opam:1.21.0", "source": { @@ -1255,47 +1222,47 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/xdg@opam:3.20.2@ade9ef81", + "@opam/xdg@opam:3.24.2@cb11774c", "@opam/stdune@opam:3.20.2@c89dc074", "@opam/spawn@opam:v0.17.0@d0f69739", "@opam/re@opam:1.14.0@62aa9f42", - "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@e7e988bb", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", - "@opam/ocamlformat-rpc-lib@opam:0.28.1@4c691df7", + "@opam/ocamlformat-rpc-lib@opam:0.29.0@6c183c49", "@opam/ocamlc-loc@opam:3.20.2@4ca99b2f", "@opam/merlin-lib@opam:5.3-502@45a1163e", "@opam/lsp@opam:1.21.0@b3c7ba15", "@opam/jsonrpc@opam:1.21.0@06da83d4", "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune-rpc@opam:3.20.2@c55481ce", - "@opam/dune-build-info@opam:3.20.2@a53d0f1c", - "@opam/dune@opam:3.20.2@8daef28d", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.20.2@0904f6e5", + "@opam/dune-build-info@opam:3.24.2@e3506498", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/chrome-trace@opam:3.24.2@cd44885b", "@opam/camlp-streams@opam:5.0.1@8e96208c", - "@opam/base@opam:v0.17.3@78923773", + "@opam/base@opam:v0.17.3@1b4d501e", "@opam/astring@opam:0.8.5@9975798d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/xdg@opam:3.20.2@ade9ef81", + "@opam/xdg@opam:3.24.2@cb11774c", "@opam/stdune@opam:3.20.2@c89dc074", "@opam/spawn@opam:v0.17.0@d0f69739", "@opam/re@opam:1.14.0@62aa9f42", - "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@e7e988bb", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", - "@opam/ocamlformat-rpc-lib@opam:0.28.1@4c691df7", + "@opam/ocamlformat-rpc-lib@opam:0.29.0@6c183c49", "@opam/ocamlc-loc@opam:3.20.2@4ca99b2f", "@opam/merlin-lib@opam:5.3-502@45a1163e", "@opam/lsp@opam:1.21.0@b3c7ba15", "@opam/jsonrpc@opam:1.21.0@06da83d4", "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune-rpc@opam:3.20.2@c55481ce", - "@opam/dune-build-info@opam:3.20.2@a53d0f1c", - "@opam/dune@opam:3.20.2@8daef28d", "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.20.2@0904f6e5", + "@opam/dune-build-info@opam:3.24.2@e3506498", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/chrome-trace@opam:3.24.2@cd44885b", "@opam/camlp-streams@opam:5.0.1@8e96208c", - "@opam/base@opam:v0.17.3@78923773", + "@opam/base@opam:v0.17.3@1b4d501e", "@opam/astring@opam:0.8.5@9975798d" ], "available": [ @@ -1323,11 +1290,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1386,11 +1353,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4" ], "available": [ @@ -1418,11 +1385,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", - "@opam/cppo@opam:1.8.0@b48266ea", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", + "@opam/cppo@opam:1.8.0@1dba4c9c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1449,11 +1416,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1480,11 +1447,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1511,11 +1478,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1545,13 +1512,13 @@ "ocaml@5.2.0@d41d8cd9", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhirCST@opam:20240715@b768dcc7", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhirCST@opam:20240715@b768dcc7", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1580,16 +1547,16 @@ "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/uutf@opam:1.0.4@ba7fbef7", - "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@e7e988bb", "@opam/jsonrpc@opam:1.21.0@06da83d4", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/uutf@opam:1.0.4@ba7fbef7", - "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", + "@opam/ppx_yojson_conv_lib@opam:v0.17.0@e7e988bb", "@opam/jsonrpc@opam:1.21.0@06da83d4", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1616,11 +1583,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1629,20 +1596,20 @@ [ "windows", "x86_64" ] ] }, - "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8": { - "id": "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8", + "@opam/js_of_ocaml-compiler@opam:6.4.1@ca572695": { + "id": "@opam/js_of_ocaml-compiler@opam:6.4.1@ca572695", "name": "@opam/js_of_ocaml-compiler", - "version": "opam:6.0.1", + "version": "opam:6.4.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/81/813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614#sha256:813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614", - "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/6.0.1/js_of_ocaml-6.0.1.tbz#sha256:813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614" + "archive:https://opam.ocaml.org/cache/sha256/e5/e59bbffcaefaba3191620556514b7f53bb3249e3f881a070d72724234dffd819#sha256:e59bbffcaefaba3191620556514b7f53bb3249e3f881a070d72724234dffd819", + "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/6.4.1/js_of_ocaml-6.4.1.tbz#sha256:e59bbffcaefaba3191620556514b7f53bb3249e3f881a070d72724234dffd819" ], "opam": { "name": "js_of_ocaml-compiler", - "version": "6.0.1", - "path": "esy.lock/opam/js_of_ocaml-compiler.6.0.1" + "version": "6.4.1", + "path": "esy.lock/opam/js_of_ocaml-compiler.6.4.1" } }, "overrides": [], @@ -1650,23 +1617,25 @@ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/sedlex@opam:3.7@7fb2caab", "@opam/ppxlib@opam:0.35.0@8cd01f8f", - "@opam/ocamlfind@opam:1.9.8@ee910ff5", + "@opam/ocamlfind@opam:1.9.8@c9de249d", + "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhir@opam:20240715@454ed5d1", - "@opam/dune@opam:3.20.2@8daef28d", - "@opam/cmdliner@opam:1.3.0@8e6dd99f", + "@opam/dune@opam:3.24.2@dc9091c2", + "@opam/cmdliner@opam:2.1.1@071b019b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/sedlex@opam:3.7@7fb2caab", "@opam/ppxlib@opam:0.35.0@8cd01f8f", + "@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede", "@opam/menhirSdk@opam:20240715@9d924351", "@opam/menhirLib@opam:20240715@3e1794bd", "@opam/menhir@opam:20240715@454ed5d1", - "@opam/dune@opam:3.20.2@8daef28d", - "@opam/cmdliner@opam:1.3.0@8e6dd99f" + "@opam/dune@opam:3.24.2@dc9091c2", + "@opam/cmdliner@opam:2.1.1@071b019b" ], "available": [ [ "darwin", "x86_64" ], @@ -1694,11 +1663,11 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/seq@opam:base@5ed5af70", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1721,12 +1690,12 @@ "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", "@opam/fp@github:reasonml/reason-native:fp.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", "@opam/fp@github:reasonml/reason-native:fp.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1748,11 +1717,11 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1761,8 +1730,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/fix@opam:20250919@2cb92ccc": { - "id": "@opam/fix@opam:20250919@2cb92ccc", + "@opam/fix@opam:20250919@c2fe39ac": { + "id": "@opam/fix@opam:20250919@c2fe39ac", "name": "@opam/fix", "version": "opam:20250919", "source": { @@ -1779,11 +1748,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1807,13 +1776,13 @@ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", "@opam/re@opam:1.14.0@62aa9f42", "@opam/pastel@github:reasonml/reason-native:pastel.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", "@opam/re@opam:1.14.0@62aa9f42", "@opam/pastel@github:reasonml/reason-native:pastel.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1841,12 +1810,12 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/stdune@opam:3.20.2@c89dc074", - "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/stdune@opam:3.20.2@c89dc074", - "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1875,12 +1844,12 @@ "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1907,19 +1876,19 @@ }, "overrides": [], "dependencies": [ - "@opam/xdg@opam:3.20.2@ade9ef81", + "@opam/xdg@opam:3.24.2@cb11774c", "@opam/stdune@opam:3.20.2@c89dc074", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", "@opam/ocamlc-loc@opam:3.20.2@4ca99b2f", - "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/xdg@opam:3.20.2@ade9ef81", + "@opam/xdg@opam:3.24.2@cb11774c", "@opam/stdune@opam:3.20.2@c89dc074", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", "@opam/ocamlc-loc@opam:3.20.2@4ca99b2f", - "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dyn@opam:3.20.2@a43d3aee", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4" ], "available": [ @@ -1929,31 +1898,31 @@ [ "windows", "x86_64" ] ] }, - "@opam/dune-configurator@opam:3.20.2@7eb6ff01": { - "id": "@opam/dune-configurator@opam:3.20.2@7eb6ff01", + "@opam/dune-configurator@opam:3.24.2@7928eaef": { + "id": "@opam/dune-configurator@opam:3.24.2@7928eaef", "name": "@opam/dune-configurator", - "version": "opam:3.20.2", + "version": "opam:3.24.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/b1/b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549", - "archive:https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" + "archive:https://opam.ocaml.org/cache/sha256/47/472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a", + "archive:https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" ], "opam": { "name": "dune-configurator", - "version": "3.20.2", - "path": "esy.lock/opam/dune-configurator.3.20.2" + "version": "3.24.2", + "path": "esy.lock/opam/dune-configurator.3.24.2" } }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ], @@ -1964,29 +1933,29 @@ [ "windows", "x86_64" ] ] }, - "@opam/dune-build-info@opam:3.20.2@a53d0f1c": { - "id": "@opam/dune-build-info@opam:3.20.2@a53d0f1c", + "@opam/dune-build-info@opam:3.24.2@e3506498": { + "id": "@opam/dune-build-info@opam:3.24.2@e3506498", "name": "@opam/dune-build-info", - "version": "opam:3.20.2", + "version": "opam:3.24.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/b1/b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549", - "archive:https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" + "archive:https://opam.ocaml.org/cache/sha256/47/472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a", + "archive:https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" ], "opam": { "name": "dune-build-info", - "version": "3.20.2", - "path": "esy.lock/opam/dune-build-info.3.20.2" + "version": "3.24.2", + "path": "esy.lock/opam/dune-build-info.3.24.2" } }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -1995,20 +1964,20 @@ [ "windows", "x86_64" ] ] }, - "@opam/dune@opam:3.20.2@8daef28d": { - "id": "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dune@opam:3.24.2@dc9091c2": { + "id": "@opam/dune@opam:3.24.2@dc9091c2", "name": "@opam/dune", - "version": "opam:3.20.2", + "version": "opam:3.24.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/b1/b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549", - "archive:https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" + "archive:https://opam.ocaml.org/cache/sha256/47/472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a", + "archive:https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" ], "opam": { "name": "dune", - "version": "3.20.2", - "path": "esy.lock/opam/dune.3.20.2" + "version": "3.24.2", + "path": "esy.lock/opam/dune.3.24.2" } }, "overrides": [], @@ -2046,11 +2015,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -2059,8 +2028,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/cppo@opam:1.8.0@b48266ea": { - "id": "@opam/cppo@opam:1.8.0@b48266ea", + "@opam/cppo@opam:1.8.0@1dba4c9c": { + "id": "@opam/cppo@opam:1.8.0@1dba4c9c", "name": "@opam/cppo", "version": "opam:1.8.0", "source": { @@ -2077,12 +2046,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@opam/base-unix@opam:base@87d0b2eb" ], "available": [ @@ -2112,20 +2081,20 @@ [ "windows", "x86_64" ] ] }, - "@opam/cmdliner@opam:1.3.0@8e6dd99f": { - "id": "@opam/cmdliner@opam:1.3.0@8e6dd99f", + "@opam/cmdliner@opam:2.1.1@071b019b": { + "id": "@opam/cmdliner@opam:2.1.1@071b019b", "name": "@opam/cmdliner", - "version": "opam:1.3.0", + "version": "opam:2.1.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/4c/4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283#sha512:4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283", - "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-1.3.0.tbz#sha512:4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283" + "archive:https://opam.ocaml.org/cache/sha512/cd/cdc338ae2e56a72b7c75dae9564c57cca4e1fbfac454aabbf8303fcb612346284aede5984dfde7e8a7a496cc870bbd57ddf28cab3a38667279b31657f85c15dd#sha512:cdc338ae2e56a72b7c75dae9564c57cca4e1fbfac454aabbf8303fcb612346284aede5984dfde7e8a7a496cc870bbd57ddf28cab3a38667279b31657f85c15dd", + "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-2.1.1.tbz#sha512:cdc338ae2e56a72b7c75dae9564c57cca4e1fbfac454aabbf8303fcb612346284aede5984dfde7e8a7a496cc870bbd57ddf28cab3a38667279b31657f85c15dd" ], "opam": { "name": "cmdliner", - "version": "1.3.0", - "path": "esy.lock/opam/cmdliner.1.3.0" + "version": "2.1.1", + "path": "esy.lock/opam/cmdliner.2.1.1" } }, "overrides": [], @@ -2155,13 +2124,13 @@ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", "@opam/re@opam:1.14.0@62aa9f42", "@opam/pastel@github:reasonml/reason-native:pastel.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/reason@opam:3.15.0@b096e175", "@opam/re@opam:1.14.0@62aa9f42", "@opam/pastel@github:reasonml/reason-native:pastel.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -2170,29 +2139,29 @@ [ "windows", "x86_64" ] ] }, - "@opam/chrome-trace@opam:3.20.2@0904f6e5": { - "id": "@opam/chrome-trace@opam:3.20.2@0904f6e5", + "@opam/chrome-trace@opam:3.24.2@cd44885b": { + "id": "@opam/chrome-trace@opam:3.24.2@cd44885b", "name": "@opam/chrome-trace", - "version": "opam:3.20.2", + "version": "opam:3.24.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/b1/b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549", - "archive:https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz#sha256:b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" + "archive:https://opam.ocaml.org/cache/sha256/47/472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a", + "archive:https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz#sha256:472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" ], "opam": { "name": "chrome-trace", - "version": "3.20.2", - "path": "esy.lock/opam/chrome-trace.3.20.2" + "version": "3.24.2", + "path": "esy.lock/opam/chrome-trace.3.24.2" } }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -2219,11 +2188,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -2232,15 +2201,15 @@ [ "windows", "x86_64" ] ] }, - "@opam/bigstringaf@opam:0.10.0@445b7d74": { - "id": "@opam/bigstringaf@opam:0.10.0@445b7d74", + "@opam/bigstringaf@opam:0.10.0@bfac02ce": { + "id": "@opam/bigstringaf@opam:0.10.0@bfac02ce", "name": "@opam/bigstringaf", "version": "opam:0.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/be/be0a44416840852777651150757a0a3b#md5:be0a44416840852777651150757a0a3b", - "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.10.0.tar.gz#md5:be0a44416840852777651150757a0a3b" + "archive:https://opam.ocaml.org/cache/sha512/b5/b51c756925d7016ffd7eac49e69393a1897391ca2685a8c30c7b6e3917b4d66c9400b49e8986d0f03329197b95ad52e096ff83dea5e03571cb5bc3d9a5170602#sha512:b51c756925d7016ffd7eac49e69393a1897391ca2685a8c30c7b6e3917b4d66c9400b49e8986d0f03329197b95ad52e096ff83dea5e03571cb5bc3d9a5170602", + "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.10.0.tar.gz#sha512:b51c756925d7016ffd7eac49e69393a1897391ca2685a8c30c7b6e3917b4d66c9400b49e8986d0f03329197b95ad52e096ff83dea5e03571cb5bc3d9a5170602" ], "opam": { "name": "bigstringaf", @@ -2251,13 +2220,13 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", - "@opam/dune-configurator@opam:3.20.2@7eb6ff01", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-configurator@opam:3.24.2@7928eaef", + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9", - "@opam/dune-configurator@opam:3.20.2@7eb6ff01", - "@opam/dune@opam:3.20.2@8daef28d" + "@opam/dune-configurator@opam:3.24.2@7928eaef", + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -2312,8 +2281,8 @@ [ "windows", "x86_64" ] ] }, - "@opam/base@opam:v0.17.3@78923773": { - "id": "@opam/base@opam:v0.17.3@78923773", + "@opam/base@opam:v0.17.3@1b4d501e": { + "id": "@opam/base@opam:v0.17.3@1b4d501e", "name": "@opam/base", "version": "opam:v0.17.3", "source": { @@ -2330,16 +2299,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", - "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73", - "@opam/dune-configurator@opam:3.20.2@7eb6ff01", - "@opam/dune@opam:3.20.2@8daef28d", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@db8af2c0", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.2@c97ac62b", + "@opam/dune-configurator@opam:3.24.2@7928eaef", + "@opam/dune@opam:3.24.2@dc9091c2", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697", - "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73", - "@opam/dune-configurator@opam:3.20.2@7eb6ff01", - "@opam/dune@opam:3.20.2@8daef28d" + "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@db8af2c0", + "@opam/ocaml_intrinsics_kernel@opam:v0.17.2@c97ac62b", + "@opam/dune-configurator@opam:3.24.2@7928eaef", + "@opam/dune@opam:3.24.2@dc9091c2" ], "available": [ [ "darwin", "x86_64" ], @@ -2367,8 +2336,8 @@ "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/topkg@opam:1.1.1@2377d2f8", - "@opam/ocamlfind@opam:1.9.8@ee910ff5", - "@opam/ocamlbuild@opam:0.16.1@b3fc8209", + "@opam/ocamlfind@opam:1.9.8@c9de249d", + "@opam/ocamlbuild@opam:0.16.1@6ccbffe8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@5.2.0@d41d8cd9" ], @@ -2399,13 +2368,13 @@ "dependencies": [ "ocaml@5.2.0@d41d8cd9", "@opam/ocaml-syntax-shims@opam:1.0.0@9f361fbb", - "@opam/dune@opam:3.20.2@8daef28d", - "@opam/bigstringaf@opam:0.10.0@445b7d74", + "@opam/dune@opam:3.24.2@dc9091c2", + "@opam/bigstringaf@opam:0.10.0@bfac02ce", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.20.2@8daef28d", - "@opam/bigstringaf@opam:0.10.0@445b7d74" + "ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.24.2@dc9091c2", + "@opam/bigstringaf@opam:0.10.0@bfac02ce" ], "available": [ [ "darwin", "x86_64" ], @@ -2414,24 +2383,25 @@ [ "windows", "x86_64" ] ] }, - "@grain/libbinaryen@124.0.1@d41d8cd9": { - "id": "@grain/libbinaryen@124.0.1@d41d8cd9", + "@grain/libbinaryen@127.0.0@d41d8cd9": { + "id": "@grain/libbinaryen@127.0.0@d41d8cd9", "name": "@grain/libbinaryen", - "version": "124.0.1", + "version": "127.0.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-124.0.1.tgz#sha1:7b29acc4a62ab5a849c6e01c3d8e90c78efd05f2" + "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-127.0.0.tgz#sha1:ab94716e590c89241c24f690b81b54481cef60cd" ] }, "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", - "@opam/dune-configurator@opam:3.20.2@7eb6ff01", - "@opam/dune@opam:3.20.2@8daef28d", + "@opam/dune-configurator@opam:3.24.2@7928eaef", + "@opam/dune@opam:3.24.2@dc9091c2", "@opam/conf-cmake@github:grain-lang/cmake:esy.json#033cab656dc71a6488b3c1ca6ea45099f794bd03@d41d8cd9" ], "devDependencies": [], + "installConfig": { "pnp": false }, "available": [ [ "darwin", "x86_64" ], [ "darwin", "arm64" ], @@ -2449,27 +2419,26 @@ "ocaml@5.2.0@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/utf8@github:reasonml/reason-native:utf8.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", "@opam/uri@opam:4.4.0@b5659e45", - "@opam/sexplib@opam:v0.17.0@4be4450b", + "@opam/sexplib@opam:v0.17.0@a275c991", "@opam/sedlex@opam:3.7@7fb2caab", "@opam/reason@opam:3.15.0@b096e175", - "@opam/ppx_sexp_conv@opam:v0.17.0@4ebeb9aa", + "@opam/ppx_sexp_conv@opam:v0.17.0@ffcb9022", "@opam/ppx_deriving_yojson@opam:3.9.1@528d884f", - "@opam/ppx_deriving_cmdliner@github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c@d41d8cd9", "@opam/ppx_deriving@opam:5.2.1@709e53c3", - "@opam/ocamlgraph@opam:2.2.0@b56b4f3c", + "@opam/ocamlgraph@opam:2.2.0@de98ff8c", "@opam/menhir@opam:20240715@454ed5d1", "@opam/fs@github:reasonml/reason-native:fs.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", "@opam/fp@github:reasonml/reason-native:fp.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/dune-configurator@opam:3.20.2@7eb6ff01", - "@opam/dune-build-info@opam:3.20.2@a53d0f1c", - "@opam/dune@opam:3.20.2@8daef28d", - "@opam/cmdliner@opam:1.3.0@8e6dd99f", - "@grain/binaryen.ml@0.34.0@d41d8cd9" + "@opam/dune-configurator@opam:3.24.2@7928eaef", + "@opam/dune-build-info@opam:3.24.2@e3506498", + "@opam/dune@opam:3.24.2@dc9091c2", + "@opam/cmdliner@opam:2.1.1@071b019b", + "@grain/binaryen.ml@0.37.0@d41d8cd9" ], "devDependencies": [ "@opam/rely@github:reasonml/reason-native:rely.opam#20b1997b6451d9715dfdbeec86a9d274c7430ed8@d41d8cd9", - "@opam/ocaml-lsp-server@opam:1.21.0@3b310a8b", - "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8" + "@opam/ocaml-lsp-server@opam:1.21.0@72b2aa14", + "@opam/js_of_ocaml-compiler@opam:6.4.1@ca572695" ], "installConfig": { "pnp": false }, "available": [ @@ -2479,24 +2448,25 @@ [ "windows", "x86_64" ] ] }, - "@grain/binaryen.ml@0.34.0@d41d8cd9": { - "id": "@grain/binaryen.ml@0.34.0@d41d8cd9", + "@grain/binaryen.ml@0.37.0@d41d8cd9": { + "id": "@grain/binaryen.ml@0.37.0@d41d8cd9", "name": "@grain/binaryen.ml", - "version": "0.34.0", + "version": "0.37.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@grain/binaryen.ml/-/binaryen.ml-0.34.0.tgz#sha1:522d1b2c2109a92c4ebe9f9b422c29a64e0b590f" + "archive:https://registry.npmjs.org/@grain/binaryen.ml/-/binaryen.ml-0.37.0.tgz#sha1:e96ccd97ac18280999f6f10304eebf548225436b" ] }, "overrides": [], "dependencies": [ "ocaml@5.2.0@d41d8cd9", - "@opam/dune-configurator@opam:3.20.2@7eb6ff01", - "@opam/dune@opam:3.20.2@8daef28d", - "@grain/libbinaryen@124.0.1@d41d8cd9" + "@opam/dune-configurator@opam:3.24.2@7928eaef", + "@opam/dune@opam:3.24.2@dc9091c2", + "@grain/libbinaryen@127.0.0@d41d8cd9" ], "devDependencies": [], + "installConfig": { "pnp": false }, "available": [ [ "darwin", "x86_64" ], [ "darwin", "arm64" ], diff --git a/compiler/esy.lock/opam/base.v0.17.3/opam b/compiler/esy.lock/opam/base.v0.17.3/opam index 76d5609f44..12cc82fdc3 100644 --- a/compiler/esy.lock/opam/base.v0.17.3/opam +++ b/compiler/esy.lock/opam/base.v0.17.3/opam @@ -11,12 +11,12 @@ build: [ ] depends: [ "ocaml" {>= "5.1.0"} - "ocaml_intrinsics_kernel" {>= "v0.17.0" & < "v0.18.0"} - "sexplib0" {>= "v0.17.0" & < "v0.18.0"} + "ocaml_intrinsics_kernel" {>= "v0.17.0" & < "v0.18~"} + "sexplib0" {>= "v0.17.0" & < "v0.18~"} "dune" {>= "3.11.0"} "dune-configurator" ] -available: arch != "arm32" & arch != "x86_32" +available: arch != "x86_32" synopsis: "Full standard library replacement for OCaml" description: " Full standard library replacement for OCaml @@ -39,3 +39,5 @@ url { "sha512=628610caff7e124631870fa1e29661caac28bdfdb18750ee43b868037da3d65d6dd9023b4be7c4c52405679efb5e865a6632d95606a22b28a36636a6bf706ef3" ] } +x-maintenance-intent: ["(latest)"] + diff --git a/compiler/esy.lock/opam/bigstringaf.0.10.0/opam b/compiler/esy.lock/opam/bigstringaf.0.10.0/opam index 1c3031ec4b..ddd9f7357c 100644 --- a/compiler/esy.lock/opam/bigstringaf.0.10.0/opam +++ b/compiler/esy.lock/opam/bigstringaf.0.10.0/opam @@ -44,5 +44,9 @@ So here they are. Go crazy. """ url { src: "https://github.com/inhabitedtype/bigstringaf/archive/0.10.0.tar.gz" - checksum: "md5=be0a44416840852777651150757a0a3b" + checksum: [ + "sha512=b51c756925d7016ffd7eac49e69393a1897391ca2685a8c30c7b6e3917b4d66c9400b49e8986d0f03329197b95ad52e096ff83dea5e03571cb5bc3d9a5170602" + "sha256=ed92f5b05fbc11b9defcec734d59b1068f3717a9ae4f9705c16c7f7ac3729f28" + "md5=be0a44416840852777651150757a0a3b" + ] } diff --git a/compiler/esy.lock/opam/chrome-trace.3.20.2/opam b/compiler/esy.lock/opam/chrome-trace.3.24.2/opam similarity index 61% rename from compiler/esy.lock/opam/chrome-trace.3.20.2/opam rename to compiler/esy.lock/opam/chrome-trace.3.24.2/opam index a443a69073..04aa6d2612 100644 --- a/compiler/esy.lock/opam/chrome-trace.3.20.2/opam +++ b/compiler/esy.lock/opam/chrome-trace.3.24.2/opam @@ -9,16 +9,14 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.20"} - "ocaml" {>= "4.08.0"} + "dune" {>= "3.24"} + "ocaml" {>= "4.14"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" @@ -32,10 +30,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz" checksum: [ - "sha256=b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" - "sha512=ed14df9163e487d4ae7d0a2427eaab7823ef1f0ef2d93f0b783e6f163bbd5b44ba73f055d60b84e76f476fe11d38e794013628a1da776d9ec13cca9666e7b7ff" + "sha256=472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" + "sha512=13082a66a28e940d4b3c9f78b556f6c1455987cd522355ba4502e01e60a3d002d3101b51284726ae21aa87494efa2dc54d016173f05b616bbc5dad714d5714a3" ] } -x-commit-hash: "1e54fd3f450aae7fb41ffb6b7c8b7a5aed754777" +x-commit-hash: "ce734ac25ffb06994a4530426bb06ee8cda19e50" diff --git a/compiler/esy.lock/opam/cmdliner.1.3.0/opam b/compiler/esy.lock/opam/cmdliner.2.1.1/opam similarity index 53% rename from compiler/esy.lock/opam/cmdliner.1.3.0/opam rename to compiler/esy.lock/opam/cmdliner.2.1.1/opam index a44943d88c..58f7bac180 100644 --- a/compiler/esy.lock/opam/cmdliner.1.3.0/opam +++ b/compiler/esy.lock/opam/cmdliner.2.1.1/opam @@ -6,16 +6,17 @@ for OCaml. It provides a simple and compositional mechanism to convert command line arguments to OCaml values and pass them to your functions. The -module automatically handles syntax errors, help messages and UNIX man -page generation. It supports programs with single or multiple commands -and respects most of the [POSIX][1] and [GNU][2] conventions. +module automatically handles command line completion, syntax errors, +help messages and UNIX man page generation. It supports programs with +single or multiple commands and respects most of the [POSIX] and [GNU] +conventions. Cmdliner has no dependencies and is distributed under the ISC license. -[1]: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap12.html -[2]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html +Homepage: -Home page: http://erratique.ch/software/cmdliner""" +[POSIX]: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap12.html +[GNU]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html""" maintainer: "Daniel Bünzli " authors: "The cmdliner programmers" license: "ISC" @@ -28,13 +29,28 @@ depends: [ ] build: [make "all" "PREFIX=%{prefix}%"] install: [ - [make "install" "LIBDIR=%{_:lib}%" "DOCDIR=%{_:doc}%"] - [make "install-doc" "LIBDIR=%{_:lib}%" "DOCDIR=%{_:doc}%"] + [ + make + "install" + "BINDIR=%{_:bin}%" + "LIBDIR=%{_:lib}%" + "DOCDIR=%{_:doc}%" + "SHAREDIR=%{share}%" + "MANDIR=%{man}%" + ] + [ + make + "install-doc" + "LIBDIR=%{_:lib}%" + "DOCDIR=%{_:doc}%" + "SHAREDIR=%{share}%" + "MANDIR=%{man}%" + ] ] dev-repo: "git+https://erratique.ch/repos/cmdliner.git" url { - src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.3.0.tbz" + src: "https://erratique.ch/software/cmdliner/releases/cmdliner-2.1.1.tbz" checksum: - "sha512=4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283" + "sha512=cdc338ae2e56a72b7c75dae9564c57cca4e1fbfac454aabbf8303fcb612346284aede5984dfde7e8a7a496cc870bbd57ddf28cab3a38667279b31657f85c15dd" } x-maintenance-intent: ["(latest)"] \ No newline at end of file diff --git a/compiler/esy.lock/opam/cppo.1.8.0/opam b/compiler/esy.lock/opam/cppo.1.8.0/opam index 85270a79f8..d7047f391c 100644 --- a/compiler/esy.lock/opam/cppo.1.8.0/opam +++ b/compiler/esy.lock/opam/cppo.1.8.0/opam @@ -35,7 +35,7 @@ build: [ "-j" jobs "@install" - "@runtest" {with-test} + "@runtest" {with-test & dune:version < "3.24"} "@doc" {with-doc} ] ] diff --git a/compiler/esy.lock/opam/dune-build-info.3.20.2/opam b/compiler/esy.lock/opam/dune-build-info.3.24.2/opam similarity index 69% rename from compiler/esy.lock/opam/dune-build-info.3.20.2/opam rename to compiler/esy.lock/opam/dune-build-info.3.24.2/opam index b267876a6f..923ba3b8c7 100644 --- a/compiler/esy.lock/opam/dune-build-info.3.20.2/opam +++ b/compiler/esy.lock/opam/dune-build-info.3.24.2/opam @@ -15,16 +15,14 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.20"} - "ocaml" {>= "4.08"} + "dune" {>= "3.24"} + "ocaml" {>= "4.14"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" @@ -38,10 +36,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz" checksum: [ - "sha256=b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" - "sha512=ed14df9163e487d4ae7d0a2427eaab7823ef1f0ef2d93f0b783e6f163bbd5b44ba73f055d60b84e76f476fe11d38e794013628a1da776d9ec13cca9666e7b7ff" + "sha256=472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" + "sha512=13082a66a28e940d4b3c9f78b556f6c1455987cd522355ba4502e01e60a3d002d3101b51284726ae21aa87494efa2dc54d016173f05b616bbc5dad714d5714a3" ] } -x-commit-hash: "1e54fd3f450aae7fb41ffb6b7c8b7a5aed754777" +x-commit-hash: "ce734ac25ffb06994a4530426bb06ee8cda19e50" diff --git a/compiler/esy.lock/opam/dune-configurator.3.20.2/opam b/compiler/esy.lock/opam/dune-configurator.3.24.2/opam similarity index 69% rename from compiler/esy.lock/opam/dune-configurator.3.20.2/opam rename to compiler/esy.lock/opam/dune-configurator.3.24.2/opam index 7c2d966501..c56b132e69 100644 --- a/compiler/esy.lock/opam/dune-configurator.3.20.2/opam +++ b/compiler/esy.lock/opam/dune-configurator.3.24.2/opam @@ -17,8 +17,8 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.20"} - "ocaml" {>= "4.08.0"} + "dune" {>= "3.24"} + "ocaml" {>= "4.14"} "base-unix" "csexp" {>= "1.5.0"} "odoc" {with-doc} @@ -27,8 +27,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" @@ -42,10 +40,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz" checksum: [ - "sha256=b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" - "sha512=ed14df9163e487d4ae7d0a2427eaab7823ef1f0ef2d93f0b783e6f163bbd5b44ba73f055d60b84e76f476fe11d38e794013628a1da776d9ec13cca9666e7b7ff" + "sha256=472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" + "sha512=13082a66a28e940d4b3c9f78b556f6c1455987cd522355ba4502e01e60a3d002d3101b51284726ae21aa87494efa2dc54d016173f05b616bbc5dad714d5714a3" ] } -x-commit-hash: "1e54fd3f450aae7fb41ffb6b7c8b7a5aed754777" +x-commit-hash: "ce734ac25ffb06994a4530426bb06ee8cda19e50" diff --git a/compiler/esy.lock/opam/dune.3.20.2/opam b/compiler/esy.lock/opam/dune.3.24.2/opam similarity index 69% rename from compiler/esy.lock/opam/dune.3.20.2/opam rename to compiler/esy.lock/opam/dune.3.24.2/opam index 66482648ac..6a1192ada6 100644 --- a/compiler/esy.lock/opam/dune.3.20.2/opam +++ b/compiler/esy.lock/opam/dune.3.24.2/opam @@ -43,32 +43,37 @@ build: [ depends: [ # Please keep the lower bound in sync with .github/workflows/workflow.yml, # dune-project and min_ocaml_version in bootstrap.ml - "ocaml" {>= "4.08"} + ("ocaml" {>= "4.14"} | ("ocaml" {>= "4.02" & < "4.14~~"} & "ocamlfind-secondary" & "ocaml-secondary-compiler" {>= "4.14"})) "base-unix" "base-threads" "lwt" { with-dev-setup & os != "win32" } "cinaps" { with-dev-setup } "csexp" { with-dev-setup & >= "1.3.0" } - "js_of_ocaml" { with-dev-setup & >= "6.1.0" & os != "win32" } - "js_of_ocaml-compiler" { with-dev-setup & >= "6.1.0" & os != "win32" } + "js_of_ocaml" { with-dev-setup & >= "6.1.0" & < "6.4" & os != "win32" } + "js_of_ocaml-compiler" { with-dev-setup & >= "6.1.0" & < "6.4" & os != "win32" } "mdx" { with-dev-setup & >= "2.3.0" & os != "win32" } "menhir" { with-dev-setup & os != "win32" } "ocamlfind" { with-dev-setup & os != "win32" } - "odoc" { with-dev-setup & >= "2.4.0" & os != "win32" } + "odoc" { with-dev-setup & >= "3.2.0" & os != "win32" } "ppx_expect" { with-dev-setup & >= "v0.17" & os != "win32" } + "ppx_optcomp" {with-dev-setup} "spawn" { with-dev-setup } "ppx_inline_test" { with-dev-setup & os != "win32" } - "ppxlib" { with-dev-setup & >= "0.35.0" & os != "win32" } + "ppxlib" { with-dev-setup & >= "0.37.0" & os != "win32" } "ctypes" { with-dev-setup & os != "win32" } "utop" { with-dev-setup & >= "2.6.0" & os != "win32" } - "melange" { with-dev-setup & >= "5.1.0-51" & os != "win32" } + "melange" { with-dev-setup & >= "5.1.0-51" & < "7.0" & os != "win32" } + "uutf" { with-dev-setup } + # the rev store negotiation test launches a git daemon, needs it to be + # installed on some distributions + "conf-git-daemon" { with-test } ] url { src: - "https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz" checksum: [ - "sha256=b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" - "sha512=ed14df9163e487d4ae7d0a2427eaab7823ef1f0ef2d93f0b783e6f163bbd5b44ba73f055d60b84e76f476fe11d38e794013628a1da776d9ec13cca9666e7b7ff" + "sha256=472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" + "sha512=13082a66a28e940d4b3c9f78b556f6c1455987cd522355ba4502e01e60a3d002d3101b51284726ae21aa87494efa2dc54d016173f05b616bbc5dad714d5714a3" ] } -x-commit-hash: "1e54fd3f450aae7fb41ffb6b7c8b7a5aed754777" +x-commit-hash: "ce734ac25ffb06994a4530426bb06ee8cda19e50" diff --git a/compiler/esy.lock/opam/fix.20250919/opam b/compiler/esy.lock/opam/fix.20250919/opam index 42f55f4875..a9ad807331 100644 --- a/compiler/esy.lock/opam/fix.20250919/opam +++ b/compiler/esy.lock/opam/fix.20250919/opam @@ -16,6 +16,7 @@ depends: [ "dune" { >= "1.3" } ] synopsis: "Algorithmic building blocks for memoization, recursion, and more" +tags: ["algorithms"] url { src: "https://gitlab.inria.fr/fpottier/fix/-/archive/20250919/archive.tar.gz" diff --git a/compiler/esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam b/compiler/esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam deleted file mode 100644 index ed835fe87d..0000000000 --- a/compiler/esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam +++ /dev/null @@ -1,56 +0,0 @@ -opam-version: "2.0" -synopsis: "Compiler from OCaml bytecode to JavaScript" -description: - "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js" -maintainer: ["Ocsigen team "] -authors: ["Ocsigen team "] -license: [ - "GPL-2.0-or-later" "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -] -homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" -doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview" -bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues" -depends: [ - "dune" {>= "3.17"} - "ocaml" {>= "4.08" & < "5.4"} - "num" {with-test} - "ppx_expect" {>= "v0.16.1" & with-test} - "ppxlib" {>= "0.15.0" & < "0.36.0"} - "re" {with-test} - "cmdliner" {>= "1.1.0"} - "sedlex" {>= "3.3"} - "qcheck" {with-test} - "menhir" - "menhirLib" - "menhirSdk" - "yojson" {>= "2.1"} - "odoc" {with-doc} -] -depopts: ["ocamlfind"] -conflicts: [ - "ocamlfind" {< "1.5.1"} - "js_of_ocaml" {< "3.0"} -] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: - "https://github.com/ocsigen/js_of_ocaml/releases/download/6.0.1/js_of_ocaml-6.0.1.tbz" - checksum: [ - "sha256=813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614" - "sha512=194ae5d1122171fa8253b6a41438a2fc330caf4ab6dd008fcce1253fd51fbe4b1149813da6075c5deb52ea136143def57c83c3f4e32421803d7699648fdc563b" - ] -} -x-commit-hash: "b6d60e4f8ff35e7c7b3bb52b97ffedc3eb8e3d08" diff --git a/compiler/esy.lock/opam/js_of_ocaml-compiler.6.4.1/opam b/compiler/esy.lock/opam/js_of_ocaml-compiler.6.4.1/opam new file mode 100644 index 0000000000..fd3a9af63d --- /dev/null +++ b/compiler/esy.lock/opam/js_of_ocaml-compiler.6.4.1/opam @@ -0,0 +1,67 @@ +opam-version: "2.0" +synopsis: "Compiler from OCaml bytecode to JavaScript" +description: + "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js" +maintainer: ["Ocsigen team "] +authors: ["Ocsigen team "] +license: [ + "GPL-2.0-or-later" "LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +] +homepage: "https://ocsigen.org/js_of_ocaml/latest/js_of_ocaml/overview.html" +doc: "https://ocsigen.org/js_of_ocaml/latest/js_of_ocaml/overview.html" +bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues" +depends: [ + "dune" {>= "3.20"} + "ocaml" {>= "4.13" & < "5.6"} + "num" {with-test} + "ppx_expect" {>= "v0.16.1" & with-test} + "ppxlib" {>= "0.33"} + "ocaml-compiler-libs" {>= "v0.12.4"} + "re" {with-test} + "cmdliner" {>= "2.0"} + "sedlex" {>= "3.3"} + "qcheck" {with-test} + "menhir" {>= "20180523"} + "menhirLib" + "menhirSdk" + "yojson" {>= "2.1"} + "odoc" {with-doc} +] +depopts: ["ocamlfind"] +conflicts: [ + "ocamlfind" {< "1.5.1"} + "js_of_ocaml" {< "3.0"} +] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" +x-maintenance-intent: ["(latest)"] +build: [ + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] + ["cmdliner" "install" "tool-support" + "--update-opam-install=%{_:name}%.install" + "_build/install/default/bin/js_of_ocaml" {os-family != "windows"} + "_build/install/default/bin/js_of_ocaml.exe:js_of_ocaml" {os-family = "windows"} + "_build/cmdliner-install"] + ["cmdliner" "install" "tool-support" + "--update-opam-install=%{_:name}%.install" + "_build/install/default/bin/jsoo_minify" {os-family != "windows"} + "_build/install/default/bin/jsoo_minify.exe:jsoo_minify" {os-family = "windows"} + "_build/cmdliner-install"] +] +url { + src: + "https://github.com/ocsigen/js_of_ocaml/releases/download/6.4.1/js_of_ocaml-6.4.1.tbz" + checksum: [ + "sha256=e59bbffcaefaba3191620556514b7f53bb3249e3f881a070d72724234dffd819" + "sha512=bb470f316f9c81a3b2b8dedd0b0f18f8e06beb48dd70df1d9f846de90ffab439cab5ef7a93a8166af0998068b06097e8319bc0d9f4f23a7159b0de8b3b515746" + ] +} +x-commit-hash: "02ac3ba6a21f6f58b0a4c69b799ac6f43023d674" diff --git a/compiler/esy.lock/opam/ocaml-lsp-server.1.21.0/opam b/compiler/esy.lock/opam/ocaml-lsp-server.1.21.0/opam index 36b3654ece..d0430f4480 100644 --- a/compiler/esy.lock/opam/ocaml-lsp-server.1.21.0/opam +++ b/compiler/esy.lock/opam/ocaml-lsp-server.1.21.0/opam @@ -25,10 +25,10 @@ depends: [ "jsonrpc" {= version} "re" {>= "1.5.0"} "ppx_yojson_conv_lib" {>= "v0.14"} - "dune-rpc" {>= "3.4.0"} + "dune-rpc" {>= "3.4.0" & < "3.22"} "chrome-trace" {>= "3.3.0"} "dyn" - "stdune" + "stdune" {< "3.22"} "fiber" {>= "3.1.1" & < "4.0.0"} "ocaml" {>= "5.2.0" & < "5.3"} "xdg" diff --git a/compiler/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam b/compiler/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.2/opam similarity index 80% rename from compiler/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam rename to compiler/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.2/opam index 44be91382e..3044ccc549 100644 --- a/compiler/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam +++ b/compiler/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.2/opam @@ -22,9 +22,9 @@ Provides functions to invoke amd64 instructions (such as cmov, min/maxsd, popcnt " url { src: - "https://github.com/janestreet/ocaml_intrinsics_kernel/archive/refs/tags/v0.17.1.tar.gz" + "https://github.com/janestreet/ocaml_intrinsics_kernel/archive/refs/tags/v0.17.2.tar.gz" checksum: [ - "md5=56ed7d0b0331e5bcfa4e016515c0267d" - "sha512=21e596d6407a620866cee7cab47ef1a9446d6a733b4994e809ea5566d5fa956682a5c6a6190ffb0ed48458abd658301944ed10c4389d91ecb8df677a5f87f2ab" + "md5=94d4734d6844417053e93ef0e3b26e33" + "sha512=21397340656d9fbe8dc079d5772bb4ca3e9c8c9c235fe2bddbbabe75fff7d38afc95f10d16f71ad0ab67f9e6fcb4ce08bece8b56cb2b37904c7210c45aa44bb5" ] } diff --git a/compiler/esy.lock/opam/ocamlbuild.0.16.1/opam b/compiler/esy.lock/opam/ocamlbuild.0.16.1/opam index 83ff57358d..ba51b4c0e4 100644 --- a/compiler/esy.lock/opam/ocamlbuild.0.16.1/opam +++ b/compiler/esy.lock/opam/ocamlbuild.0.16.1/opam @@ -28,6 +28,7 @@ build: [ conflicts: [ "base-ocamlbuild" "ocamlfind" {< "1.6.2"} + "relocatable" ] depends: [ diff --git a/compiler/esy.lock/opam/ocamlfind.1.9.8/opam b/compiler/esy.lock/opam/ocamlfind.1.9.8/opam index d9fe3931fb..e0aebc71b9 100644 --- a/compiler/esy.lock/opam/ocamlfind.1.9.8/opam +++ b/compiler/esy.lock/opam/ocamlfind.1.9.8/opam @@ -12,9 +12,10 @@ license: "MIT" homepage: "http://projects.camlcity.org/projects/findlib.html" bug-reports: "https://github.com/ocaml/ocamlfind/issues" depends: [ - "ocaml" {>= "3.08.0"} + "ocaml" {>= "3.08.0" & (os != "cygwin" & os-distribution != "msys2" | < "5.0") & < "5.5.0~"} ] depopts: ["graphics"] +conflicts: ["relocatable"] build: [ [ "./configure" diff --git a/compiler/esy.lock/opam/ocamlformat-rpc-lib.0.28.1/opam b/compiler/esy.lock/opam/ocamlformat-rpc-lib.0.29.0/opam similarity index 78% rename from compiler/esy.lock/opam/ocamlformat-rpc-lib.0.28.1/opam rename to compiler/esy.lock/opam/ocamlformat-rpc-lib.0.29.0/opam index dfb78af3e7..f6d10a4d93 100644 --- a/compiler/esy.lock/opam/ocamlformat-rpc-lib.0.28.1/opam +++ b/compiler/esy.lock/opam/ocamlformat-rpc-lib.0.29.0/opam @@ -40,10 +40,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git" url { src: - "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.28.1/ocamlformat-0.28.1.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.29.0/ocamlformat-0.29.0.tbz" checksum: [ - "sha256=70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb" - "sha512=8de0517165c6f0cadcedcce66e57cb723956768a8068abd062243abb08fabf292283d0d284be230aa5647d0883a4dc7f28fcf1b70338a2b0c9b17a5bed1bbb71" + "sha256=dac77f0a957ae782bb4b869b07b9803a872a34f8c1eae8901b42d21b623c9db5" + "sha512=b4ae6fda3c28e91dc12411b577df7b216e9b1afe5887bcb9e89c158e1313dc92183c29ffb256f47f5c9384af3ac8c505ec76849b26ae950b82c9b4c21a460819" ] } -x-commit-hash: "809492a6044557239ed1e1c2f78eec602f068ea4" +x-commit-hash: "195e470387ecdcfb0f9ce309b0d8d17807bde25d" diff --git a/compiler/esy.lock/opam/ocamlgraph.2.2.0/opam b/compiler/esy.lock/opam/ocamlgraph.2.2.0/opam index 64256c9ac1..c01c0966f8 100644 --- a/compiler/esy.lock/opam/ocamlgraph.2.2.0/opam +++ b/compiler/esy.lock/opam/ocamlgraph.2.2.0/opam @@ -13,6 +13,7 @@ tags: [ "edge" "persistent" "imperative" + "data-structures" ] homepage: "https://github.com/backtracking/ocamlgraph/" doc: "https://backtracking.github.io/ocamlgraph" diff --git a/compiler/esy.lock/opam/parsexp.v0.17.0/opam b/compiler/esy.lock/opam/parsexp.v0.17.0/opam index ebf870952b..8037de3bdc 100644 --- a/compiler/esy.lock/opam/parsexp.v0.17.0/opam +++ b/compiler/esy.lock/opam/parsexp.v0.17.0/opam @@ -11,7 +11,7 @@ build: [ ] depends: [ "ocaml" {>= "5.1.0"} - "sexplib0" {>= "v0.17" & < "v0.18"} + "sexplib0" {>= "v0.17" & < "v0.18~"} "dune" {>= "3.11.0"} ] available: arch != "x86_32" @@ -41,3 +41,5 @@ url { src: "https://github.com/janestreet/parsexp/archive/refs/tags/v0.17.0.tar.gz" checksum: "sha256=a3d10edbc4f98d16357b644d550fd1c06f4d9aa4990ab8ee6da01276c24d55b5" } +x-maintenance-intent: ["(latest)"] + diff --git a/compiler/esy.lock/opam/ppx_sexp_conv.v0.17.0/opam b/compiler/esy.lock/opam/ppx_sexp_conv.v0.17.0/opam index bb7dfb87f2..052768a0f7 100644 --- a/compiler/esy.lock/opam/ppx_sexp_conv.v0.17.0/opam +++ b/compiler/esy.lock/opam/ppx_sexp_conv.v0.17.0/opam @@ -11,9 +11,9 @@ build: [ ] depends: [ "ocaml" {>= "5.1.0"} - "base" {>= "v0.17" & < "v0.18"} - "ppxlib_jane" {>= "v0.17" & < "v0.18"} - "sexplib0" {>= "v0.17" & < "v0.18"} + "base" {>= "v0.17" & < "v0.18~"} + "ppxlib_jane" {>= "v0.17" & < "v0.18~"} + "sexplib0" {>= "v0.17" & < "v0.18~"} "dune" {>= "3.11.0"} "ppxlib" {>= "0.28.0" & < "0.36.0"} ] diff --git a/compiler/esy.lock/opam/ppx_yojson_conv_lib.v0.17.0/opam b/compiler/esy.lock/opam/ppx_yojson_conv_lib.v0.17.0/opam index d58fda4ff5..44492a505a 100644 --- a/compiler/esy.lock/opam/ppx_yojson_conv_lib.v0.17.0/opam +++ b/compiler/esy.lock/opam/ppx_yojson_conv_lib.v0.17.0/opam @@ -23,3 +23,5 @@ url { src: "https://github.com/janestreet/ppx_yojson_conv_lib/archive/refs/tags/v0.17.0.tar.gz" checksum: "sha256=f6e6ee92408c53c5ecd8bb5ae93811aa4cf71f8dc144d5943be8fc2c7697b199" } +x-maintenance-intent: ["(latest)"] + diff --git a/compiler/esy.lock/opam/result.1.5/opam b/compiler/esy.lock/opam/result.1.5/opam index da55ed4631..403a43cb5a 100644 --- a/compiler/esy.lock/opam/result.1.5/opam +++ b/compiler/esy.lock/opam/result.1.5/opam @@ -23,3 +23,5 @@ url { "md5=1b82dec78849680b49ae9a8a365b831b" ] } +x-maintenance-intent: ["(latest)"] + diff --git a/compiler/esy.lock/opam/sexplib.v0.17.0/opam b/compiler/esy.lock/opam/sexplib.v0.17.0/opam index 4b081e8ea4..68513f3bb8 100644 --- a/compiler/esy.lock/opam/sexplib.v0.17.0/opam +++ b/compiler/esy.lock/opam/sexplib.v0.17.0/opam @@ -11,8 +11,8 @@ build: [ ] depends: [ "ocaml" {>= "5.1.0"} - "parsexp" {>= "v0.17" & < "v0.18"} - "sexplib0" {>= "v0.17" & < "v0.18"} + "parsexp" {>= "v0.17" & < "v0.18~"} + "sexplib0" {>= "v0.17" & < "v0.18~"} "dune" {>= "3.11.0"} "num" ] diff --git a/compiler/esy.lock/opam/sexplib0.v0.17.0/opam b/compiler/esy.lock/opam/sexplib0.v0.17.0/opam index 7cd4cf8fbb..78a325dbeb 100644 --- a/compiler/esy.lock/opam/sexplib0.v0.17.0/opam +++ b/compiler/esy.lock/opam/sexplib0.v0.17.0/opam @@ -29,3 +29,5 @@ url { "sha512=ad387e40789fe70a11473db7e85fe017b801592624414e9030730b2e92ea08f98095fb6e9236430f33c801605ebee0a2a6284e0f618a26a7da4599d4fd9d395d" ] } +x-maintenance-intent: ["(latest)"] + diff --git a/compiler/esy.lock/opam/xdg.3.20.2/opam b/compiler/esy.lock/opam/xdg.3.24.2/opam similarity index 61% rename from compiler/esy.lock/opam/xdg.3.20.2/opam rename to compiler/esy.lock/opam/xdg.3.24.2/opam index 6383c894af..7f38675deb 100644 --- a/compiler/esy.lock/opam/xdg.3.20.2/opam +++ b/compiler/esy.lock/opam/xdg.3.24.2/opam @@ -9,16 +9,14 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.20"} - "ocaml" {>= "4.08"} + "dune" {>= "3.24"} + "ocaml" {>= "4.14"} "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" @@ -32,10 +30,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.20.2/dune-3.20.2.tbz" + "https://github.com/ocaml/dune/releases/download/3.24.2/dune-3.24.2.tbz" checksum: [ - "sha256=b1a86b2d60bdb4a8b9bb6861bdf2f9f28a6e7cb5d833ce81afecceb9ef9ca549" - "sha512=ed14df9163e487d4ae7d0a2427eaab7823ef1f0ef2d93f0b783e6f163bbd5b44ba73f055d60b84e76f476fe11d38e794013628a1da776d9ec13cca9666e7b7ff" + "sha256=472798691b0216daf538709f0f4703b3617ef24ad0866c9096068baaba4d762a" + "sha512=13082a66a28e940d4b3c9f78b556f6c1455987cd522355ba4502e01e60a3d002d3101b51284726ae21aa87494efa2dc54d016173f05b616bbc5dad714d5714a3" ] } -x-commit-hash: "1e54fd3f450aae7fb41ffb6b7c8b7a5aed754777" +x-commit-hash: "ce734ac25ffb06994a4530426bb06ee8cda19e50" diff --git a/compiler/grainc/grainc.re b/compiler/grainc/grainc.re index 5b834e94ea..7e6c10de18 100644 --- a/compiler/grainc/grainc.re +++ b/compiler/grainc/grainc.re @@ -107,20 +107,18 @@ let output_file_conv = { let s_dir = dirname(s); Sys.file_exists(s_dir) ? if (Sys.is_directory(s_dir)) { - `Ok(s); + Ok(s); } else { - `Error(sprintf("`%s' is not a directory", s_dir)); + Error(sprintf("`%s' is not a directory", s_dir)); } - : `Error(sprintf("no `%s' directory", s_dir)); + : Error(sprintf("no `%s' directory", s_dir)); }; - (parse, Format.pp_print_string); -}; - -let input_file_conv = { - open Arg; - let (prsr, prntr) = non_dir_file; - - (filename => prsr(filename), prntr); + Cmdliner.Arg.Conv.make( + ~docv="FILE", + ~parser=parse, + ~pp=Format.pp_print_string, + (), + ); }; let input_filename = { @@ -128,7 +126,7 @@ let input_filename = { let docv = "FILE"; Arg.( required - & pos(~rev=true, 0, some(input_file_conv), None) + & pos(~rev=true, 0, some(non_dir_file), None) & info([], ~docv, ~doc) ); }; diff --git a/compiler/graindoc/dune b/compiler/graindoc/dune index 0a409ac2b6..e573b57514 100644 --- a/compiler/graindoc/dune +++ b/compiler/graindoc/dune @@ -20,6 +20,4 @@ grain_utils graindoc.docblock binaryen - dune-build-info) - (preprocess - (pps ppx_deriving_cmdliner))) + dune-build-info)) diff --git a/compiler/graindoc/graindoc.re b/compiler/graindoc/graindoc.re index 4b8586eeba..0268d1e9f8 100644 --- a/compiler/graindoc/graindoc.re +++ b/compiler/graindoc/graindoc.re @@ -27,23 +27,18 @@ let () = } ); -[@deriving cmdliner] type io_params = { /** Grain source file or directory of source files to document */ - [@pos 0] [@docv "FILE"] input: ExistingFileOrDirectory.t, /** Output file or directory */ - [@name "o"] [@docv "FILE"] output: option(MaybeExistingFileOrDirectory.t), }; -[@deriving cmdliner] type params = { /** The version to use as current when generating markdown for `@since` and `@history` attributes. Any future versions will be replace with `next` in the output. */ - [@name "current-version"] [@docv "VERSION"] current_version: option(string), }; @@ -227,6 +222,61 @@ let graindoc = (opts, runs) => { ); }; +// Cmdliner io params +let input = { + let doc = "Grain source file or directory of source files to document"; + let docv = "FILE"; + Arg.( + required + & pos( + ~rev=true, + 0, + some(ExistingFileOrDirectory.cmdliner_converter), + None, + ) + & info([], ~docv, ~doc) + ); +}; + +let output = { + let doc = "Output file or directory"; + let docv = "FILE"; + Arg.( + value + & opt(some(MaybeExistingFileOrDirectory.cmdliner_converter), None) + & info(["o"], ~docv, ~doc) + ); +}; + +let io_params = + Term.( + const((input, output) => + { + input, + output, + } + ) + $ input + $ output + ); + +// Cmdliner params +let current_version = { + let doc = "The version to use as current when generating markdown for `@since` and `@history` attributes. \ + Any future versions will be replace with `next` in the output."; + let docv = "VERSION"; + Arg.( + value + & opt(some(string), None) + & info(["current-version"], ~docv, ~doc) + ); +}; +let params = + Term.( + const(current_version => {current_version: current_version}) + $ current_version + ); + let cmd = { open Term; @@ -240,8 +290,8 @@ let cmd = { Cmd.v( Cmd.info(Sys.argv[0], ~version, ~doc), Grain_utils.Config.with_cli_options(graindoc) - $ params_cmdliner_term() - $ ret(const(enumerate_runs) $ io_params_cmdliner_term()), + $ params + $ ret(const(enumerate_runs) $ io_params), ); }; diff --git a/compiler/grainformat/dune b/compiler/grainformat/dune index d15a7a51b8..c6076dec14 100644 --- a/compiler/grainformat/dune +++ b/compiler/grainformat/dune @@ -14,6 +14,4 @@ grain_parsing grain_formatting binaryen - dune-build-info) - (preprocess - (pps ppx_deriving_cmdliner))) + dune-build-info)) diff --git a/compiler/grainformat/grainformat.re b/compiler/grainformat/grainformat.re index f724abe527..8cee777c13 100644 --- a/compiler/grainformat/grainformat.re +++ b/compiler/grainformat/grainformat.re @@ -6,13 +6,10 @@ open Grain_utils; open Grain_formatting; open Grain_utils.Filepath.Args; -[@deriving cmdliner] type io_params = { /** Grain source file or directory of source files to format */ - [@pos 0] [@docv "FILE"] input: ExistingFileOrDirectory.t, /** Output file or directory */ - [@name "o"] [@docv "FILE"] output: option(MaybeExistingFileOrDirectory.t), }; @@ -170,6 +167,43 @@ let grainformat = runs => { ); }; +let input = { + let doc = "Grain source file or directory of source files to format"; + let docv = "FILE"; + Arg.( + required + & pos( + ~rev=true, + 0, + some(ExistingFileOrDirectory.cmdliner_converter), + None, + ) + & info([], ~docv, ~doc) + ); +}; + +let output = { + let doc = "Output file or directory"; + let docv = "FILE"; + Arg.( + value + & opt(some(MaybeExistingFileOrDirectory.cmdliner_converter), None) + & info(["o"], ~docv, ~doc) + ); +}; + +let io_params = + Term.( + const((input, output) => + { + input, + output, + } + ) + $ input + $ output + ); + let cmd = { open Term; @@ -183,7 +217,7 @@ let cmd = { Cmd.v( Cmd.info(Sys.argv[0], ~version, ~doc), Config.with_cli_options(grainformat) - $ ret(const(enumerate_runs) $ io_params_cmdliner_term()), + $ ret(const(enumerate_runs) $ io_params), ); }; diff --git a/compiler/src/codegen/optimize_mod.re b/compiler/src/codegen/optimize_mod.re index f8ddfdbec2..430f4be34c 100644 --- a/compiler/src/codegen/optimize_mod.re +++ b/compiler/src/codegen/optimize_mod.re @@ -1,7 +1,7 @@ open Binaryen; open Grain_utils; -// Defaults from https://github.com/WebAssembly/binaryen/blob/version_124/src/pass.h#L247-L248 +// Defaults from https://github.com/WebAssembly/binaryen/blob/version_127/src/pass.h#L247-L248 let default_optimize_level = 2; let default_shrink_level = 1; @@ -12,7 +12,7 @@ let has_multivalue = wasm_mod => let has_strings = wasm_mod => List.mem(Module.Feature.strings, Module.get_features(wasm_mod)); -// Translation of https://github.com/WebAssembly/binaryen/blob/version_124/src/passes/pass.cpp#L738-L777 +// Translation of https://github.com/WebAssembly/binaryen/blob/version_127/src/passes/pass.cpp#L745-L791 let default_global_optimization_pre_passes = (~optimize_level, ~shrink_level, wasm_mod) => { List.concat([ @@ -58,14 +58,22 @@ let default_global_optimization_pre_passes = if (Settings.get_closed_world()) { [ Passes.remove_unused_types, - Passes.cfp, - Passes.gsi, - Passes.abstract_type_refining, - Passes.unsubtyping, + // Allow ref.tests in cfp if we are aggressively optimizing for speed. + if (optimize_level >= 3) { + Passes.cfp_reftest; + } else { + Passes.cfp; + }, ]; } else { []; }, + [Passes.gsi], + if (Settings.get_closed_world()) { + [Passes.abstract_type_refining, Passes.unsubtyping]; + } else { + []; + }, ]); } else { []; @@ -73,7 +81,7 @@ let default_global_optimization_pre_passes = ]); }; -// Translation of https://github.com/WebAssembly/binaryen/blob/version_124/src/passes/pass.cpp#L626-L736 +// Translation of https://github.com/WebAssembly/binaryen/blob/version_127/src/passes/pass.cpp#L633-L743 let default_function_optimization_passes = (~optimize_level, ~shrink_level, wasm_mod) => { List.concat([ @@ -231,7 +239,7 @@ let default_function_optimization_passes = ]); }; -// Translation of https://github.com/WebAssembly/binaryen/blob/version_124/src/passes/pass.cpp#L788-L821 +// Translation of https://github.com/WebAssembly/binaryen/blob/version_127/src/passes/pass.cpp#L802-L835 let default_global_optimization_post_passes = (~optimize_level, ~shrink_level, wasm_mod) => { List.concat([ @@ -287,7 +295,7 @@ let optimize = ~shrink_level=default_shrink_level, wasm_mod, ) => { - // Translation of https://github.com/WebAssembly/binaryen/blob/version_124/src/passes/pass.cpp#L620-L624 + // Translation of https://github.com/WebAssembly/binaryen/blob/version_127/src/passes/pass.cpp#L627-L631 let default_optimizations_passes = List.concat([ default_global_optimization_pre_passes( diff --git a/compiler/src/utils/config.re b/compiler/src/utils/config.re index 252e82221b..5f62a11c2f 100644 --- a/compiler/src/utils/config.re +++ b/compiler/src/utils/config.re @@ -315,18 +315,6 @@ let preserve_config = thunk => { let preserve_all_configs = thunk => preserve_root_config(() => preserve_config(thunk)); -let option_conv = ((prsr, prntr)) => ( - x => - switch (prsr(x)) { - | `Ok(a) => `Ok(Some(a)) - | `Error(a) => `Error(a) - }, - ppf => - fun - | None => Format.fprintf(ppf, "") - | Some(x) => prntr(ppf, x), -); - type profile = | Release; @@ -334,7 +322,7 @@ let profile = opt( ~doc="Set a compilation profile.", ~names=["profile"], - ~conv=option_conv(Cmdliner.Arg.enum([("release", Release)])), + ~conv=Cmdliner.Arg.some(Cmdliner.Arg.enum([("release", Release)])), ~digestible=Digestible, None, ); @@ -345,7 +333,7 @@ let memory_base = opt( ~doc="Set the start address for the Grain runtime heap.", ~names=["memory-base"], - ~conv=option_conv(Cmdliner.Arg.int), + ~conv=Cmdliner.Arg.some(Cmdliner.Arg.int), ~digestible=Digestible, None, ); @@ -363,7 +351,7 @@ let include_dirs = let stdlib_dir = opt( ~names=["stdlib"], - ~conv=option_conv(Cmdliner.Arg.string), + ~conv=Cmdliner.Arg.some(Cmdliner.Arg.string), ~doc="Path to the standard library (stdlib) directory", ~env="GRAIN_STDLIB", ~digestible=NotDigestible, @@ -390,7 +378,7 @@ let initial_memory_pages = let maximum_memory_pages = opt( ~names=["maximum-memory-pages"], - ~conv=option_conv(Cmdliner.Arg.int), + ~conv=Cmdliner.Arg.some(Cmdliner.Arg.int), ~doc="Maximum number of WebAssembly memory pages", ~digestible=NotDigestible, None, @@ -500,7 +488,7 @@ let bulk_memory = let wasi_polyfill = opt( ~names=["wasi-polyfill"], - ~conv=option_conv(Cmdliner.Arg.string), + ~conv=Cmdliner.Arg.some(Cmdliner.Arg.string), ~doc="Custom WASI implementation", ~digestible=NotDigestible, None, diff --git a/compiler/src/utils/filepath.re b/compiler/src/utils/filepath.re index 051eec4247..0d672df028 100644 --- a/compiler/src/utils/filepath.re +++ b/compiler/src/utils/filepath.re @@ -182,15 +182,15 @@ module Args = { let prsr = fname => { switch (query(fname)) { - | Ok(file) => `Ok(file) + | Ok(file) => Ok(file) | Error(NotFile(path)) => - `Error( + Error( Format.sprintf("%s exists but is not a file", to_string(path)), ) | Error(NotExists(path)) => - `Error(Format.sprintf("%s does not exist", to_string(path))) + Error(Format.sprintf("%s does not exist", to_string(path))) | Error(InvalidPath(fname)) => - `Error(Format.sprintf("Invalid path: %s", fname)) + Error(Format.sprintf("Invalid path: %s", fname)) }; }; @@ -198,7 +198,8 @@ module Args = { Format.fprintf(formatter, "File: %s", to_string(value)); }; - let cmdliner_converter = (prsr, prntr); + let cmdliner_converter = + Cmdliner.Arg.Conv.make(~docv="FILE", ~parser=prsr, ~pp=prntr, ()); }; module ExistingFileOrDirectory = { @@ -229,18 +230,18 @@ module Args = { let prsr = fname => { switch (query(fname)) { - | Ok(file) => `Ok(file) + | Ok(file) => Ok(file) | Error(InvalidFileType(path)) => - `Error( + Error( Format.sprintf( "%s exists but is not a file or directory", to_string(path), ), ) | Error(NotExists(path)) => - `Error(Format.sprintf("%s does not exist", to_string(path))) + Error(Format.sprintf("%s does not exist", to_string(path))) | Error(InvalidPath(fname)) => - `Error(Format.sprintf("Invalid path: %s", fname)) + Error(Format.sprintf("Invalid path: %s", fname)) }; }; @@ -252,7 +253,8 @@ module Args = { }; }; - let cmdliner_converter = (prsr, prntr); + let cmdliner_converter = + Cmdliner.Arg.Conv.make(~docv="FILE", ~parser=prsr, ~pp=prntr, ()); }; module MaybeExistingFile = { @@ -262,14 +264,14 @@ module Args = { let prsr = fname => { switch (ExistingFile.query(fname)) { - | Ok(path) => `Ok(Exists(path)) - | Error(NotExists(path)) => `Ok(NotExists(path)) + | Ok(path) => Ok(Exists(path)) + | Error(NotExists(path)) => Ok(NotExists(path)) | Error(NotFile(path)) => - `Error( + Error( Format.sprintf("%s exists but is not a file", to_string(path)), ) | Error(InvalidPath(fname)) => - `Error(Format.sprintf("Invalid path: %s", fname)) + Error(Format.sprintf("Invalid path: %s", fname)) }; }; @@ -282,7 +284,8 @@ module Args = { }; }; - let cmdliner_converter = (prsr, prntr); + let cmdliner_converter = + Cmdliner.Arg.Conv.make(~docv="FILE", ~parser=prsr, ~pp=prntr, ()); }; module MaybeExistingFileOrDirectory = { @@ -292,17 +295,17 @@ module Args = { let prsr = fname => { switch (ExistingFileOrDirectory.query(fname)) { - | Ok(path) => `Ok(Exists(path)) - | Error(NotExists(path)) => `Ok(NotExists(path)) + | Ok(path) => Ok(Exists(path)) + | Error(NotExists(path)) => Ok(NotExists(path)) | Error(InvalidFileType(path)) => - `Error( + Error( Format.sprintf( "%s exists but is not a file or directory", to_string(path), ), ) | Error(InvalidPath(fname)) => - `Error(Format.sprintf("Invalid path: %s", fname)) + Error(Format.sprintf("Invalid path: %s", fname)) }; }; @@ -317,6 +320,7 @@ module Args = { }; }; - let cmdliner_converter = (prsr, prntr); + let cmdliner_converter = + Cmdliner.Arg.Conv.make(~docv="FILE", ~parser=prsr, ~pp=prntr, ()); }; };