From f05d21d983cabd9aea067521976fd6827a154f49 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sun, 3 Sep 2023 17:33:45 -0700 Subject: [PATCH 01/14] update jsoo for testing --- compiler/esy.json | 2 +- .../opam | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) rename compiler/esy.lock/opam/{js_of_ocaml-compiler.5.0.1 => js_of_ocaml-compiler.5.4.0}/opam (70%) diff --git a/compiler/esy.json b/compiler/esy.json index 43f55795ec..898d365be6 100644 --- a/compiler/esy.json +++ b/compiler/esy.json @@ -54,7 +54,7 @@ "ocaml": "4.14.1000" }, "devDependencies": { - "@opam/js_of_ocaml-compiler": "5.0.1", + "@opam/js_of_ocaml-compiler": "5.4.0", "@opam/ocaml-lsp-server": "1.14.1", "@opam/rely": "^4.0.0" }, diff --git a/compiler/esy.lock/opam/js_of_ocaml-compiler.5.0.1/opam b/compiler/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam similarity index 70% rename from compiler/esy.lock/opam/js_of_ocaml-compiler.5.0.1/opam rename to compiler/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam index 0917978df8..d25dd008eb 100644 --- a/compiler/esy.lock/opam/js_of_ocaml-compiler.5.0.1/opam +++ b/compiler/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam @@ -4,19 +4,21 @@ 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 AND LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +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.2"} - "ocaml" {>= "4.04" & < "5.1"} + "dune" {>= "3.7"} + "ocaml" {>= "4.08" & < "5.2"} "num" {with-test} "ppx_expect" {>= "v0.14.2" & with-test} "ppxlib" {>= "0.15.0"} "re" {with-test} "cmdliner" {>= "1.1.0"} + "sedlex" {>= "2.3"} "menhir" "menhirLib" "menhirSdk" @@ -44,10 +46,10 @@ build: [ ] url { src: - "https://github.com/ocsigen/js_of_ocaml/releases/download/5.0.1/js_of_ocaml-5.0.1.tbz" + "https://github.com/ocsigen/js_of_ocaml/releases/download/5.4.0/js_of_ocaml-5.4.0.tbz" checksum: [ - "sha256=7a210f1ca16a742381947dc67c3d8d9f4c94fbf20738744b1353897985b61069" - "sha512=07a973561190686d56bd5d56d9a275e177716ea8b9720f6acc7ddf8618680844a6d0c798447567ea9542d83bab524c165d076f3cce0769a12fc483ef8cd6a733" + "sha256=f1215de133867fefdb16e2798a225ee0446469a57462af0deebdd22d2a8d3b94" + "sha512=610cd22818bc6f0a0163f0eec74f58338e18709a6101639f65e58241a9216ed286c3cb091b41e36a82c926de5f030d718a6e76a493e885e61456047a8da153c9" ] } -x-commit-hash: "66570bae49d9fae4341bc548dde9f944afe3b41a" +x-commit-hash: "705b9e39bfb6ab22afbb606dc85c81d1c30faff4" From 03dc521470faf97097240a41c89a5d4554729c53 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 4 Sep 2023 08:40:15 -0700 Subject: [PATCH 02/14] debug times for jsoo --- compiler/grainc/dune | 2 +- compiler/graindoc/dune | 2 +- compiler/grainformat/dune | 2 +- compiler/grainlsp/dune | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/grainc/dune b/compiler/grainc/dune index d3badcfbe1..e47b42e87c 100644 --- a/compiler/grainc/dune +++ b/compiler/grainc/dune @@ -9,4 +9,4 @@ (:include ./config/flags.sexp))) (libraries grain grain_diagnostics binaryen dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet))) + (flags --no-sourcemap --no-extern-fs --debug times))) diff --git a/compiler/graindoc/dune b/compiler/graindoc/dune index d60378893c..dbedf6d255 100644 --- a/compiler/graindoc/dune +++ b/compiler/graindoc/dune @@ -18,4 +18,4 @@ (preprocess (pps ppx_deriving_cmdliner)) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet))) + (flags --no-sourcemap --no-extern-fs --debug times))) diff --git a/compiler/grainformat/dune b/compiler/grainformat/dune index 90d1ad7e06..476b2fd190 100644 --- a/compiler/grainformat/dune +++ b/compiler/grainformat/dune @@ -12,4 +12,4 @@ (preprocess (pps ppx_deriving_cmdliner)) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet))) + (flags --no-sourcemap --no-extern-fs --debug times))) diff --git a/compiler/grainlsp/dune b/compiler/grainlsp/dune index 26f090ca4e..12dc40fe98 100644 --- a/compiler/grainlsp/dune +++ b/compiler/grainlsp/dune @@ -10,5 +10,5 @@ (libraries cmdliner grain_utils grain_language_server grain_formatting dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet) + (flags --no-sourcemap --no-extern-fs --debug times) (javascript_files hacks.js))) From ac48c17c04699125cb1793dae64f79ff34d5f9cc Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sun, 15 Oct 2023 13:32:51 -0700 Subject: [PATCH 03/14] pin jsoo for testing --- compiler/esy.json | 3 +- compiler/esy.lock/index.json | 615 +++++++++++------- .../opam/js_of_ocaml-compiler.5.4.0/opam | 55 -- 3 files changed, 377 insertions(+), 296 deletions(-) delete mode 100644 compiler/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam diff --git a/compiler/esy.json b/compiler/esy.json index 898d365be6..7e321fff52 100644 --- a/compiler/esy.json +++ b/compiler/esy.json @@ -54,11 +54,12 @@ "ocaml": "4.14.1000" }, "devDependencies": { - "@opam/js_of_ocaml-compiler": "5.4.0", + "@opam/js_of_ocaml-compiler": ">=5.4.0", "@opam/ocaml-lsp-server": "1.14.1", "@opam/rely": "^4.0.0" }, "resolutions": { + "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c", "@opam/fp": "reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/fs": "reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/ppx_deriving_cmdliner": "hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c", diff --git a/compiler/esy.lock/index.json b/compiler/esy.lock/index.json index ba2bd5d473..a8b293f7fc 100644 --- a/compiler/esy.lock/index.json +++ b/compiler/esy.lock/index.json @@ -34,12 +34,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/cppo@opam:1.6.9@db929a12", + "ocaml@4.14.1000@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.14.1000@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, @@ -61,11 +64,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/uutf@opam:1.0.3@47c95a18": { @@ -86,20 +91,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "ocaml@4.14.1000@d41d8cd9", + "@opam/topkg@opam:1.0.7@7ee47d76", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", "@opam/cmdliner@opam:1.2.0@b0c6143c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] }, "@opam/utf8@github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": - "@opam/utf8@github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": "@opam/utf8@github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/utf8", - "version": - "github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": "github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -108,11 +112,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, @@ -134,13 +141,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stringext@opam:1.6.0@ac4f328b", + "ocaml@4.14.1000@d41d8cd9", + "@opam/stringext@opam:1.6.0@ac4f328b", "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/angstrom@opam:0.15.0@105656d9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stringext@opam:1.6.0@ac4f328b", + "ocaml@4.14.1000@d41d8cd9", + "@opam/stringext@opam:1.6.0@ac4f328b", "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/angstrom@opam:0.15.0@105656d9" ] @@ -163,7 +172,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "ocaml@4.14.1000@d41d8cd9", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -190,11 +200,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/stdune@opam:3.11.1@9a840882": { @@ -215,17 +227,21 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "ocaml@4.14.1000@d41d8cd9", + "@opam/pp@opam:1.2.0@16430027", "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "ocaml@4.14.1000@d41d8cd9", + "@opam/pp@opam:1.2.0@16430027", "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ] @@ -248,11 +264,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/spawn@opam:v0.15.1@85e9d6f1": { @@ -273,11 +291,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/sexplib0@opam:v0.15.1@51111c0c": { @@ -298,11 +318,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/sexplib@opam:v0.15.1@1824bfd6": { @@ -323,13 +345,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/parsexp@opam:v0.15.0@742345c3", "@opam/num@opam:1.4@16d26a67", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.15.1@51111c0c", + "@opam/parsexp@opam:v0.15.0@742345c3", + "@opam/num@opam:1.4@16d26a67", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/parsexp@opam:v0.15.0@742345c3", "@opam/num@opam:1.4@16d26a67", + "ocaml@4.14.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.15.1@51111c0c", + "@opam/parsexp@opam:v0.15.0@742345c3", + "@opam/num@opam:1.4@16d26a67", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, @@ -339,7 +366,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "seq", "version": "base", @@ -348,9 +375,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] }, "@opam/sedlex@opam:3.2@eab3a2e0": { "id": "@opam/sedlex@opam:3.2@eab3a2e0", @@ -370,13 +398,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/ppxlib@opam:0.29.1@a8bb9506", + "@opam/gen@opam:1.1@059b2731", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/gen@opam:1.1@059b2731", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/ppxlib@opam:0.29.1@a8bb9506", + "@opam/gen@opam:1.1@059b2731", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/result@opam:1.5@1c6a6533": { @@ -397,19 +429,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": - "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/rely", - "version": - "github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": "github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -418,7 +450,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", @@ -427,7 +460,8 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", @@ -453,22 +487,24 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__reason_opam__c__3.9.0_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__reason_opam__c__3.9.0_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", + "ocaml@4.14.1000@d41d8cd9", + "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/merlin-extend@opam:0.6.1@7d979feb", "@opam/menhir@opam:20220210@879a0c13", "@opam/fix@opam:20230505@941a65ff", "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.29.1@a8bb9506", + "ocaml@4.14.1000@d41d8cd9", + "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/merlin-extend@opam:0.6.1@7d979feb", "@opam/menhir@opam:20220210@879a0c13", @@ -495,11 +531,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.14.1000@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, @@ -521,14 +560,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "ocaml@4.14.1000@d41d8cd9", + "@opam/stdlib-shims@opam:0.3.0@72c7bc98", "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "ocaml@4.14.1000@d41d8cd9", + "@opam/stdlib-shims@opam:0.3.0@72c7bc98", "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", @@ -553,11 +595,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, @@ -579,16 +624,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/base@opam:v0.15.1@e8a71f35" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/base@opam:v0.15.1@e8a71f35" ] }, "@opam/ppx_deriving_yojson@opam:3.7.0@167442d6": { @@ -609,14 +657,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/result@opam:1.5@1c6a6533", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/result@opam:1.5@1c6a6533", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", @@ -624,11 +675,9 @@ ] }, "@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", + "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", + "version": "github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c", "source": { "type": "install", "source": [ @@ -637,7 +686,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@4.14.1000@d41d8cd9", + "@opam/result@opam:1.5@1c6a6533", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", "@opam/dune@opam:3.11.1@ba2e0e6a", @@ -645,7 +695,8 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@4.14.1000@d41d8cd9", + "@opam/result@opam:1.5@1c6a6533", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", "@opam/dune@opam:3.11.1@ba2e0e6a", @@ -670,15 +721,18 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@4.14.1000@d41d8cd9", + "@opam/result@opam:1.5@1c6a6533", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/cppo@opam:1.6.9@db929a12", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@4.14.1000@d41d8cd9", + "@opam/result@opam:1.5@1c6a6533", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ppx_derivers@opam:1.2.1@e2cbad12", "@opam/ocamlfind@opam:1.9.6@da5169c7", @@ -703,11 +757,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/pp@opam:1.2.0@16430027": { @@ -728,19 +784,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": - "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/pastel", - "version": - "github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": "github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -749,13 +805,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/re@opam:1.11.0@87deb463", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/re@opam:1.11.0@87deb463", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/re@opam:1.11.0@87deb463", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/re@opam:1.11.0@87deb463", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/parsexp@opam:v0.15.0@742345c3": { @@ -776,14 +836,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/base@opam:v0.15.1@e8a71f35" + "ocaml@4.14.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.15.1@51111c0c", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/base@opam:v0.15.1@e8a71f35" ] }, "@opam/ordering@opam:3.11.1@92c57daa": { @@ -804,11 +867,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/omd@opam:1.3.2@511d53d2": { @@ -829,13 +894,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0" ] @@ -858,11 +925,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/ocamlgraph@opam:2.1.0@c06ba8fc": { @@ -883,11 +952,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "ocaml@4.14.1000@d41d8cd9", + "@opam/stdlib-shims@opam:0.3.0@72c7bc98", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, @@ -909,11 +981,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/csexp@opam:1.5.2@46614bf4", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4" ] }, @@ -935,14 +1010,14 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] }, "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d": { "id": "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", @@ -962,20 +1037,18 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "devDependencies": ["ocaml@4.14.1000@d41d8cd9"], "extraSources": [ { - "checksum": - "sha256:a9b7e1829a3304e5a073d8ddea29d3d8272698e93b7e1ee659ae5e31e5cfb6b9", - "url": - "https://raw.githubusercontent.com/ocaml-opam/opam-repository-mingw/354a87b397856f2a70024c5c83fc5001074935b6/packages/ocamlbuild/ocamlbuild.0.14.2/files/ocamlbuild-0.14.2.patch", + "checksum": "sha256:a9b7e1829a3304e5a073d8ddea29d3d8272698e93b7e1ee659ae5e31e5cfb6b9", + "url": "https://raw.githubusercontent.com/ocaml-opam/opam-repository-mingw/354a87b397856f2a70024c5c83fc5001074935b6/packages/ocamlbuild/ocamlbuild.0.14.2/files/ocamlbuild-0.14.2.patch", "relativePath": "ocamlbuild-0.14.2.patch" } ] @@ -998,11 +1071,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/ocaml-lsp-server@opam:1.14.1@ac41cc96": { @@ -1023,38 +1098,48 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/xdg@opam:3.11.1@1e207b0b", "@opam/uutf@opam:1.0.3@47c95a18", + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", + "@opam/xdg@opam:3.11.1@1e207b0b", + "@opam/uutf@opam:1.0.3@47c95a18", "@opam/stdune@opam:3.11.1@9a840882", - "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.11.0@87deb463", + "@opam/spawn@opam:v0.15.1@85e9d6f1", + "@opam/re@opam:1.11.0@87deb463", "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", "@opam/pp@opam:1.2.0@16430027", "@opam/ordering@opam:3.11.1@92c57daa", "@opam/omd@opam:1.3.2@511d53d2", "@opam/octavius@opam:1.2.2@2205cc65", "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", - "@opam/fiber@opam:3.7.0@d70e2471", "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/fiber@opam:3.7.0@d70e2471", + "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune-rpc@opam:3.11.1@1197fefa", "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/csexp@opam:1.5.2@46614bf4", "@opam/chrome-trace@opam:3.11.1@0e9213a3", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/xdg@opam:3.11.1@1e207b0b", "@opam/uutf@opam:1.0.3@47c95a18", + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", + "@opam/xdg@opam:3.11.1@1e207b0b", + "@opam/uutf@opam:1.0.3@47c95a18", "@opam/stdune@opam:3.11.1@9a840882", - "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.11.0@87deb463", + "@opam/spawn@opam:v0.15.1@85e9d6f1", + "@opam/re@opam:1.11.0@87deb463", "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", "@opam/pp@opam:1.2.0@16430027", "@opam/ordering@opam:3.11.1@92c57daa", "@opam/omd@opam:1.3.2@511d53d2", "@opam/octavius@opam:1.2.2@2205cc65", "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", - "@opam/fiber@opam:3.7.0@d70e2471", "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/fiber@opam:3.7.0@d70e2471", + "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune-rpc@opam:3.11.1@1197fefa", "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/csexp@opam:1.5.2@46614bf4", "@opam/chrome-trace@opam:3.11.1@0e9213a3" ] }, @@ -1076,11 +1161,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/num@opam:1.4@16d26a67": { @@ -1101,15 +1188,15 @@ }, "overrides": [ { - "opamoverride": - "esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override" + "opamoverride": "esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "ocaml@4.14.1000@d41d8cd9", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] }, "@opam/merlin-extend@opam:0.6.1@7d979feb": { "id": "@opam/merlin-extend@opam:0.6.1@7d979feb", @@ -1129,11 +1216,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/cppo@opam:1.6.9@db929a12", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/menhirSdk@opam:20220210@fe146ed3": { @@ -1154,11 +1244,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/menhirLib@opam:20220210@9afeb270": { @@ -1179,11 +1271,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/menhir@opam:20220210@879a0c13": { @@ -1204,35 +1298,33 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", + "ocaml@4.14.1000@d41d8cd9", + "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", + "ocaml@4.14.1000@d41d8cd9", + "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, - "@opam/js_of_ocaml-compiler@opam:5.0.1@49a39906": { - "id": "@opam/js_of_ocaml-compiler@opam:5.0.1@49a39906", + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c@d41d8cd9": { + "id": "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c@d41d8cd9", "name": "@opam/js_of_ocaml-compiler", - "version": "opam:5.0.1", + "version": "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/7a/7a210f1ca16a742381947dc67c3d8d9f4c94fbf20738744b1353897985b61069#sha256:7a210f1ca16a742381947dc67c3d8d9f4c94fbf20738744b1353897985b61069", - "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/5.0.1/js_of_ocaml-5.0.1.tbz#sha256:7a210f1ca16a742381947dc67c3d8d9f4c94fbf20738744b1353897985b61069" - ], - "opam": { - "name": "js_of_ocaml-compiler", - "version": "5.0.1", - "path": "esy.lock/opam/js_of_ocaml-compiler.5.0.1" - } + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c" + ] }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/ocamlfind@opam:1.9.6@da5169c7", "@opam/menhirSdk@opam:20220210@fe146ed3", @@ -1243,7 +1335,8 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/ppxlib@opam:0.29.1@a8bb9506", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", @@ -1270,20 +1363,21 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.14.1000@d41d8cd9", + "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/fs@github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": - "@opam/fs@github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": "@opam/fs@github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/fs", - "version": - "github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": "github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -1292,22 +1386,23 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": - "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/fp", - "version": - "github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": "github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -1316,11 +1411,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, @@ -1342,19 +1440,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": - "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/file-context-printer", - "version": - "github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": "github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -1363,13 +1461,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" @@ -1393,13 +1494,17 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.11.1@9a840882", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/stdune@opam:3.11.1@9a840882", + "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.11.1@9a840882", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/stdune@opam:3.11.1@9a840882", + "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/dyn@opam:3.11.1@d3c74846": { @@ -1420,12 +1525,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "ocaml@4.14.1000@d41d8cd9", + "@opam/pp@opam:1.2.0@16430027", "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "ocaml@4.14.1000@d41d8cd9", + "@opam/pp@opam:1.2.0@16430027", "@opam/ordering@opam:3.11.1@92c57daa", "@opam/dune@opam:3.11.1@ba2e0e6a" ] @@ -1449,16 +1557,21 @@ "overrides": [], "dependencies": [ "@opam/xdg@opam:3.11.1@1e207b0b", - "@opam/stdune@opam:3.11.1@9a840882", "@opam/pp@opam:1.2.0@16430027", + "@opam/stdune@opam:3.11.1@9a840882", + "@opam/pp@opam:1.2.0@16430027", "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/csexp@opam:1.5.2@46614bf4", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/xdg@opam:3.11.1@1e207b0b", - "@opam/stdune@opam:3.11.1@9a840882", "@opam/pp@opam:1.2.0@16430027", + "@opam/stdune@opam:3.11.1@9a840882", + "@opam/pp@opam:1.2.0@16430027", "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4" ] }, @@ -1480,13 +1593,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ] @@ -1509,11 +1624,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/dune@opam:3.11.1@ba2e0e6a": { @@ -1534,12 +1651,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.14.1000@d41d8cd9", + "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.14.1000@d41d8cd9", + "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, @@ -1561,11 +1680,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/cppo@opam:1.6.9@db929a12": { @@ -1586,21 +1707,21 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/base-unix@opam:base@87d0b2eb" ] }, "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9": { - "id": - "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9", + "id": "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9", "name": "@opam/conf-cmake", - "version": - "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", + "version": "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", "source": { "type": "install", "source": [ @@ -1629,16 +1750,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] + "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] }, "@opam/cli@github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": - "@opam/cli@github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": "@opam/cli@github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/cli", - "version": - "github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": "github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -1647,13 +1767,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" @@ -1677,11 +1800,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", + "@opam/dune@opam:3.11.1@ba2e0e6a" ] }, "@opam/bigstringaf@opam:0.9.1@e6f2e882": { @@ -1704,7 +1829,8 @@ "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", @@ -1718,7 +1844,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-unix", "version": "base", @@ -1726,7 +1852,7 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], "devDependencies": [] }, "@opam/base-threads@opam:base@36803084": { @@ -1735,7 +1861,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-threads", "version": "base", @@ -1743,7 +1869,7 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], "devDependencies": [] }, "@opam/base-bytes@opam:base@19d0c2ff": { @@ -1752,7 +1878,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-bytes", "version": "base", @@ -1761,11 +1887,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7", + "ocaml@4.14.1000@d41d8cd9", + "@opam/ocamlfind@opam:1.9.6@da5169c7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.6@da5169c7" + "ocaml@4.14.1000@d41d8cd9", + "@opam/ocamlfind@opam:1.9.6@da5169c7" ] }, "@opam/base-bigarray@opam:base@b03491b0": { @@ -1774,7 +1902,7 @@ "version": "opam:base", "source": { "type": "install", - "source": [ "no-source:" ], + "source": ["no-source:"], "opam": { "name": "base-bigarray", "version": "base", @@ -1782,7 +1910,7 @@ } }, "overrides": [], - "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], + "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], "devDependencies": [] }, "@opam/base@opam:v0.15.1@e8a71f35": { @@ -1803,12 +1931,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.11.1@ba2e0e6a", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@51111c0c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/sexplib0@opam:v0.15.1@51111c0c", "@opam/dune-configurator@opam:3.11.1@24d75a5c", "@opam/dune@opam:3.11.1@ba2e0e6a" ] @@ -1831,14 +1962,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@4.14.1000@d41d8cd9", + "@opam/result@opam:1.5@1c6a6533", "@opam/ocaml-syntax-shims@opam:1.0.0@9f361fbb", "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/bigstringaf@opam:0.9.1@e6f2e882", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@4.14.1000@d41d8cd9", + "@opam/result@opam:1.5@1c6a6533", "@opam/dune@opam:3.11.1@ba2e0e6a", "@opam/bigstringaf@opam:0.9.1@e6f2e882" ] @@ -1870,11 +2003,13 @@ "source": { "type": "link-dev", "path": ".", "manifest": "esy.json" }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.1.1@ad5e299c", + "ocaml@4.14.1000@d41d8cd9", + "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/utf8@github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/uri@opam:4.4.0@f70a0b72", "@opam/sexplib@opam:v0.15.1@1824bfd6", - "@opam/sedlex@opam:3.2@eab3a2e0", "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/sedlex@opam:3.2@eab3a2e0", + "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/ppx_sexp_conv@opam:v0.15.1@0f138aac", "@opam/ppx_deriving_yojson@opam:3.7.0@167442d6", "@opam/ppx_deriving_cmdliner@github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c@d41d8cd9", @@ -1892,7 +2027,7 @@ "devDependencies": [ "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/ocaml-lsp-server@opam:1.14.1@ac41cc96", - "@opam/js_of_ocaml-compiler@opam:5.0.1@49a39906" + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c@d41d8cd9" ], "installConfig": { "pnp": false } }, @@ -1931,4 +2066,4 @@ "devDependencies": [] } } -} \ No newline at end of file +} diff --git a/compiler/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam b/compiler/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam deleted file mode 100644 index d25dd008eb..0000000000 --- a/compiler/esy.lock/opam/js_of_ocaml-compiler.5.4.0/opam +++ /dev/null @@ -1,55 +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.7"} - "ocaml" {>= "4.08" & < "5.2"} - "num" {with-test} - "ppx_expect" {>= "v0.14.2" & with-test} - "ppxlib" {>= "0.15.0"} - "re" {with-test} - "cmdliner" {>= "1.1.0"} - "sedlex" {>= "2.3"} - "menhir" - "menhirLib" - "menhirSdk" - "yojson" - "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/5.4.0/js_of_ocaml-5.4.0.tbz" - checksum: [ - "sha256=f1215de133867fefdb16e2798a225ee0446469a57462af0deebdd22d2a8d3b94" - "sha512=610cd22818bc6f0a0163f0eec74f58338e18709a6101639f65e58241a9216ed286c3cb091b41e36a82c926de5f030d718a6e76a493e885e61456047a8da153c9" - ] -} -x-commit-hash: "705b9e39bfb6ab22afbb606dc85c81d1c30faff4" From b5fe78afde2eeb7bad495e4a80d91c779df8bf56 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sun, 15 Oct 2023 13:33:12 -0700 Subject: [PATCH 04/14] remove jobs on windows --- compiler/esy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/esy.json b/compiler/esy.json index 7e321fff52..d695bd101a 100644 --- a/compiler/esy.json +++ b/compiler/esy.json @@ -25,7 +25,7 @@ "copy:exe": "cp #{$GRAINC_BIN_PATH} #{$GRAINDOC_BIN_PATH} #{$GRAINFORMAT_BIN_PATH} #{$GRAINLSP_BIN_PATH} #{$CLI_BIN_DIR}", "copy:js": "cp #{$GRAINC_JS_PATH} #{$GRAINDOC_JS_PATH} #{$GRAINFORMAT_JS_PATH} #{$GRAINLSP_JS_PATH} #{$CLI_BIN_DIR}", "clean": "rm -rf #{self.root}/_esy", - "build:js": "esy b dune build @js --no-buffer #{os == 'windows' ? '-j 2' : ''}", + "build:js": "esy b dune build @js --no-buffer", "test": "#{$TEST_EXEC_PATH}", "test:js": "node #{$TEST_JS_PATH}", "format": "dune build @fmt --auto-promote", From 010726ba947a55b79551685ac0770959837c4a9b Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sun, 15 Oct 2023 13:34:13 -0700 Subject: [PATCH 05/14] remove jsoo debug flag --- compiler/grainc/dune | 2 +- compiler/graindoc/dune | 2 +- compiler/grainformat/dune | 2 +- compiler/grainlsp/dune | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/grainc/dune b/compiler/grainc/dune index e47b42e87c..8b3b2a3f40 100644 --- a/compiler/grainc/dune +++ b/compiler/grainc/dune @@ -9,4 +9,4 @@ (:include ./config/flags.sexp))) (libraries grain grain_diagnostics binaryen dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --debug times))) + (flags --no-sourcemap --no-extern-fs))) diff --git a/compiler/graindoc/dune b/compiler/graindoc/dune index dbedf6d255..5154edb209 100644 --- a/compiler/graindoc/dune +++ b/compiler/graindoc/dune @@ -18,4 +18,4 @@ (preprocess (pps ppx_deriving_cmdliner)) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --debug times))) + (flags --no-sourcemap --no-extern-fs))) diff --git a/compiler/grainformat/dune b/compiler/grainformat/dune index 476b2fd190..99cfa97ef1 100644 --- a/compiler/grainformat/dune +++ b/compiler/grainformat/dune @@ -12,4 +12,4 @@ (preprocess (pps ppx_deriving_cmdliner)) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --debug times))) + (flags --no-sourcemap --no-extern-fs))) diff --git a/compiler/grainlsp/dune b/compiler/grainlsp/dune index 12dc40fe98..3c54511835 100644 --- a/compiler/grainlsp/dune +++ b/compiler/grainlsp/dune @@ -10,5 +10,5 @@ (libraries cmdliner grain_utils grain_language_server grain_formatting dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --debug times) + (flags --no-sourcemap --no-extern-fs) (javascript_files hacks.js))) From 17cc349c8d28cf09902384681a25b9dc86db3bdd Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 16 Oct 2023 07:53:21 -0700 Subject: [PATCH 06/14] no js-string --- compiler/grainc/dune | 2 +- compiler/graindoc/dune | 2 +- compiler/grainformat/dune | 2 +- compiler/grainlsp/dune | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/grainc/dune b/compiler/grainc/dune index 8b3b2a3f40..93020bc7bd 100644 --- a/compiler/grainc/dune +++ b/compiler/grainc/dune @@ -9,4 +9,4 @@ (:include ./config/flags.sexp))) (libraries grain grain_diagnostics binaryen dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs))) + (flags --no-sourcemap --no-extern-fs --quiet --disable use-js-string))) diff --git a/compiler/graindoc/dune b/compiler/graindoc/dune index 5154edb209..446e11a77a 100644 --- a/compiler/graindoc/dune +++ b/compiler/graindoc/dune @@ -18,4 +18,4 @@ (preprocess (pps ppx_deriving_cmdliner)) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs))) + (flags --no-sourcemap --no-extern-fs --quiet --disable use-js-string))) diff --git a/compiler/grainformat/dune b/compiler/grainformat/dune index 99cfa97ef1..245c17e3f9 100644 --- a/compiler/grainformat/dune +++ b/compiler/grainformat/dune @@ -12,4 +12,4 @@ (preprocess (pps ppx_deriving_cmdliner)) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs))) + (flags --no-sourcemap --no-extern-fs --quiet --disable use-js-string))) diff --git a/compiler/grainlsp/dune b/compiler/grainlsp/dune index 3c54511835..5b00213c6a 100644 --- a/compiler/grainlsp/dune +++ b/compiler/grainlsp/dune @@ -10,5 +10,5 @@ (libraries cmdliner grain_utils grain_language_server grain_formatting dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs) + (flags --no-sourcemap --no-extern-fs --quiet --disable use-js-string) (javascript_files hacks.js))) From 6cd928aa3e8b2e43dbf704e8b1cc8c06e86746d5 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 16 Oct 2023 08:31:41 -0700 Subject: [PATCH 07/14] and tests --- compiler/test/dune | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/test/dune b/compiler/test/dune index a8b92d0ccd..111938bcf8 100644 --- a/compiler/test/dune +++ b/compiler/test/dune @@ -22,4 +22,4 @@ (libraries grain grain-tests.framework grain-tests.suites grain-tests.utils) (modules test) (js_of_ocaml - (flags --no-sourcemap --quiet))) + (flags --no-sourcemap --quiet --disable use-js-string))) From e10100947ee2d4698e2c29a44939ff54b74d69ad Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 16 Oct 2023 08:32:02 -0700 Subject: [PATCH 08/14] new ref in resolution --- compiler/esy.json | 2 +- compiler/esy.lock/index.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/esy.json b/compiler/esy.json index d695bd101a..e277638a53 100644 --- a/compiler/esy.json +++ b/compiler/esy.json @@ -59,7 +59,7 @@ "@opam/rely": "^4.0.0" }, "resolutions": { - "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c", + "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6", "@opam/fp": "reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/fs": "reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/ppx_deriving_cmdliner": "hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c", diff --git a/compiler/esy.lock/index.json b/compiler/esy.lock/index.json index a8b293f7fc..7d21bf9532 100644 --- a/compiler/esy.lock/index.json +++ b/compiler/esy.lock/index.json @@ -1318,7 +1318,7 @@ "source": { "type": "install", "source": [ - "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c" + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6" ] }, "overrides": [], @@ -2027,7 +2027,7 @@ "devDependencies": [ "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/ocaml-lsp-server@opam:1.14.1@ac41cc96", - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c@d41d8cd9" + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6@d41d8cd9" ], "installConfig": { "pnp": false } }, From 33cf816560f21f500601c34d832f393bf2f7ce6a Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Tue, 17 Oct 2023 14:03:30 +0200 Subject: [PATCH 09/14] no more flags --- compiler/grainc/dune | 2 +- compiler/graindoc/dune | 2 +- compiler/grainformat/dune | 2 +- compiler/grainlsp/dune | 2 +- compiler/test/dune | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/grainc/dune b/compiler/grainc/dune index 93020bc7bd..d3badcfbe1 100644 --- a/compiler/grainc/dune +++ b/compiler/grainc/dune @@ -9,4 +9,4 @@ (:include ./config/flags.sexp))) (libraries grain grain_diagnostics binaryen dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet --disable use-js-string))) + (flags --no-sourcemap --no-extern-fs --quiet))) diff --git a/compiler/graindoc/dune b/compiler/graindoc/dune index 446e11a77a..d60378893c 100644 --- a/compiler/graindoc/dune +++ b/compiler/graindoc/dune @@ -18,4 +18,4 @@ (preprocess (pps ppx_deriving_cmdliner)) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet --disable use-js-string))) + (flags --no-sourcemap --no-extern-fs --quiet))) diff --git a/compiler/grainformat/dune b/compiler/grainformat/dune index 245c17e3f9..90d1ad7e06 100644 --- a/compiler/grainformat/dune +++ b/compiler/grainformat/dune @@ -12,4 +12,4 @@ (preprocess (pps ppx_deriving_cmdliner)) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet --disable use-js-string))) + (flags --no-sourcemap --no-extern-fs --quiet))) diff --git a/compiler/grainlsp/dune b/compiler/grainlsp/dune index 5b00213c6a..26f090ca4e 100644 --- a/compiler/grainlsp/dune +++ b/compiler/grainlsp/dune @@ -10,5 +10,5 @@ (libraries cmdliner grain_utils grain_language_server grain_formatting dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet --disable use-js-string) + (flags --no-sourcemap --no-extern-fs --quiet) (javascript_files hacks.js))) diff --git a/compiler/test/dune b/compiler/test/dune index 111938bcf8..a8b92d0ccd 100644 --- a/compiler/test/dune +++ b/compiler/test/dune @@ -22,4 +22,4 @@ (libraries grain grain-tests.framework grain-tests.suites grain-tests.utils) (modules test) (js_of_ocaml - (flags --no-sourcemap --quiet --disable use-js-string))) + (flags --no-sourcemap --quiet))) From 7fa9cd40c117619a408f8226847937fa97a05aa7 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Tue, 17 Oct 2023 14:44:20 +0200 Subject: [PATCH 10/14] small simplification --- compiler/test/BinaryFileExtensions.re | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler/test/BinaryFileExtensions.re b/compiler/test/BinaryFileExtensions.re index e1d82031e8..b2a5a383df 100644 --- a/compiler/test/BinaryFileExtensions.re +++ b/compiler/test/BinaryFileExtensions.re @@ -15,13 +15,8 @@ let binaryFileExtensions = (actual: string, {createMatcher}) => { let filePath = expectedThunk(); let expected_output = open_in_bin(filePath); let n = in_channel_length(expected_output); - let expected_buffer = Buffer.create(n); - let _ = Buffer.add_channel(expected_buffer, expected_output, n); + let expected_string = really_input_string(expected_output, n); let _ = close_in(expected_output); - - let expected_string = - Bytes.to_string(Buffer.to_bytes(expected_buffer)); - let pass = expected_string == actual; if (!pass) { From 7a7cb554352a5f4636b120505dbafc1c87ae3769 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Sat, 29 Jun 2024 09:53:53 -0500 Subject: [PATCH 11/14] pin ocamlfind + ocamlbuild --- compiler/esy.json | 8 +- compiler/esy.lock/index.json | 1151 ++++++++--------- .../{angstrom.0.15.0 => angstrom.0.16.0}/opam | 10 +- compiler/esy.lock/opam/bigstringaf.0.9.1/opam | 5 +- .../opam | 10 +- .../{cmdliner.1.2.0 => cmdliner.1.3.0}/opam | 4 +- .../opam | 10 +- .../opam | 10 +- .../{dune-rpc.3.11.1 => dune-rpc.3.16.0}/opam | 10 +- .../opam/{dune.3.11.1 => dune.3.16.0}/opam | 18 +- .../opam/{dyn.3.11.1 => dyn.3.16.0}/opam | 10 +- compiler/esy.lock/opam/fiber.3.7.0/opam | 2 +- compiler/esy.lock/opam/gen.1.1/opam | 2 +- compiler/esy.lock/opam/num.1.4/opam | 34 - compiler/esy.lock/opam/num.1.5/opam | 30 + .../opam/ocaml-compiler-libs.v0.12.4/opam | 2 +- .../esy.lock/opam/ocamlbuild.0.14.2+win/opam | 2 +- .../{ocamlfind.1.9.6 => ocamlfind.1.9.3}/opam | 12 +- .../files/0001-Harden-test-for-OCaml-5.patch | 12 - .../opam | 8 +- compiler/esy.lock/opam/octavius.1.2.2/opam | 5 +- compiler/esy.lock/opam/omd.1.3.2/opam | 2 +- .../{ordering.3.11.1 => ordering.3.16.0}/opam | 10 +- .../esy.lock/opam/ppx_derivers.1.2.1/opam | 5 +- .../opam | 38 +- .../{ppxlib.0.29.1 => ppxlib.0.32.1}/opam | 22 +- compiler/esy.lock/opam/result.1.5/opam | 5 +- .../esy.lock/opam/seq.base/files/META.seq | 4 - .../esy.lock/opam/seq.base/files/seq.install | 3 - compiler/esy.lock/opam/seq.base/opam | 20 +- compiler/esy.lock/opam/sexplib0.v0.15.1/opam | 8 +- .../{stdune.3.11.1 => stdune.3.16.0}/opam | 10 +- .../opam/{xdg.3.11.1 => xdg.3.16.0}/opam | 10 +- .../opam/{yojson.2.1.1 => yojson.2.2.2}/opam | 11 +- .../files/darwin.patch | 26 + .../package.json | 27 + .../files/num-1.4.patch | 58 - .../package.json | 25 - .../package.json | 10 + .../files/findlib.patch | 485 +++++++ .../package.json | 0 .../files/findlib.patch | 11 - 42 files changed, 1241 insertions(+), 904 deletions(-) rename compiler/esy.lock/opam/{angstrom.0.15.0 => angstrom.0.16.0}/opam (83%) rename compiler/esy.lock/opam/{chrome-trace.3.11.1 => chrome-trace.3.16.0}/opam (67%) rename compiler/esy.lock/opam/{cmdliner.1.2.0 => cmdliner.1.3.0}/opam (90%) rename compiler/esy.lock/opam/{dune-build-info.3.11.1 => dune-build-info.3.16.0}/opam (73%) rename compiler/esy.lock/opam/{dune-configurator.3.11.1 => dune-configurator.3.16.0}/opam (74%) rename compiler/esy.lock/opam/{dune-rpc.3.11.1 => dune-rpc.3.16.0}/opam (68%) rename compiler/esy.lock/opam/{dune.3.11.1 => dune.3.16.0}/opam (69%) rename compiler/esy.lock/opam/{dyn.3.11.1 => dyn.3.16.0}/opam (66%) delete mode 100644 compiler/esy.lock/opam/num.1.4/opam create mode 100644 compiler/esy.lock/opam/num.1.5/opam rename compiler/esy.lock/opam/{ocamlfind.1.9.6 => ocamlfind.1.9.3}/opam (70%) delete mode 100644 compiler/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch rename compiler/esy.lock/opam/{ocamlformat-rpc-lib.0.26.1 => ocamlformat-rpc-lib.0.26.2}/opam (78%) rename compiler/esy.lock/opam/{ordering.3.11.1 => ordering.3.16.0}/opam (64%) rename compiler/esy.lock/opam/{ppx_deriving_yojson.3.7.0 => ppx_deriving_yojson.3.8.0}/opam (57%) rename compiler/esy.lock/opam/{ppxlib.0.29.1 => ppxlib.0.32.1}/opam (65%) delete mode 100644 compiler/esy.lock/opam/seq.base/files/META.seq delete mode 100644 compiler/esy.lock/opam/seq.base/files/seq.install rename compiler/esy.lock/opam/{stdune.3.11.1 => stdune.3.16.0}/opam (70%) rename compiler/esy.lock/opam/{xdg.3.11.1 => xdg.3.16.0}/opam (67%) rename compiler/esy.lock/opam/{yojson.2.1.1 => yojson.2.2.2}/opam (73%) create mode 100644 compiler/esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override/files/darwin.patch create mode 100644 compiler/esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override/package.json delete mode 100644 compiler/esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override/files/num-1.4.patch delete mode 100644 compiler/esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override/package.json create mode 100644 compiler/esy.lock/overrides/opam__s__num_opam__c__1.5_opam_override/package.json create mode 100644 compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/files/findlib.patch rename compiler/esy.lock/overrides/{opam__s__ocamlfind_opam__c__1.9.6_opam_override => opam__s__ocamlfind_opam__c__1.9.3_opam_override}/package.json (100%) delete mode 100644 compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch diff --git a/compiler/esy.json b/compiler/esy.json index e277638a53..f3597c5e0e 100644 --- a/compiler/esy.json +++ b/compiler/esy.json @@ -2,9 +2,7 @@ "name": "@grain/compiler", "version": "0.6.4", "esy": { - "build": [ - "dune build @native --no-buffer" - ], + "build": ["dune build @native --no-buffer"], "buildEnv": { "DUNE_BUILD_DIR": "#{self.target_dir}", "GRAIN_STDLIB": "#{self.root / '..' / 'stdlib'}", @@ -67,7 +65,9 @@ "@opam/cli": "reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/file-context-printer": "reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/pastel": "reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", - "@opam/rely": "reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0" + "@opam/rely": "reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "@opam/ocamlfind": "1.9.3", + "@opam/ocamlbuild": "0.14.2+win" }, "installConfig": { "pnp": false diff --git a/compiler/esy.lock/index.json b/compiler/esy.lock/index.json index 7d21bf9532..33ba2a8306 100644 --- a/compiler/esy.lock/index.json +++ b/compiler/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "3afd68a853e9b43daedf7825125eb77b", + "checksum": "447c6f8113a1cae14d025d727c262190", "root": "@grain/compiler@link-dev:./esy.json", "node": { "ocaml@4.14.1000@d41d8cd9": { @@ -16,61 +16,55 @@ "dependencies": [], "devDependencies": [] }, - "@opam/yojson@opam:2.1.1@ad5e299c": { - "id": "@opam/yojson@opam:2.1.1@ad5e299c", + "@opam/yojson@opam:2.2.2@0786d153": { + "id": "@opam/yojson@opam:2.2.2@0786d153", "name": "@opam/yojson", - "version": "opam:2.1.1", + "version": "opam:2.2.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d5/d58183207b198dc065866239066e074c34f9e139c0d9c4175a38809790e88173#sha256:d58183207b198dc065866239066e074c34f9e139c0d9c4175a38809790e88173", - "archive:https://github.com/ocaml-community/yojson/releases/download/2.1.1/yojson-2.1.1.tbz#sha256:d58183207b198dc065866239066e074c34f9e139c0d9c4175a38809790e88173" + "archive:https://opam.ocaml.org/cache/sha256/9a/9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595#sha256:9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595", + "archive:https://github.com/ocaml-community/yojson/releases/download/2.2.2/yojson-2.2.2.tbz#sha256:9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595" ], "opam": { "name": "yojson", - "version": "2.1.1", - "path": "esy.lock/opam/yojson.2.1.1" + "version": "2.2.2", + "path": "esy.lock/opam/yojson.2.2.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cppo@opam:1.6.9@db929a12", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/xdg@opam:3.11.1@1e207b0b": { - "id": "@opam/xdg@opam:3.11.1@1e207b0b", + "@opam/xdg@opam:3.16.0@fccd8d01": { + "id": "@opam/xdg@opam:3.16.0@fccd8d01", "name": "@opam/xdg", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "xdg", - "version": "3.11.1", - "path": "esy.lock/opam/xdg.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/xdg.3.16.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/uutf@opam:1.0.3@47c95a18": { @@ -91,19 +85,20 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/topkg@opam:1.0.7@7ee47d76", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", - "@opam/cmdliner@opam:1.2.0@b0c6143c", + "ocaml@4.14.1000@d41d8cd9", "@opam/topkg@opam:1.0.7@7ee47d76", + "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "@opam/ocamlbuild@opam:0.14.2+win@9e166790", + "@opam/cmdliner@opam:1.3.0@f8c5e0f3", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] }, "@opam/utf8@github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": "@opam/utf8@github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": + "@opam/utf8@github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/utf8", - "version": "github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": + "github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -112,15 +107,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/uri@opam:4.4.0@f70a0b72": { @@ -141,17 +133,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/stringext@opam:1.6.0@ac4f328b", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/angstrom@opam:0.15.0@105656d9", + "ocaml@4.14.1000@d41d8cd9", "@opam/stringext@opam:1.6.0@ac4f328b", + "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/angstrom@opam:0.16.0@dddc4818", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/stringext@opam:1.6.0@ac4f328b", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/angstrom@opam:0.15.0@105656d9" + "ocaml@4.14.1000@d41d8cd9", "@opam/stringext@opam:1.6.0@ac4f328b", + "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/angstrom@opam:0.16.0@dddc4818" ] }, "@opam/topkg@opam:1.0.7@7ee47d76": { @@ -172,14 +162,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "@opam/ocamlbuild@opam:0.14.2+win@9e166790", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d" + "@opam/ocamlbuild@opam:0.14.2+win@9e166790" ] }, "@opam/stringext@opam:1.6.0@ac4f328b": { @@ -200,48 +189,42 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/stdune@opam:3.11.1@9a840882": { - "id": "@opam/stdune@opam:3.11.1@9a840882", + "@opam/stdune@opam:3.16.0@adb77a91": { + "id": "@opam/stdune@opam:3.16.0@adb77a91", "name": "@opam/stdune", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "stdune", - "version": "3.11.1", - "path": "esy.lock/opam/stdune.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/stdune.3.16.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.16.0@c1326871", + "@opam/dyn@opam:3.16.0@e370e5e3", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.16.0@c1326871", + "@opam/dyn@opam:3.16.0@e370e5e3", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ] @@ -264,13 +247,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/spawn@opam:v0.15.1@85e9d6f1": { @@ -291,24 +272,22 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/sexplib0@opam:v0.15.1@51111c0c": { - "id": "@opam/sexplib0@opam:v0.15.1@51111c0c", + "@opam/sexplib0@opam:v0.15.1@df7962ff": { + "id": "@opam/sexplib0@opam:v0.15.1@df7962ff", "name": "@opam/sexplib0", "version": "opam:v0.15.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/ab/ab8fd6273f35a792cad48cbb3024a7f9#md5:ab8fd6273f35a792cad48cbb3024a7f9", - "archive:https://github.com/janestreet/sexplib0/archive/refs/tags/v0.15.1.tar.gz#md5:ab8fd6273f35a792cad48cbb3024a7f9" + "archive:https://opam.ocaml.org/cache/sha256/e8/e8cd817eb3bc3f84a2065fa0255ab2b986a24baf1cc329d05627c516464267b3#sha256:e8cd817eb3bc3f84a2065fa0255ab2b986a24baf1cc329d05627c516464267b3", + "archive:https://github.com/janestreet/sexplib0/archive/refs/tags/v0.15.1.tar.gz#sha256:e8cd817eb3bc3f84a2065fa0255ab2b986a24baf1cc329d05627c516464267b3" ], "opam": { "name": "sexplib0", @@ -318,13 +297,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/sexplib@opam:v0.15.1@1824bfd6": { @@ -345,28 +322,23 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/parsexp@opam:v0.15.0@742345c3", - "@opam/num@opam:1.4@16d26a67", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/parsexp@opam:v0.15.0@742345c3", "@opam/num@opam:1.5@679a0ea5", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/parsexp@opam:v0.15.0@742345c3", - "@opam/num@opam:1.4@16d26a67", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/parsexp@opam:v0.15.0@742345c3", "@opam/num@opam:1.5@679a0ea5", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/seq@opam:base@d8d7de1d": { - "id": "@opam/seq@opam:base@d8d7de1d", + "@opam/seq@opam:base@5ed5af70": { + "id": "@opam/seq@opam:base@5ed5af70", "name": "@opam/seq", "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "seq", "version": "base", @@ -375,10 +347,25 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], + "extraSources": [ + { + "checksum": + "sha256:e95062b4d0519ef8335c02f7d0f1952d11b814c7ab7e6d566a206116162fa2be", + "url": + "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/seq/META.seq", + "relativePath": "META.seq" + }, + { + "checksum": + "sha256:fff926c2c4d5a82b6c94c60c4c35eb06e3d39975893ebe6b1f0e6557cbe34904", + "url": + "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/seq/seq.install", + "relativePath": "seq.install" + } + ] }, "@opam/sedlex@opam:3.2@eab3a2e0": { "id": "@opam/sedlex@opam:3.2@eab3a2e0", @@ -398,28 +385,24 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/gen@opam:1.1@059b2731", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/gen@opam:1.1@059b2731", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/result@opam:1.5@1c6a6533": { - "id": "@opam/result@opam:1.5@1c6a6533", + "@opam/result@opam:1.5@5a755845": { + "id": "@opam/result@opam:1.5@5a755845", "name": "@opam/result", "version": "opam:1.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/1b/1b82dec78849680b49ae9a8a365b831b#md5:1b82dec78849680b49ae9a8a365b831b", - "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#md5:1b82dec78849680b49ae9a8a365b831b" + "archive:https://opam.ocaml.org/cache/sha256/7c/7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32#sha256:7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32", + "archive:https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz#sha256:7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32" ], "opam": { "name": "result", @@ -429,19 +412,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": + "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/rely", - "version": "github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": + "github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -450,22 +433,20 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/cli@github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/cli@github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9" ] }, @@ -487,30 +468,28 @@ }, "overrides": [ { - "opamoverride": "esy.lock/overrides/opam__s__reason_opam__c__3.9.0_opam_override" + "opamoverride": + "esy.lock/overrides/opam__s__reason_opam__c__3.9.0_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocamlfind@opam:1.9.6@da5169c7", + "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppx_derivers@opam:1.2.1@d78727cd", + "@opam/ocamlfind@opam:1.9.3@6f4741ee", "@opam/merlin-extend@opam:0.6.1@7d979feb", "@opam/menhir@opam:20220210@879a0c13", "@opam/fix@opam:20230505@941a65ff", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-build-info@opam:3.16.0@5123b882", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", + "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppx_derivers@opam:1.2.1@d78727cd", "@opam/merlin-extend@opam:0.6.1@7d979feb", "@opam/menhir@opam:20220210@879a0c13", "@opam/fix@opam:20230505@941a65ff", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "@opam/dune-build-info@opam:3.16.0@5123b882", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/re@opam:1.11.0@87deb463": { @@ -531,50 +510,44 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/ppxlib@opam:0.29.1@a8bb9506": { - "id": "@opam/ppxlib@opam:0.29.1@a8bb9506", + "@opam/ppxlib@opam:0.32.1@9897cafd": { + "id": "@opam/ppxlib@opam:0.32.1@9897cafd", "name": "@opam/ppxlib", - "version": "opam:0.29.1", + "version": "opam:0.32.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c8/c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79#sha256:c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79", - "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.29.1/ppxlib-0.29.1.tbz#sha256:c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79" + "archive:https://opam.ocaml.org/cache/sha256/9d/9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f#sha256:9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f", + "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.1/ppxlib-0.32.1.tbz#sha256:9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f" ], "opam": { "name": "ppxlib", - "version": "0.29.1", - "path": "esy.lock/opam/ppxlib.0.29.1" + "version": "0.32.1", + "path": "esy.lock/opam/ppxlib.0.32.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/ppx_derivers@opam:1.2.1@d78727cd", + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/ppx_derivers@opam:1.2.1@d78727cd", + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c": { @@ -595,15 +568,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/ppx_sexp_conv@opam:v0.15.1@0f138aac": { @@ -624,60 +594,54 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/base@opam:v0.15.1@e8a71f35" + "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base@opam:v0.15.1@e8a71f35" ] }, - "@opam/ppx_deriving_yojson@opam:3.7.0@167442d6": { - "id": "@opam/ppx_deriving_yojson@opam:3.7.0@167442d6", + "@opam/ppx_deriving_yojson@opam:3.8.0@9290103e": { + "id": "@opam/ppx_deriving_yojson@opam:3.8.0@9290103e", "name": "@opam/ppx_deriving_yojson", - "version": "opam:3.7.0", + "version": "opam:3.8.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/45/456be82acb16bbf6be12ab01f9dfaa94#md5:456be82acb16bbf6be12ab01f9dfaa94", - "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.7.0/ppx_deriving_yojson-3.7.0.tar.gz#md5:456be82acb16bbf6be12ab01f9dfaa94" + "archive:https://opam.ocaml.org/cache/sha256/fd/fdcbc548be418f061828664a1012ccba6cfba6a35578ea9cbf75fed498e0c2a1#sha256:fdcbc548be418f061828664a1012ccba6cfba6a35578ea9cbf75fed498e0c2a1", + "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.8.0/ppx_deriving_yojson-3.8.0.tbz#sha256:fdcbc548be418f061828664a1012ccba6cfba6a35578ea9cbf75fed498e0c2a1" ], "opam": { "name": "ppx_deriving_yojson", - "version": "3.7.0", - "path": "esy.lock/opam/ppx_deriving_yojson.3.7.0" + "version": "3.8.0", + "path": "esy.lock/opam/ppx_deriving_yojson.3.8.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ppxlib@opam:0.29.1@a8bb9506", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/ppxlib@opam:0.32.1@9897cafd", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ppxlib@opam:0.29.1@a8bb9506", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/ppxlib@opam:0.32.1@9897cafd", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@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", + "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", + "version": + "github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c", "source": { "type": "install", "source": [ @@ -686,21 +650,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ppxlib@opam:0.29.1@a8bb9506", + "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", + "@opam/ppxlib@opam:0.32.1@9897cafd", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c", + "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/cmdliner@opam:1.3.0@f8c5e0f3", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ppxlib@opam:0.29.1@a8bb9506", + "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", + "@opam/ppxlib@opam:0.32.1@9897cafd", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c" + "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/cmdliner@opam:1.3.0@f8c5e0f3" ] }, "@opam/ppx_deriving@opam:5.2.1@2315fdd0": { @@ -721,33 +683,30 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cppo@opam:1.6.9@db929a12", + "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", + "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppx_derivers@opam:1.2.1@d78727cd", + "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", + "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppx_derivers@opam:1.2.1@d78727cd", + "@opam/ocamlfind@opam:1.9.3@6f4741ee", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/ppx_derivers@opam:1.2.1@e2cbad12": { - "id": "@opam/ppx_derivers@opam:1.2.1@e2cbad12", + "@opam/ppx_derivers@opam:1.2.1@d78727cd": { + "id": "@opam/ppx_derivers@opam:1.2.1@d78727cd", "name": "@opam/ppx_derivers", "version": "opam:1.2.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/5d/5dc2bf130c1db3c731fe0fffc5648b41#md5:5dc2bf130c1db3c731fe0fffc5648b41", - "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#md5:5dc2bf130c1db3c731fe0fffc5648b41" + "archive:https://opam.ocaml.org/cache/sha256/b6/b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95#sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95", + "archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz#sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95" ], "opam": { "name": "ppx_derivers", @@ -757,13 +716,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/pp@opam:1.2.0@16430027": { @@ -784,19 +741,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": + "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/pastel", - "version": "github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": + "github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -805,17 +762,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/re@opam:1.11.0@87deb463", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/re@opam:1.11.0@87deb463", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/re@opam:1.11.0@87deb463", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/re@opam:1.11.0@87deb463", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/parsexp@opam:v0.15.0@742345c3": { @@ -836,55 +789,50 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/base@opam:v0.15.1@e8a71f35" + "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base@opam:v0.15.1@e8a71f35" ] }, - "@opam/ordering@opam:3.11.1@92c57daa": { - "id": "@opam/ordering@opam:3.11.1@92c57daa", + "@opam/ordering@opam:3.16.0@c1326871": { + "id": "@opam/ordering@opam:3.16.0@c1326871", "name": "@opam/ordering", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "ordering", - "version": "3.11.1", - "path": "esy.lock/opam/ordering.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/ordering.3.16.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/omd@opam:1.3.2@511d53d2": { - "id": "@opam/omd@opam:1.3.2@511d53d2", + "@opam/omd@opam:1.3.2@f6edb8b8": { + "id": "@opam/omd@opam:1.3.2@f6edb8b8", "name": "@opam/omd", "version": "opam:1.3.2", "source": { "type": "install", "source": [ "archive:https://opam.ocaml.org/cache/sha256/60/6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb#sha256:6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb", - "archive:https://github.com/ocaml/omd/releases/download/1.3.2/omd-1.3.2.tbz#sha256:6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb" + "archive:https://github.com/ocaml/opam-source-archives/raw/main/omd-1.3.2.tbz#sha256:6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb" ], "opam": { "name": "omd", @@ -894,28 +842,26 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0" ] }, - "@opam/octavius@opam:1.2.2@2205cc65": { - "id": "@opam/octavius@opam:1.2.2@2205cc65", + "@opam/octavius@opam:1.2.2@558886f0": { + "id": "@opam/octavius@opam:1.2.2@558886f0", "name": "@opam/octavius", "version": "opam:1.2.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/72/72f9e1d996e6c5089fc513cc9218607b#md5:72f9e1d996e6c5089fc513cc9218607b", - "archive:https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz#md5:72f9e1d996e6c5089fc513cc9218607b" + "archive:https://opam.ocaml.org/cache/sha256/ea/eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad#sha256:eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad", + "archive:https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz#sha256:eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad" ], "opam": { "name": "octavius", @@ -925,13 +871,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/ocamlgraph@opam:2.1.0@c06ba8fc": { @@ -952,75 +896,69 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/stdlib-shims@opam:0.3.0@72c7bc98", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda": { - "id": "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", + "@opam/ocamlformat-rpc-lib@opam:0.26.2@f94d170f": { + "id": "@opam/ocamlformat-rpc-lib@opam:0.26.2@f94d170f", "name": "@opam/ocamlformat-rpc-lib", - "version": "opam:0.26.1", + "version": "opam:0.26.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/da/da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7#sha256:da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7", - "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.1/ocamlformat-0.26.1.tbz#sha256:da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7" + "archive:https://opam.ocaml.org/cache/sha256/2e/2e4f596bf7aa367a844fe83ba0f6b0bf14b2a65179ddc082363fe9793d0375c5#sha256:2e4f596bf7aa367a844fe83ba0f6b0bf14b2a65179ddc082363fe9793d0375c5", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.2/ocamlformat-0.26.2.tbz#sha256:2e4f596bf7aa367a844fe83ba0f6b0bf14b2a65179ddc082363fe9793d0375c5" ], "opam": { "name": "ocamlformat-rpc-lib", - "version": "0.26.1", - "path": "esy.lock/opam/ocamlformat-rpc-lib.0.26.1" + "version": "0.26.2", + "path": "esy.lock/opam/ocamlformat-rpc-lib.0.26.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/csexp@opam:1.5.2@46614bf4", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/csexp@opam:1.5.2@46614bf4" ] }, - "@opam/ocamlfind@opam:1.9.6@da5169c7": { - "id": "@opam/ocamlfind@opam:1.9.6@da5169c7", + "@opam/ocamlfind@opam:1.9.3@6f4741ee": { + "id": "@opam/ocamlfind@opam:1.9.3@6f4741ee", "name": "@opam/ocamlfind", - "version": "opam:1.9.6", + "version": "opam:1.9.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/96/96c6ee50a32cca9ca277321262dbec57#md5:96c6ee50a32cca9ca277321262dbec57", - "archive:http://download.camlcity.org/download/findlib-1.9.6.tar.gz#md5:96c6ee50a32cca9ca277321262dbec57" + "archive:https://opam.ocaml.org/cache/md5/24/24047dd8a0da5322253de9b7aa254e42#md5:24047dd8a0da5322253de9b7aa254e42", + "archive:http://download.camlcity.org/download/findlib-1.9.3.tar.gz#md5:24047dd8a0da5322253de9b7aa254e42" ], "opam": { "name": "ocamlfind", - "version": "1.9.6", - "path": "esy.lock/opam/ocamlfind.1.9.6" + "version": "1.9.3", + "path": "esy.lock/opam/ocamlfind.1.9.3" } }, "overrides": [ { - "opamoverride": "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override" + "opamoverride": + "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] }, - "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d": { - "id": "@opam/ocamlbuild@opam:0.14.2+win@39b9f56d", + "@opam/ocamlbuild@opam:0.14.2+win@9e166790": { + "id": "@opam/ocamlbuild@opam:0.14.2+win@9e166790", "name": "@opam/ocamlbuild", "version": "opam:0.14.2+win", "source": { @@ -1037,18 +975,20 @@ }, "overrides": [ { - "opamoverride": "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override" + "opamoverride": + "esy.lock/overrides/opam__s__ocamlbuild_opam__c__0.14.2+win_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": ["ocaml@4.14.1000@d41d8cd9"], + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ], "extraSources": [ { - "checksum": "sha256:a9b7e1829a3304e5a073d8ddea29d3d8272698e93b7e1ee659ae5e31e5cfb6b9", - "url": "https://raw.githubusercontent.com/ocaml-opam/opam-repository-mingw/354a87b397856f2a70024c5c83fc5001074935b6/packages/ocamlbuild/ocamlbuild.0.14.2/files/ocamlbuild-0.14.2.patch", + "checksum": + "sha256:a9b7e1829a3304e5a073d8ddea29d3d8272698e93b7e1ee659ae5e31e5cfb6b9", + "url": + "https://raw.githubusercontent.com/ocaml-opam/opam-repository-mingw/354a87b397856f2a70024c5c83fc5001074935b6/packages/ocamlbuild/ocamlbuild.0.14.2/files/ocamlbuild-0.14.2.patch", "relativePath": "ocamlbuild-0.14.2.patch" } ] @@ -1071,13 +1011,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/ocaml-lsp-server@opam:1.14.1@ac41cc96": { @@ -1098,53 +1036,43 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/xdg@opam:3.11.1@1e207b0b", - "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.11.1@9a840882", - "@opam/spawn@opam:v0.15.1@85e9d6f1", - "@opam/re@opam:1.11.0@87deb463", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/xdg@opam:3.16.0@fccd8d01", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/stdune@opam:3.16.0@adb77a91", + "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.11.0@87deb463", "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/omd@opam:1.3.2@511d53d2", - "@opam/octavius@opam:1.2.2@2205cc65", - "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", - "@opam/fiber@opam:3.7.0@d70e2471", - "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune-rpc@opam:3.11.1@1197fefa", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.11.1@0e9213a3", + "@opam/ordering@opam:3.16.0@c1326871", + "@opam/omd@opam:1.3.2@f6edb8b8", + "@opam/octavius@opam:1.2.2@558886f0", + "@opam/ocamlformat-rpc-lib@opam:0.26.2@f94d170f", + "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.16.0@e370e5e3", + "@opam/dune-rpc@opam:3.16.0@6651e951", + "@opam/dune-build-info@opam:3.16.0@5123b882", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/chrome-trace@opam:3.16.0@968aeb8c", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/xdg@opam:3.11.1@1e207b0b", - "@opam/uutf@opam:1.0.3@47c95a18", - "@opam/stdune@opam:3.11.1@9a840882", - "@opam/spawn@opam:v0.15.1@85e9d6f1", - "@opam/re@opam:1.11.0@87deb463", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/xdg@opam:3.16.0@fccd8d01", "@opam/uutf@opam:1.0.3@47c95a18", + "@opam/stdune@opam:3.16.0@adb77a91", + "@opam/spawn@opam:v0.15.1@85e9d6f1", "@opam/re@opam:1.11.0@87deb463", "@opam/ppx_yojson_conv_lib@opam:v0.16.0@33740c3c", "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/omd@opam:1.3.2@511d53d2", - "@opam/octavius@opam:1.2.2@2205cc65", - "@opam/ocamlformat-rpc-lib@opam:0.26.1@1f552fda", - "@opam/fiber@opam:3.7.0@d70e2471", - "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune-rpc@opam:3.11.1@1197fefa", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/csexp@opam:1.5.2@46614bf4", - "@opam/chrome-trace@opam:3.11.1@0e9213a3" + "@opam/ordering@opam:3.16.0@c1326871", + "@opam/omd@opam:1.3.2@f6edb8b8", + "@opam/octavius@opam:1.2.2@558886f0", + "@opam/ocamlformat-rpc-lib@opam:0.26.2@f94d170f", + "@opam/fiber@opam:3.7.0@bf633a34", "@opam/dyn@opam:3.16.0@e370e5e3", + "@opam/dune-rpc@opam:3.16.0@6651e951", + "@opam/dune-build-info@opam:3.16.0@5123b882", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/csexp@opam:1.5.2@46614bf4", + "@opam/chrome-trace@opam:3.16.0@968aeb8c" ] }, - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882": { - "id": "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", + "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1": { + "id": "@opam/ocaml-compiler-libs@opam:v0.12.4@57a85ad1", "name": "@opam/ocaml-compiler-libs", "version": "opam:v0.12.4", "source": { @@ -1161,42 +1089,39 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/num@opam:1.4@16d26a67": { - "id": "@opam/num@opam:1.4@16d26a67", + "@opam/num@opam:1.5@679a0ea5": { + "id": "@opam/num@opam:1.5@679a0ea5", "name": "@opam/num", - "version": "opam:1.4", + "version": "opam:1.5", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/cd/cda2b727e116a0b6a9c03902cc4b2415#md5:cda2b727e116a0b6a9c03902cc4b2415", - "archive:https://github.com/ocaml/num/archive/v1.4.tar.gz#md5:cda2b727e116a0b6a9c03902cc4b2415" + "archive:https://opam.ocaml.org/cache/md5/b1/b1f9405dfe5f573ea187f122f789ae57#md5:b1f9405dfe5f573ea187f122f789ae57", + "archive:https://github.com/ocaml/num/archive/v1.5.tar.gz#md5:b1f9405dfe5f573ea187f122f789ae57" ], "opam": { "name": "num", - "version": "1.4", - "path": "esy.lock/opam/num.1.4" + "version": "1.5", + "path": "esy.lock/opam/num.1.5" } }, "overrides": [ { - "opamoverride": "esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override" + "opamoverride": + "esy.lock/overrides/opam__s__num_opam__c__1.5_opam_override" } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] }, "@opam/merlin-extend@opam:0.6.1@7d979feb": { "id": "@opam/merlin-extend@opam:0.6.1@7d979feb", @@ -1216,14 +1141,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cppo@opam:1.6.9@db929a12", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/cppo@opam:1.6.9@db929a12", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/menhirSdk@opam:20220210@fe146ed3": { @@ -1244,13 +1166,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/menhirLib@opam:20220210@9afeb270": { @@ -1271,13 +1191,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/menhir@opam:20220210@879a0c13": { @@ -1298,23 +1216,22 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/menhirSdk@opam:20220210@fe146ed3", + "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/menhirSdk@opam:20220210@fe146ed3", + "ocaml@4.14.1000@d41d8cd9", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c@d41d8cd9": { - "id": "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c@d41d8cd9", + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6@d41d8cd9": { + "id": + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6@d41d8cd9", "name": "@opam/js_of_ocaml-compiler", - "version": "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#8e4ec6c78fecc089960adde2e3a3f77914c8b29c", + "version": + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6", "source": { "type": "install", "source": [ @@ -1323,30 +1240,30 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/ppxlib@opam:0.29.1@a8bb9506", - "@opam/ocamlfind@opam:1.9.6@da5169c7", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/sedlex@opam:3.2@eab3a2e0", + "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ocamlfind@opam:1.9.3@6f4741ee", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", "@opam/menhir@opam:20220210@879a0c13", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c", + "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/cmdliner@opam:1.3.0@f8c5e0f3", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", - "@opam/ppxlib@opam:0.29.1@a8bb9506", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", + "@opam/sedlex@opam:3.2@eab3a2e0", + "@opam/ppxlib@opam:0.32.1@9897cafd", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", "@opam/menhir@opam:20220210@879a0c13", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c" + "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/cmdliner@opam:1.3.0@f8c5e0f3" ] }, - "@opam/gen@opam:1.1@059b2731": { - "id": "@opam/gen@opam:1.1@059b2731", + "@opam/gen@opam:1.1@55327887": { + "id": "@opam/gen@opam:1.1@55327887", "name": "@opam/gen", "version": "opam:1.1", "source": { @@ -1363,21 +1280,20 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/seq@opam:base@5ed5af70", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/fs@github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": "@opam/fs@github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": + "@opam/fs@github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/fs", - "version": "github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": + "github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -1386,23 +1302,22 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": + "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/fp", - "version": "github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": + "github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -1411,15 +1326,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/fix@opam:20230505@941a65ff": { @@ -1440,19 +1352,19 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": + "@opam/file-context-printer@github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/file-context-printer", - "version": "github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": + "github:reasonml/reason-native:file-context-printer.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -1461,23 +1373,20 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/fiber@opam:3.7.0@d70e2471": { - "id": "@opam/fiber@opam:3.7.0@d70e2471", + "@opam/fiber@opam:3.7.0@bf633a34": { + "id": "@opam/fiber@opam:3.7.0@bf633a34", "name": "@opam/fiber", "version": "opam:3.7.0", "source": { @@ -1494,171 +1403,158 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/stdune@opam:3.11.1@9a840882", - "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.16.0@adb77a91", + "@opam/dyn@opam:3.16.0@e370e5e3", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/stdune@opam:3.11.1@9a840882", - "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/stdune@opam:3.16.0@adb77a91", + "@opam/dyn@opam:3.16.0@e370e5e3", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/dyn@opam:3.11.1@d3c74846": { - "id": "@opam/dyn@opam:3.11.1@d3c74846", + "@opam/dyn@opam:3.16.0@e370e5e3": { + "id": "@opam/dyn@opam:3.16.0@e370e5e3", "name": "@opam/dyn", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "dyn", - "version": "3.11.1", - "path": "esy.lock/opam/dyn.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/dyn.3.16.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.16.0@c1326871", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.16.0@c1326871", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/dune-rpc@opam:3.11.1@1197fefa": { - "id": "@opam/dune-rpc@opam:3.11.1@1197fefa", + "@opam/dune-rpc@opam:3.16.0@6651e951": { + "id": "@opam/dune-rpc@opam:3.16.0@6651e951", "name": "@opam/dune-rpc", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "dune-rpc", - "version": "3.11.1", - "path": "esy.lock/opam/dune-rpc.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/dune-rpc.3.16.0" } }, "overrides": [], "dependencies": [ - "@opam/xdg@opam:3.11.1@1e207b0b", - "@opam/stdune@opam:3.11.1@9a840882", - "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/csexp@opam:1.5.2@46614bf4", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/xdg@opam:3.16.0@fccd8d01", + "@opam/stdune@opam:3.16.0@adb77a91", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.16.0@c1326871", + "@opam/dyn@opam:3.16.0@e370e5e3", "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/csexp@opam:1.5.2@46614bf4", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/xdg@opam:3.11.1@1e207b0b", - "@opam/stdune@opam:3.11.1@9a840882", - "@opam/pp@opam:1.2.0@16430027", - "@opam/ordering@opam:3.11.1@92c57daa", - "@opam/dyn@opam:3.11.1@d3c74846", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/xdg@opam:3.16.0@fccd8d01", + "@opam/stdune@opam:3.16.0@adb77a91", "@opam/pp@opam:1.2.0@16430027", + "@opam/ordering@opam:3.16.0@c1326871", + "@opam/dyn@opam:3.16.0@e370e5e3", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/csexp@opam:1.5.2@46614bf4" ] }, - "@opam/dune-configurator@opam:3.11.1@24d75a5c": { - "id": "@opam/dune-configurator@opam:3.11.1@24d75a5c", + "@opam/dune-configurator@opam:3.16.0@29bae660": { + "id": "@opam/dune-configurator@opam:3.16.0@29bae660", "name": "@opam/dune-configurator", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "dune-configurator", - "version": "3.11.1", - "path": "esy.lock/opam/dune-configurator.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/dune-configurator.3.16.0" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": + "esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override" + } + ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/csexp@opam:1.5.2@46614bf4", "@opam/base-unix@opam:base@87d0b2eb" ] }, - "@opam/dune-build-info@opam:3.11.1@0dfbdab2": { - "id": "@opam/dune-build-info@opam:3.11.1@0dfbdab2", + "@opam/dune-build-info@opam:3.16.0@5123b882": { + "id": "@opam/dune-build-info@opam:3.16.0@5123b882", "name": "@opam/dune-build-info", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "dune-build-info", - "version": "3.11.1", - "path": "esy.lock/opam/dune-build-info.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/dune-build-info.3.16.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/dune@opam:3.11.1@ba2e0e6a": { - "id": "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dune@opam:3.16.0@33c4c9fe": { + "id": "@opam/dune@opam:3.16.0@33c4c9fe", "name": "@opam/dune", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "dune", - "version": "3.11.1", - "path": "esy.lock/opam/dune.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/dune.3.16.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.14.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.14.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, @@ -1680,13 +1576,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/cppo@opam:1.6.9@db929a12": { @@ -1707,21 +1601,21 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base-unix@opam:base@87d0b2eb" ] }, "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9": { - "id": "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9", + "id": + "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9", "name": "@opam/conf-cmake", - "version": "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", + "version": + "github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d", "source": { "type": "install", "source": [ @@ -1732,33 +1626,34 @@ "dependencies": [], "devDependencies": [] }, - "@opam/cmdliner@opam:1.2.0@b0c6143c": { - "id": "@opam/cmdliner@opam:1.2.0@b0c6143c", + "@opam/cmdliner@opam:1.3.0@f8c5e0f3": { + "id": "@opam/cmdliner@opam:1.3.0@f8c5e0f3", "name": "@opam/cmdliner", - "version": "opam:1.2.0", + "version": "opam:1.3.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha512/6f/6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b#sha512:6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b", - "archive:https://erratique.ch/software/cmdliner/releases/cmdliner-1.2.0.tbz#sha512:6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b" + "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" ], "opam": { "name": "cmdliner", - "version": "1.2.0", - "path": "esy.lock/opam/cmdliner.1.2.0" + "version": "1.3.0", + "path": "esy.lock/opam/cmdliner.1.3.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": ["ocaml@4.14.1000@d41d8cd9"] + "devDependencies": [ "ocaml@4.14.1000@d41d8cd9" ] }, "@opam/cli@github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9": { - "id": "@opam/cli@github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", + "id": + "@opam/cli@github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "name": "@opam/cli", - "version": "github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", + "version": + "github:reasonml/reason-native:cli.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "source": { "type": "install", "source": [ @@ -1767,57 +1662,52 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "ocaml@4.14.1000@d41d8cd9", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/re@opam:1.11.0@87deb463", "@opam/pastel@github:reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/chrome-trace@opam:3.11.1@0e9213a3": { - "id": "@opam/chrome-trace@opam:3.11.1@0e9213a3", + "@opam/chrome-trace@opam:3.16.0@968aeb8c": { + "id": "@opam/chrome-trace@opam:3.16.0@968aeb8c", "name": "@opam/chrome-trace", - "version": "opam:3.11.1", + "version": "opam:3.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/86/866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71", - "archive:https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz#sha256:866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" + "archive:https://opam.ocaml.org/cache/sha256/54/5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6", + "archive:https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz#sha256:5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" ], "opam": { "name": "chrome-trace", - "version": "3.11.1", - "path": "esy.lock/opam/chrome-trace.3.11.1" + "version": "3.16.0", + "path": "esy.lock/opam/chrome-trace.3.16.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/bigstringaf@opam:0.9.1@e6f2e882": { - "id": "@opam/bigstringaf@opam:0.9.1@e6f2e882", + "@opam/bigstringaf@opam:0.9.1@5d112382": { + "id": "@opam/bigstringaf@opam:0.9.1@5d112382", "name": "@opam/bigstringaf", "version": "opam:0.9.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/90/909fdc277cf03096a35b565325d5314a#md5:909fdc277cf03096a35b565325d5314a", - "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.9.1.tar.gz#md5:909fdc277cf03096a35b565325d5314a" + "archive:https://opam.ocaml.org/cache/sha256/87/87f99277d614998b6550941c5218dfe1bafeac1ad2821254c987ec281a6a550b#sha256:87f99277d614998b6550941c5218dfe1bafeac1ad2821254c987ec281a6a550b", + "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.9.1.tar.gz#sha256:87f99277d614998b6550941c5218dfe1bafeac1ad2821254c987ec281a6a550b" ], "opam": { "name": "bigstringaf", @@ -1828,14 +1718,13 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-configurator@opam:3.16.0@29bae660", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "@opam/dune-configurator@opam:3.16.0@29bae660", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -1844,7 +1733,7 @@ "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "base-unix", "version": "base", @@ -1852,7 +1741,7 @@ } }, "overrides": [], - "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], + "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, "@opam/base-threads@opam:base@36803084": { @@ -1861,7 +1750,7 @@ "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "base-threads", "version": "base", @@ -1869,7 +1758,7 @@ } }, "overrides": [], - "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], + "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, "@opam/base-bytes@opam:base@19d0c2ff": { @@ -1878,7 +1767,7 @@ "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "base-bytes", "version": "base", @@ -1887,13 +1776,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ocamlfind@opam:1.9.6@da5169c7", + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.3@6f4741ee", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/ocamlfind@opam:1.9.6@da5169c7" + "ocaml@4.14.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.3@6f4741ee" ] }, "@opam/base-bigarray@opam:base@b03491b0": { @@ -1902,7 +1789,7 @@ "version": "opam:base", "source": { "type": "install", - "source": ["no-source:"], + "source": [ "no-source:" ], "opam": { "name": "base-bigarray", "version": "base", @@ -1910,7 +1797,7 @@ } }, "overrides": [], - "dependencies": ["@esy-ocaml/substs@0.0.1@d41d8cd9"], + "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, "@opam/base@opam:v0.15.1@e8a71f35": { @@ -1931,49 +1818,43 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/dune-configurator@opam:3.16.0@29bae660", + "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/sexplib0@opam:v0.15.1@51111c0c", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a" + "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", + "@opam/dune-configurator@opam:3.16.0@29bae660", + "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/angstrom@opam:0.15.0@105656d9": { - "id": "@opam/angstrom@opam:0.15.0@105656d9", + "@opam/angstrom@opam:0.16.0@dddc4818": { + "id": "@opam/angstrom@opam:0.16.0@dddc4818", "name": "@opam/angstrom", - "version": "opam:0.15.0", + "version": "opam:0.16.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/51/5104768c404ea92fd0a53a5b0f75cd50#md5:5104768c404ea92fd0a53a5b0f75cd50", - "archive:https://github.com/inhabitedtype/angstrom/archive/0.15.0.tar.gz#md5:5104768c404ea92fd0a53a5b0f75cd50" + "archive:https://opam.ocaml.org/cache/sha256/47/47810bd31306d57c0ac83eb3f95b1cb6f8bdda99457aa6e6bcd02f6ddb8410f0#sha256:47810bd31306d57c0ac83eb3f95b1cb6f8bdda99457aa6e6bcd02f6ddb8410f0", + "archive:https://github.com/inhabitedtype/angstrom/archive/0.16.0.tar.gz#sha256:47810bd31306d57c0ac83eb3f95b1cb6f8bdda99457aa6e6bcd02f6ddb8410f0" ], "opam": { "name": "angstrom", - "version": "0.15.0", - "path": "esy.lock/opam/angstrom.0.15.0" + "version": "0.16.0", + "path": "esy.lock/opam/angstrom.0.16.0" } }, "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/result@opam:1.5@1c6a6533", "@opam/ocaml-syntax-shims@opam:1.0.0@9f361fbb", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/bigstringaf@opam:0.9.1@e6f2e882", + "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/bigstringaf@opam:0.9.1@5d112382", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/result@opam:1.5@1c6a6533", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/bigstringaf@opam:0.9.1@e6f2e882" + "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/bigstringaf@opam:0.9.1@5d112382" ] }, "@grain/libbinaryen@114.0.0@d41d8cd9": { @@ -1989,8 +1870,8 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dune-configurator@opam:3.16.0@29bae660", + "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/conf-cmake@github:grain-lang/cmake:esy.json#91a2c3677bef84a6eb20318284dff9f3bf32719d@d41d8cd9" ], "devDependencies": [], @@ -2003,25 +1884,23 @@ "source": { "type": "link-dev", "path": ".", "manifest": "esy.json" }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", - "@opam/yojson@opam:2.1.1@ad5e299c", + "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/utf8@github:reasonml/reason-native:utf8.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/uri@opam:4.4.0@f70a0b72", "@opam/sexplib@opam:v0.15.1@1824bfd6", - "@opam/sedlex@opam:3.2@eab3a2e0", - "@opam/reason@opam:3.9.0@2a7c0e6f", + "@opam/sedlex@opam:3.2@eab3a2e0", "@opam/reason@opam:3.9.0@2a7c0e6f", "@opam/ppx_sexp_conv@opam:v0.15.1@0f138aac", - "@opam/ppx_deriving_yojson@opam:3.7.0@167442d6", + "@opam/ppx_deriving_yojson@opam:3.8.0@9290103e", "@opam/ppx_deriving_cmdliner@github:hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c@d41d8cd9", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", "@opam/ocamlgraph@opam:2.1.0@c06ba8fc", "@opam/menhir@opam:20220210@879a0c13", "@opam/fs@github:reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/fp@github:reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune-build-info@opam:3.11.1@0dfbdab2", - "@opam/dune@opam:3.11.1@ba2e0e6a", - "@opam/cmdliner@opam:1.2.0@b0c6143c", + "@opam/dune-configurator@opam:3.16.0@29bae660", + "@opam/dune-build-info@opam:3.16.0@5123b882", + "@opam/dune@opam:3.16.0@33c4c9fe", + "@opam/cmdliner@opam:1.3.0@f8c5e0f3", "@grain/binaryen.ml@0.24.0@d41d8cd9" ], "devDependencies": [ @@ -2044,8 +1923,8 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", - "@opam/dune-configurator@opam:3.11.1@24d75a5c", - "@opam/dune@opam:3.11.1@ba2e0e6a", + "@opam/dune-configurator@opam:3.16.0@29bae660", + "@opam/dune@opam:3.16.0@33c4c9fe", "@grain/libbinaryen@114.0.0@d41d8cd9" ], "devDependencies": [], @@ -2066,4 +1945,4 @@ "devDependencies": [] } } -} +} \ No newline at end of file diff --git a/compiler/esy.lock/opam/angstrom.0.15.0/opam b/compiler/esy.lock/opam/angstrom.0.16.0/opam similarity index 83% rename from compiler/esy.lock/opam/angstrom.0.15.0/opam rename to compiler/esy.lock/opam/angstrom.0.16.0/opam index 2d67a6b45f..5842d0806b 100644 --- a/compiler/esy.lock/opam/angstrom.0.15.0/opam +++ b/compiler/esy.lock/opam/angstrom.0.16.0/opam @@ -15,8 +15,7 @@ depends: [ "dune" {>= "1.8"} "alcotest" {with-test & >= "0.8.1"} "bigstringaf" - "result" - "ppx_let" {with-test & >= "0.14.0"} + "ppx_let" {with-test & >= "v0.14.0"} "ocaml-syntax-shims" {build} ] synopsis: "Parser combinators built for speed and memory-efficiency" @@ -29,6 +28,9 @@ give the user total control over the blocking behavior of their application, with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by default and support unbounded lookahead.""" url { - src: "https://github.com/inhabitedtype/angstrom/archive/0.15.0.tar.gz" - checksum: "md5=5104768c404ea92fd0a53a5b0f75cd50" + src: "https://github.com/inhabitedtype/angstrom/archive/0.16.0.tar.gz" + checksum: [ + "sha256=47810bd31306d57c0ac83eb3f95b1cb6f8bdda99457aa6e6bcd02f6ddb8410f0" + "md5=58ebc718a920c31ec3eb38f4aa1bea51" + ] } diff --git a/compiler/esy.lock/opam/bigstringaf.0.9.1/opam b/compiler/esy.lock/opam/bigstringaf.0.9.1/opam index 8ef7b7c8eb..c3658ee7ad 100644 --- a/compiler/esy.lock/opam/bigstringaf.0.9.1/opam +++ b/compiler/esy.lock/opam/bigstringaf.0.9.1/opam @@ -44,5 +44,8 @@ So here they are. Go crazy. """ url { src: "https://github.com/inhabitedtype/bigstringaf/archive/0.9.1.tar.gz" - checksum: "md5=909fdc277cf03096a35b565325d5314a" + checksum: [ + "sha256=87f99277d614998b6550941c5218dfe1bafeac1ad2821254c987ec281a6a550b" + "md5=909fdc277cf03096a35b565325d5314a" + ] } diff --git a/compiler/esy.lock/opam/chrome-trace.3.11.1/opam b/compiler/esy.lock/opam/chrome-trace.3.16.0/opam similarity index 67% rename from compiler/esy.lock/opam/chrome-trace.3.11.1/opam rename to compiler/esy.lock/opam/chrome-trace.3.16.0/opam index da2dd42da9..37deaac1c0 100644 --- a/compiler/esy.lock/opam/chrome-trace.3.11.1/opam +++ b/compiler/esy.lock/opam/chrome-trace.3.16.0/opam @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "odoc" {with-doc} ] @@ -31,10 +31,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/cmdliner.1.2.0/opam b/compiler/esy.lock/opam/cmdliner.1.3.0/opam similarity index 90% rename from compiler/esy.lock/opam/cmdliner.1.2.0/opam rename to compiler/esy.lock/opam/cmdliner.1.3.0/opam index b29bd296e5..fa9ba3bc58 100644 --- a/compiler/esy.lock/opam/cmdliner.1.2.0/opam +++ b/compiler/esy.lock/opam/cmdliner.1.3.0/opam @@ -33,7 +33,7 @@ install: [ ] dev-repo: "git+https://erratique.ch/repos/cmdliner.git" url { - src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.2.0.tbz" + src: "https://erratique.ch/software/cmdliner/releases/cmdliner-1.3.0.tbz" checksum: - "sha512=6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b" + "sha512=4c46bc334444ff772637deae2f5ba03645d7a1b7db523470a1246acfce79b971c764d964cbb02388639b3161b279700d9ade95da550446fb32aa4849c8a8f283" } \ No newline at end of file diff --git a/compiler/esy.lock/opam/dune-build-info.3.11.1/opam b/compiler/esy.lock/opam/dune-build-info.3.16.0/opam similarity index 73% rename from compiler/esy.lock/opam/dune-build-info.3.11.1/opam rename to compiler/esy.lock/opam/dune-build-info.3.16.0/opam index f0bb6ed48b..8e285d7976 100644 --- a/compiler/esy.lock/opam/dune-build-info.3.11.1/opam +++ b/compiler/esy.lock/opam/dune-build-info.3.16.0/opam @@ -15,7 +15,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08"} "odoc" {with-doc} ] @@ -37,10 +37,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/dune-configurator.3.11.1/opam b/compiler/esy.lock/opam/dune-configurator.3.16.0/opam similarity index 74% rename from compiler/esy.lock/opam/dune-configurator.3.11.1/opam rename to compiler/esy.lock/opam/dune-configurator.3.16.0/opam index 8ee593d155..27c7d7e561 100644 --- a/compiler/esy.lock/opam/dune-configurator.3.11.1/opam +++ b/compiler/esy.lock/opam/dune-configurator.3.16.0/opam @@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.04.0"} "base-unix" "csexp" {>= "1.5.0"} @@ -41,10 +41,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/dune-rpc.3.11.1/opam b/compiler/esy.lock/opam/dune-rpc.3.16.0/opam similarity index 68% rename from compiler/esy.lock/opam/dune-rpc.3.11.1/opam rename to compiler/esy.lock/opam/dune-rpc.3.16.0/opam index 9ec6981475..b45a5743f9 100644 --- a/compiler/esy.lock/opam/dune-rpc.3.11.1/opam +++ b/compiler/esy.lock/opam/dune-rpc.3.16.0/opam @@ -8,7 +8,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "csexp" "ordering" "dyn" @@ -35,10 +35,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/dune.3.11.1/opam b/compiler/esy.lock/opam/dune.3.16.0/opam similarity index 69% rename from compiler/esy.lock/opam/dune.3.11.1/opam rename to compiler/esy.lock/opam/dune.3.16.0/opam index e79328cef9..638f8d9cba 100644 --- a/compiler/esy.lock/opam/dune.3.11.1/opam +++ b/compiler/esy.lock/opam/dune.3.16.0/opam @@ -2,19 +2,19 @@ opam-version: "2.0" synopsis: "Fast, portable, and opinionated build system" description: """ -dune is a build system that was designed to simplify the release of +Dune is a build system that was designed to simplify the release of Jane Street packages. It reads metadata from "dune" files following a very simple s-expression syntax. -dune is fast, has very low-overhead, and supports parallel builds on +Dune is fast, has very low-overhead, and supports parallel builds on all platforms. It has no system dependencies; all you need to build dune or packages using dune is OCaml. You don't need make or bash as long as the packages themselves don't use bash explicitly. -dune supports multi-package development by simply dropping multiple -repositories into the same directory. +Dune is composable; supporting multi-package development by simply +dropping multiple repositories into the same directory. -It also supports multi-context builds, such as building against +Dune also supports multi-context builds, such as building against several opam roots/switches simultaneously. This helps maintaining packages across several versions of OCaml and gives cross-compilation for free. @@ -48,10 +48,10 @@ depends: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/dyn.3.11.1/opam b/compiler/esy.lock/opam/dyn.3.16.0/opam similarity index 66% rename from compiler/esy.lock/opam/dyn.3.11.1/opam rename to compiler/esy.lock/opam/dyn.3.16.0/opam index 30ca00c809..d8252f385b 100644 --- a/compiler/esy.lock/opam/dyn.3.11.1/opam +++ b/compiler/esy.lock/opam/dyn.3.16.0/opam @@ -8,7 +8,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "ordering" {= version} "pp" {>= "1.1.0"} @@ -32,10 +32,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/fiber.3.7.0/opam b/compiler/esy.lock/opam/fiber.3.7.0/opam index 6a402766ce..fbf728c37a 100644 --- a/compiler/esy.lock/opam/fiber.3.7.0/opam +++ b/compiler/esy.lock/opam/fiber.3.7.0/opam @@ -8,7 +8,7 @@ bug-reports: "https://github.com/ocaml-dune/fiber/issues" depends: [ "dune" {>= "3.6"} "ocaml" {>= "4.08"} - "ppx_expect" {with-test} + "ppx_expect" {with-test & < "v0.17"} "dyn" "stdune" "odoc" {with-doc} diff --git a/compiler/esy.lock/opam/gen.1.1/opam b/compiler/esy.lock/opam/gen.1.1/opam index 30e8e332f3..cf9ae07c74 100644 --- a/compiler/esy.lock/opam/gen.1.1/opam +++ b/compiler/esy.lock/opam/gen.1.1/opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "1.1"} "seq" "odoc" {with-doc} - "qcheck" {with-test} + "qcheck" {with-test & >= "0.9"} "qtest" {with-test} "ounit2" {with-test} "ocaml" { >= "4.03.0" } diff --git a/compiler/esy.lock/opam/num.1.4/opam b/compiler/esy.lock/opam/num.1.4/opam deleted file mode 100644 index 0cea40c1e0..0000000000 --- a/compiler/esy.lock/opam/num.1.4/opam +++ /dev/null @@ -1,34 +0,0 @@ -opam-version: "2.0" -synopsis: - "The legacy Num library for arbitrary-precision integer and rational arithmetic" -maintainer: "Xavier Leroy " -authors: ["Valérie Ménissier-Morain" "Pierre Weis" "Xavier Leroy"] -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" -homepage: "https://github.com/ocaml/num/" -bug-reports: "https://github.com/ocaml/num/issues" -depends: [ - "ocaml" {>= "4.06.0"} - "ocamlfind" {build & >= "1.7.3"} -] -conflicts: [ - "base-num" - "ocaml-option-bytecode-only" -] -build: make -install: [ - ["ocamlfind" "remove" "num"] - ["ocamlfind" "remove" "num-top"] - [ - make - "install" {!ocaml:preinstalled} - "findlib-install" {ocaml:preinstalled} - ] -] -dev-repo: "git+https://github.com/ocaml/num.git" -url { - src: "https://github.com/ocaml/num/archive/v1.4.tar.gz" - checksum: [ - "md5=cda2b727e116a0b6a9c03902cc4b2415" - "sha512=0cc9be8ad95704bb683b4bf6698bada1ee9a40dc05924b72adc7b969685c33eeb68ccf174cc09f6a228c48c18fe94af06f28bebc086a24973a066da620db8e6f" - ] -} diff --git a/compiler/esy.lock/opam/num.1.5/opam b/compiler/esy.lock/opam/num.1.5/opam new file mode 100644 index 0000000000..ec7afbd0a3 --- /dev/null +++ b/compiler/esy.lock/opam/num.1.5/opam @@ -0,0 +1,30 @@ +opam-version: "2.0" +maintainer: "Xavier Leroy " +authors: [ + "Valérie Ménissier-Morain" + "Pierre Weis" + "Xavier Leroy" +] +license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" +homepage: "https://github.com/ocaml/num/" +bug-reports: "https://github.com/ocaml/num/issues" +dev-repo: "git+https://github.com/ocaml/num.git" +build: [ + [make "PROFILE=release" + "opam-legacy" {!ocaml:preinstalled & ocaml:version < "5.0.0~~"} + "opam-modern" {ocaml:preinstalled | ocaml:version >= "5.0.0~~"}] + [make "test"] {with-test} +] +depends: [ + "ocaml" {>= "4.06.0"} +] +conflicts: [ "base-num" ] +synopsis: + "The legacy Num library for arbitrary-precision integer and rational arithmetic" +url { + src: "https://github.com/ocaml/num/archive/v1.5.tar.gz" + checksum: [ + "md5=b1f9405dfe5f573ea187f122f789ae57" + "sha512=110dd01140c1c96f5f067aa824bb63f74a26411dcaa65aaf04cb6c44b116ca02aaab9505f431c66964388ce4a31d86da5928b4c0e5557800e834de80bed46495" + ] +} diff --git a/compiler/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam b/compiler/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam index 14c9f75375..a2df8c6154 100644 --- a/compiler/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam +++ b/compiler/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam @@ -10,7 +10,7 @@ homepage: "https://github.com/janestreet/ocaml-compiler-libs" bug-reports: "https://github.com/janestreet/ocaml-compiler-libs/issues" depends: [ "dune" {>= "2.8"} - "ocaml" {>= "4.04.1"} + "ocaml" {>= "4.04.1" & < "5.2.0"} "odoc" {with-doc} ] build: [ diff --git a/compiler/esy.lock/opam/ocamlbuild.0.14.2+win/opam b/compiler/esy.lock/opam/ocamlbuild.0.14.2+win/opam index 19651dfbcb..3a83c98e34 100644 --- a/compiler/esy.lock/opam/ocamlbuild.0.14.2+win/opam +++ b/compiler/esy.lock/opam/ocamlbuild.0.14.2+win/opam @@ -8,7 +8,7 @@ homepage: "https://github.com/ocaml/ocamlbuild/" doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc" bug-reports: "https://github.com/ocaml/ocamlbuild/issues" depends: [ - "ocaml" {>= "4.03"} + "ocaml" {>= "4.03" & < "5.2"} ] conflicts: [ "base-ocamlbuild" diff --git a/compiler/esy.lock/opam/ocamlfind.1.9.6/opam b/compiler/esy.lock/opam/ocamlfind.1.9.3/opam similarity index 70% rename from compiler/esy.lock/opam/ocamlfind.1.9.6/opam rename to compiler/esy.lock/opam/ocamlfind.1.9.3/opam index a81f0c50ef..d734d63b03 100644 --- a/compiler/esy.lock/opam/ocamlfind.1.9.6/opam +++ b/compiler/esy.lock/opam/ocamlfind.1.9.3/opam @@ -13,7 +13,7 @@ authors: "Gerd Stolpmann " homepage: "http://projects.camlcity.org/projects/findlib.html" bug-reports: "https://github.com/ocaml/ocamlfind/issues" depends: [ - "ocaml" {>= "3.08.0"} + "ocaml" {>= "4.00.0" & < "5.0"} ] depopts: ["graphics"] build: [ @@ -34,15 +34,11 @@ install: [ [make "install"] ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} ] -extra-files: ["0001-Harden-test-for-OCaml-5.patch" "md5=3cddbf72164c29d4e50e077a92a37c6c"] -# See https://github.com/ocaml/ocamlfind/pull/61 -patches: ["0001-Harden-test-for-OCaml-5.patch"] dev-repo: "git+https://github.com/ocaml/ocamlfind.git" url { - src: "http://download.camlcity.org/download/findlib-1.9.6.tar.gz" + src: "http://download.camlcity.org/download/findlib-1.9.3.tar.gz" checksum: [ - "md5=96c6ee50a32cca9ca277321262dbec57" - "sha512=cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027" + "md5=24047dd8a0da5322253de9b7aa254e42" + "sha512=27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea" ] } -available: os != "win32" diff --git a/compiler/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch b/compiler/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch deleted file mode 100644 index 8011238cde..0000000000 --- a/compiler/esy.lock/opam/ocamlfind.1.9.6/files/0001-Harden-test-for-OCaml-5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff a/configure b/configure ---- a/configure -+++ b/configure -@@ -294,7 +294,7 @@ - # If findlib has been configured -sitelib $(ocamlc -where) then there's - # nothing to do, but otherwise we need to put OCaml's Standard Library - # into the path setting. -- if [ ! -e "${ocaml_sitelib}/stdlib/META" ]; then -+ if [ ! -e "${ocaml_sitelib}/stdlib.cmi" ]; then - ocamlpath="${ocaml_core_stdlib}${path_sep}${ocamlpath}" - fi - fi diff --git a/compiler/esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam b/compiler/esy.lock/opam/ocamlformat-rpc-lib.0.26.2/opam similarity index 78% rename from compiler/esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam rename to compiler/esy.lock/opam/ocamlformat-rpc-lib.0.26.2/opam index e685d68abd..df66873a6c 100644 --- a/compiler/esy.lock/opam/ocamlformat-rpc-lib.0.26.1/opam +++ b/compiler/esy.lock/opam/ocamlformat-rpc-lib.0.26.2/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.26.1/ocamlformat-0.26.1.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.26.2/ocamlformat-0.26.2.tbz" checksum: [ - "sha256=da006e427f15b9ec612fb808d446599bd9b7c3ee25abeb3d555747a70d74c6d7" - "sha512=b7413f8dc47ba3a2372e89d59cae54f9a602ab81e31cd14ed986a831111080b79a5a3cc45dac04d8ffae5054c35bf29fe9559f145c76c87a30e191ed5400942a" + "sha256=2e4f596bf7aa367a844fe83ba0f6b0bf14b2a65179ddc082363fe9793d0375c5" + "sha512=b03d57462e65b11aa9f78dd5c4548251e8d1c5a1c9662f7502bdb10472aeb9df33c1d407350767a5223fbff9c01d53de85bafacd0274b49abc4b43701b159bee" ] } -x-commit-hash: "6734dfc1992eb782f0a936ce3cd7c78b7c1d39d3" +x-commit-hash: "f5727b32127730a2722f86c7119eb6d8f884e26d" diff --git a/compiler/esy.lock/opam/octavius.1.2.2/opam b/compiler/esy.lock/opam/octavius.1.2.2/opam index 0539c097d1..e67874dc26 100644 --- a/compiler/esy.lock/opam/octavius.1.2.2/opam +++ b/compiler/esy.lock/opam/octavius.1.2.2/opam @@ -29,5 +29,8 @@ synopsis: "Ocamldoc comment syntax parser" description: "Octavius is a library to parse the `ocamldoc` comment syntax." url { src: "https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz" - checksum: "md5=72f9e1d996e6c5089fc513cc9218607b" + checksum: [ + "sha256=eac9104ce0316b69da9c44b9c477700fe0b52a888c89ce4bdf1d2b782a73e0ad" + "md5=72f9e1d996e6c5089fc513cc9218607b" + ] } diff --git a/compiler/esy.lock/opam/omd.1.3.2/opam b/compiler/esy.lock/opam/omd.1.3.2/opam index ad2e5014d0..3a805c0652 100644 --- a/compiler/esy.lock/opam/omd.1.3.2/opam +++ b/compiler/esy.lock/opam/omd.1.3.2/opam @@ -41,7 +41,7 @@ build: [ ] dev-repo: "git+https://github.com/ocaml/omd.git" url { - src: "https://github.com/ocaml/omd/releases/download/1.3.2/omd-1.3.2.tbz" + src: "https://github.com/ocaml/opam-source-archives/raw/main/omd-1.3.2.tbz" checksum: [ "sha256=6023e1642631f08f678eb5725820879ed7bb5a3ffee777cdedebc28c1f85fadb" "sha512=fa2070a5f5d30b2cc422937ac4158bb087134a69d47fa15df403afb1c0c60a73dd436c949faa8d44e0b65bdee039779d86191b55085b717253f91ef20a69ef98" diff --git a/compiler/esy.lock/opam/ordering.3.11.1/opam b/compiler/esy.lock/opam/ordering.3.16.0/opam similarity index 64% rename from compiler/esy.lock/opam/ordering.3.11.1/opam rename to compiler/esy.lock/opam/ordering.3.16.0/opam index 5416c8078f..22e4c32fdc 100644 --- a/compiler/esy.lock/opam/ordering.3.11.1/opam +++ b/compiler/esy.lock/opam/ordering.3.16.0/opam @@ -8,7 +8,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "odoc" {with-doc} ] @@ -30,10 +30,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/ppx_derivers.1.2.1/opam b/compiler/esy.lock/opam/ppx_derivers.1.2.1/opam index 484b2654fe..d06e23b216 100644 --- a/compiler/esy.lock/opam/ppx_derivers.1.2.1/opam +++ b/compiler/esy.lock/opam/ppx_derivers.1.2.1/opam @@ -19,5 +19,8 @@ ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.""" url { src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz" - checksum: "md5=5dc2bf130c1db3c731fe0fffc5648b41" + checksum: [ + "sha256=b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95" + "md5=5dc2bf130c1db3c731fe0fffc5648b41" + ] } diff --git a/compiler/esy.lock/opam/ppx_deriving_yojson.3.7.0/opam b/compiler/esy.lock/opam/ppx_deriving_yojson.3.8.0/opam similarity index 57% rename from compiler/esy.lock/opam/ppx_deriving_yojson.3.7.0/opam rename to compiler/esy.lock/opam/ppx_deriving_yojson.3.8.0/opam index 7642422bff..a7e33d7e21 100644 --- a/compiler/esy.lock/opam/ppx_deriving_yojson.3.7.0/opam +++ b/compiler/esy.lock/opam/ppx_deriving_yojson.3.8.0/opam @@ -1,34 +1,36 @@ opam-version: "2.0" -synopsis: "JSON codec generator for OCaml" -description: """\ -ppx_deriving_yojson is a ppx_deriving plugin that provides -a JSON codec generator.""" maintainer: "whitequark " -authors: "whitequark " +authors: [ "whitequark " ] license: "MIT" -tags: ["syntax" "json"] homepage: "https://github.com/ocaml-ppx/ppx_deriving_yojson" bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues" +dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving_yojson.git" +tags: [ "syntax" "json" ] +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] depends: [ "ocaml" {>= "4.05.0"} "dune" {>= "1.0"} "yojson" {>= "1.6.0"} - "result" "ppx_deriving" {>= "5.1"} - "ppxlib" {>= "0.26.0"} + "ppxlib" {>= "0.30.0"} "ounit2" {with-test} ] -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving_yojson.git" +synopsis: + "JSON codec generator for OCaml" +description: """ +ppx_deriving_yojson is a ppx_deriving plugin that provides +a JSON codec generator. +""" url { src: - "https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.7.0/ppx_deriving_yojson-3.7.0.tar.gz" + "https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.8.0/ppx_deriving_yojson-3.8.0.tbz" checksum: [ - "md5=456be82acb16bbf6be12ab01f9dfaa94" - "sha512=6aa8b3a6e60afd1ce68995bad6776c975b3640303b2049233e661c46300abea1f48916d4e876412de49f35744f31b99c29736e2bb974e1b4a494b0932bbd6e80" + "sha256=fdcbc548be418f061828664a1012ccba6cfba6a35578ea9cbf75fed498e0c2a1" + "sha512=2ce0aed3b1e7b444d368a4f7142da07aff328effcc017435ccd9d45cb518659c69a48b6c8699c800bdee02d65fcea9227f863b2340f7a4c1a5b579b8c5ba2a19" ] -} \ No newline at end of file +} +x-commit-hash: "0644cd505cae97ddb4b2f701a19657fe76cc4a33" diff --git a/compiler/esy.lock/opam/ppxlib.0.29.1/opam b/compiler/esy.lock/opam/ppxlib.0.32.1/opam similarity index 65% rename from compiler/esy.lock/opam/ppxlib.0.29.1/opam rename to compiler/esy.lock/opam/ppxlib.0.32.1/opam index 0a04c32e60..0db44e20ba 100644 --- a/compiler/esy.lock/opam/ppxlib.0.29.1/opam +++ b/compiler/esy.lock/opam/ppxlib.0.32.1/opam @@ -1,9 +1,9 @@ opam-version: "2.0" -synopsis: "Standard library for ppx rewriters" +synopsis: "Standard infrastructure for ppx rewriters" description: """ -Ppxlib is the standard library for ppx rewriters and other programs -that manipulate the in-memory representation of OCaml programs, a.k.a -the "Parsetree". +Ppxlib is the standard infrastructure for ppx rewriters +and other programs that manipulate the in-memory representation of +OCaml programs, a.k.a the "Parsetree". It also comes bundled with two ppx rewriters that are commonly used to write tools that manipulate and/or generate Parsetree values; @@ -20,7 +20,7 @@ doc: "https://ocaml-ppx.github.io/ppxlib/" bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues" depends: [ "dune" {>= "2.7"} - "ocaml" {>= "4.04.1" & < "5.1.0"} + "ocaml" {>= "4.04.1" & < "5.3.0"} "ocaml-compiler-libs" {>= "v0.11.0"} "ppx_derivers" {>= "1.0"} "sexplib0" {>= "v0.12"} @@ -29,12 +29,12 @@ depends: [ "ocamlfind" {with-test} "re" {with-test & >= "1.9.0"} "cinaps" {with-test & >= "v0.12.1"} - "base" {with-test & < "v0.16.0" } - "stdio" {with-test} "odoc" {with-doc} ] conflicts: [ "ocaml-migrate-parsetree" {< "2.0.0"} + "ocaml-base-compiler" {= "5.1.0~alpha1"} + "ocaml-variants" {= "5.1.0~alpha1+options"} "base-effects" ] build: [ @@ -54,10 +54,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git" url { src: - "https://github.com/ocaml-ppx/ppxlib/releases/download/0.29.1/ppxlib-0.29.1.tbz" + "https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.1/ppxlib-0.32.1.tbz" checksum: [ - "sha256=c8ea8c8770414fdba6612e7f2d814b21a493daa974ea862a90c8e6c766e5dd79" - "sha512=edc468e9111cc26e31825e475fd72f55123a22fe86548e07e7d111796fecb8d60359b1b53c7eac383e5e2114cbae74dfd9c166f330e84cbeab4ddfd5797e322f" + "sha256=9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f" + "sha512=7b93b622b119478dde03adcf4993e73ea937c91c280e453ccee631c682d8589ecb31841f11d6a14966239954e22e000da8afbe25a0f089532c7210b698c52553" ] } -x-commit-hash: "36fcba0408b78963a730e0be92abdbab00b0ea26" +x-commit-hash: "cd138a752ae6f21ad649c531b3b2276f332b3bb0" diff --git a/compiler/esy.lock/opam/result.1.5/opam b/compiler/esy.lock/opam/result.1.5/opam index 6b7b68d724..da55ed4631 100644 --- a/compiler/esy.lock/opam/result.1.5/opam +++ b/compiler/esy.lock/opam/result.1.5/opam @@ -18,5 +18,8 @@ Result module defined in this library.""" url { src: "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz" - checksum: "md5=1b82dec78849680b49ae9a8a365b831b" + checksum: [ + "sha256=7c3a5e238558f4c1a4f5acca816bc705a0e12f68dc0005c61ddbf2e6cab8ee32" + "md5=1b82dec78849680b49ae9a8a365b831b" + ] } diff --git a/compiler/esy.lock/opam/seq.base/files/META.seq b/compiler/esy.lock/opam/seq.base/files/META.seq deleted file mode 100644 index 06b95eff3f..0000000000 --- a/compiler/esy.lock/opam/seq.base/files/META.seq +++ /dev/null @@ -1,4 +0,0 @@ -name="seq" -version="[distributed with OCaml 4.07 or above]" -description="dummy backward-compatibility package for iterators" -requires="" diff --git a/compiler/esy.lock/opam/seq.base/files/seq.install b/compiler/esy.lock/opam/seq.base/files/seq.install deleted file mode 100644 index c4d70206e1..0000000000 --- a/compiler/esy.lock/opam/seq.base/files/seq.install +++ /dev/null @@ -1,3 +0,0 @@ -lib:[ - "META.seq" {"META"} -] diff --git a/compiler/esy.lock/opam/seq.base/opam b/compiler/esy.lock/opam/seq.base/opam index b33d8c7da1..c732d3ebe0 100644 --- a/compiler/esy.lock/opam/seq.base/opam +++ b/compiler/esy.lock/opam/seq.base/opam @@ -9,7 +9,19 @@ dev-repo: "git+https://github.com/ocaml/ocaml.git" bug-reports: "https://caml.inria.fr/mantis/main_page.php" synopsis: "Compatibility package for OCaml's standard iterator type starting from 4.07." -extra-files: [ - ["seq.install" "md5=026b31e1df290373198373d5aaa26e42"] - ["META.seq" "md5=b33c8a1a6c7ed797816ce27df4855107"] -] +extra-source "seq.install" { + src: + "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/seq/seq.install" + checksum: [ + "sha256=fff926c2c4d5a82b6c94c60c4c35eb06e3d39975893ebe6b1f0e6557cbe34904" + "md5=026b31e1df290373198373d5aaa26e42" + ] +} +extra-source "META.seq" { + src: + "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/seq/META.seq" + checksum: [ + "sha256=e95062b4d0519ef8335c02f7d0f1952d11b814c7ab7e6d566a206116162fa2be" + "md5=b33c8a1a6c7ed797816ce27df4855107" + ] +} diff --git a/compiler/esy.lock/opam/sexplib0.v0.15.1/opam b/compiler/esy.lock/opam/sexplib0.v0.15.1/opam index 123ccd03cf..5b03291c10 100644 --- a/compiler/esy.lock/opam/sexplib0.v0.15.1/opam +++ b/compiler/esy.lock/opam/sexplib0.v0.15.1/opam @@ -21,6 +21,10 @@ OCaml's standard library that was developed by Jane Street, the largest industrial user of OCaml. " url { -src: "https://github.com/janestreet/sexplib0/archive/refs/tags/v0.15.1.tar.gz" -checksum: "md5=ab8fd6273f35a792cad48cbb3024a7f9" + src: + "https://github.com/janestreet/sexplib0/archive/refs/tags/v0.15.1.tar.gz" + checksum: [ + "sha256=e8cd817eb3bc3f84a2065fa0255ab2b986a24baf1cc329d05627c516464267b3" + "md5=ab8fd6273f35a792cad48cbb3024a7f9" + ] } diff --git a/compiler/esy.lock/opam/stdune.3.11.1/opam b/compiler/esy.lock/opam/stdune.3.16.0/opam similarity index 70% rename from compiler/esy.lock/opam/stdune.3.11.1/opam rename to compiler/esy.lock/opam/stdune.3.16.0/opam index 2dfc925395..dc2da5bc97 100644 --- a/compiler/esy.lock/opam/stdune.3.11.1/opam +++ b/compiler/esy.lock/opam/stdune.3.16.0/opam @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "base-unix" "dyn" {= version} @@ -36,10 +36,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/xdg.3.11.1/opam b/compiler/esy.lock/opam/xdg.3.16.0/opam similarity index 67% rename from compiler/esy.lock/opam/xdg.3.11.1/opam rename to compiler/esy.lock/opam/xdg.3.16.0/opam index 9a6a17d033..b6b6823d3e 100644 --- a/compiler/esy.lock/opam/xdg.3.11.1/opam +++ b/compiler/esy.lock/opam/xdg.3.16.0/opam @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "3.5"} + "dune" {>= "3.12"} "ocaml" {>= "4.08"} "odoc" {with-doc} ] @@ -31,10 +31,10 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/3.11.1/dune-3.11.1.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" checksum: [ - "sha256=866f2307adadaf7604f3bf9d98bb4098792baa046953a6726c96c40fc5ed3f71" - "sha512=c888153b204a16bcfed2636de776bbd5f9ca84484e716cc1e9ef3ba3c904e9dd15a2609ae943cddb6097912623ec54618c58386d6730ff742d746850400fb3cc" + "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" + "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" ] } -x-commit-hash: "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf" +x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" diff --git a/compiler/esy.lock/opam/yojson.2.1.1/opam b/compiler/esy.lock/opam/yojson.2.2.2/opam similarity index 73% rename from compiler/esy.lock/opam/yojson.2.1.1/opam rename to compiler/esy.lock/opam/yojson.2.2.2/opam index 0703d53bfe..1d971fe0f0 100644 --- a/compiler/esy.lock/opam/yojson.2.1.1/opam +++ b/compiler/esy.lock/opam/yojson.2.2.2/opam @@ -12,12 +12,11 @@ maintainer: [ authors: ["Martin Jambon"] license: "BSD-3-Clause" homepage: "https://github.com/ocaml-community/yojson" -doc: "https://ocaml-community.github.io/yojson" +doc: "https://ocaml.org/p/yojson/latest" bug-reports: "https://github.com/ocaml-community/yojson/issues" depends: [ "dune" {>= "2.7"} "ocaml" {>= "4.02.3"} - "cppo" {build} "alcotest" {with-test & >= "0.8.5"} "seq" {>= "0.2.2"} "odoc" {with-doc} @@ -39,10 +38,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-community/yojson.git" url { src: - "https://github.com/ocaml-community/yojson/releases/download/2.1.1/yojson-2.1.1.tbz" + "https://github.com/ocaml-community/yojson/releases/download/2.2.2/yojson-2.2.2.tbz" checksum: [ - "sha256=d58183207b198dc065866239066e074c34f9e139c0d9c4175a38809790e88173" - "sha512=f7b8529900acb29bc6236d8312d3ebcadbcb3f9d361c8acaed9f7fc7e30527b41a1f3cff80382dde445e6da18a4edc5a9c6758af24affce1022d0741dbd9daeb" + "sha256=9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595" + "sha512=ac52eae3ca1d3129a7885ca638e6ae5bcfc387598a82cc30d3e4988fd154f1756719c399f96e950d898c79a6dbd4ccc44b6f468bcafbd620e6945a0415b41e0c" ] } -x-commit-hash: "57bc8ca0eaf5bdb423fcdece49ea0d1c2866f90c" +x-commit-hash: "3f82b79d1865eec82c6f498ee1835a90c74c31b4" diff --git a/compiler/esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override/files/darwin.patch b/compiler/esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override/files/darwin.patch new file mode 100644 index 0000000000..480861dca9 --- /dev/null +++ b/compiler/esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override/files/darwin.patch @@ -0,0 +1,26 @@ +--- ./otherlibs/configurator/src/v1.ml ++++ ./otherlibs/configurator/src/v1.ml +@@ -696,13 +696,16 @@ + which c "brew" + >>= fun brew -> + let new_pkg_config_path = +- let prefix = String.trim (Process.run_capture_exn c ~dir brew [ "--prefix" ]) in +- let p = sprintf "%s/opt/%s/lib/pkgconfig" (quote_if_needed prefix) package in +- Option.some_if +- (match Sys.is_directory p with +- | s -> s +- | exception Sys_error _ -> false) +- p ++ try ++ let prefix = String.trim (Process.run_capture_exn c ~dir brew [ "--prefix" ]) in ++ let p = sprintf "%s/opt/%s/lib/pkgconfig" (quote_if_needed prefix) package in ++ Option.some_if ++ (match Sys.is_directory p with ++ | s -> s ++ | exception Sys_error _ -> false) ++ p ++ with ++ | _ -> None + in + new_pkg_config_path + >>| fun new_pkg_config_path -> diff --git a/compiler/esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override/package.json b/compiler/esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override/package.json new file mode 100644 index 0000000000..a34fc43ad0 --- /dev/null +++ b/compiler/esy.lock/overrides/opam__s__dune_configurator_opam__c__3.16.0_opam_override/package.json @@ -0,0 +1,27 @@ +{ + "build": [ + [ + "bash", + "-c", + "patch -p1 < darwin.patch" + ], + [ + "rm", + "-rf", + "vendor/csexp" + ], + [ + "rm", + "-rf", + "vendor/pp" + ], + [ + "dune", + "build", + "-p", + "dune-configurator", + "-j", + "4" + ] + ] +} diff --git a/compiler/esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override/files/num-1.4.patch b/compiler/esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override/files/num-1.4.patch deleted file mode 100644 index dad75fa572..0000000000 --- a/compiler/esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override/files/num-1.4.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 8ad0e2c..d41d63c 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,16 +1,16 @@ --OCAMLC=ocamlc --OCAMLOPT=ocamlopt --OCAMLDEP=ocamldep --OCAMLMKLIB=ocamlmklib --OCAMLFIND=ocamlfind -+OCAMLC=$(shell which ocamlc) -+OCAMLOPT=$(shell which ocamlopt) -+OCAMLDEP=$(shell which ocamldep) -+OCAMLMKLIB=$(shell which ocamlmklib) -+OCAMLFIND=$(shell which ocamlfind) - INSTALL_DATA=install -m 644 - INSTALL_DLL=install - INSTALL_DIR=install -d - STDLIBDIR=$(shell $(OCAMLC) -where) - DESTDIR ?= - --include $(STDLIBDIR)/Makefile.config - -+include $(STDLIBDIR)/Makefile.config - ifeq "$(filter i386 amd64 arm64 power,$(ARCH))" "" - # Unsupported architecture - BNG_ARCH=generic -@@ -86,14 +86,14 @@ endif - VERSION=$(shell sed -ne 's/^ *version *: *"\([^"]*\)".*$$/\1/p' ../num.opam) - - install: -- $(INSTALL_DIR) $(DESTDIR)$(STDLIBDIR) -+ $(INSTALL_DIR) $(LIBDIR) - sed -e 's/%%VERSION%%/$(VERSION)/g' META.in > META - $(OCAMLFIND) install num META - rm -f META -- $(INSTALL_DATA) $(TOINSTALL) $(DESTDIR)$(STDLIBDIR) -+ $(INSTALL_DATA) $(TOINSTALL) $(LIBDIR) - ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true" -- $(INSTALL_DIR) $(DESTDIR)$(STDLIBDIR)/stublibs -- $(INSTALL_DLL) $(TOINSTALL_STUBS) $(DESTDIR)$(STDLIBDIR)/stublibs -+ $(INSTALL_DIR) $(LIBDIR)/stublibs -+ $(INSTALL_DLL) $(TOINSTALL_STUBS) $(LIBDIR)/stublibs - endif - - findlib-install: -@@ -105,9 +105,9 @@ findlib-uninstall: - $(OCAMLFIND) remove num - - uninstall: findlib-uninstall -- cd $(DESTDIR)$(STDLIBDIR) && rm -f $(TOINSTALL) -+ cd $(LIBDIR) && rm -f $(TOINSTALL) - ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true" -- cd $(DESTDIR)$(STDLIBDIR)/stublibs && rm -f $(TOINSTALL_STUBS) -+ cd $(LIBDIR)/stublibs && rm -f $(TOINSTALL_STUBS) - endif - - clean: diff --git a/compiler/esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override/package.json b/compiler/esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override/package.json deleted file mode 100644 index 4199a64edd..0000000000 --- a/compiler/esy.lock/overrides/opam__s__num_opam__c__1.4_opam_override/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "buildsInSource": true, - "build": [ - [ - "make" - ] - ], - "install": [ - [ - "make", - "LIBDIR=#{self.install / 'lib'}", - "findlib-install" - ] - ], - "exportedEnv": { - "CAML_LD_LIBRARY_PATH": { - "val": "#{self.install / 'lib' / 'num' : $CAML_LD_LIBRARY_PATH}", - "scope": "global" - } - }, - "dependencies": { - "ocaml": "*", - "@opam/ocamlfind": "*" - } -} diff --git a/compiler/esy.lock/overrides/opam__s__num_opam__c__1.5_opam_override/package.json b/compiler/esy.lock/overrides/opam__s__num_opam__c__1.5_opam_override/package.json new file mode 100644 index 0000000000..03f057e69b --- /dev/null +++ b/compiler/esy.lock/overrides/opam__s__num_opam__c__1.5_opam_override/package.json @@ -0,0 +1,10 @@ +{ + "buildsInSource": true, + "build": "make PROFILE=release opam-modern", + "exportedEnv": { + "CAML_LD_LIBRARY_PATH": { + "val": "#{self.install / 'lib' / 'num' : $CAML_LD_LIBRARY_PATH}", + "scope": "global" + } + } +} diff --git a/compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/files/findlib.patch b/compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/files/findlib.patch new file mode 100644 index 0000000000..3aa5aa6965 --- /dev/null +++ b/compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/files/findlib.patch @@ -0,0 +1,485 @@ +--- ./Makefile ++++ ./Makefile +@@ -57,16 +57,16 @@ + cat findlib.conf.in | \ + $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf + if ./tools/cmd_from_same_dir ocamlc; then \ +- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ ++ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamlopt; then \ +- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ ++ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldep; then \ +- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ ++ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + if ./tools/cmd_from_same_dir ocamldoc; then \ +- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ ++ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ + fi + + .PHONY: install-doc +--- ./src/findlib/findlib_config.mlp ++++ ./src/findlib/findlib_config.mlp +@@ -24,3 +24,5 @@ + | "MacOS" -> "" (* don't know *) + | _ -> failwith "Unknown Sys.os_type" + ;; ++ ++let exec_suffix = "@EXEC_SUFFIX@";; +--- ./src/findlib/findlib.ml ++++ ./src/findlib/findlib.ml +@@ -28,15 +28,20 @@ + let conf_ldconf = ref "";; + let conf_ignore_dups_in = ref ([] : string list);; + +-let ocamlc_default = "ocamlc";; +-let ocamlopt_default = "ocamlopt";; +-let ocamlcp_default = "ocamlcp";; +-let ocamloptp_default = "ocamloptp";; +-let ocamlmklib_default = "ocamlmklib";; +-let ocamlmktop_default = "ocamlmktop";; +-let ocamldep_default = "ocamldep";; +-let ocamlbrowser_default = "ocamlbrowser";; +-let ocamldoc_default = "ocamldoc";; ++let add_exec str = ++ match Findlib_config.exec_suffix with ++ | "" -> str ++ | a -> str ^ a ;; ++let ocamlc_default = add_exec "ocamlc";; ++let ocamlopt_default = add_exec "ocamlopt";; ++let ocamlcp_default = add_exec "ocamlcp";; ++let ocamloptp_default = add_exec "ocamloptp";; ++let ocamlmklib_default = add_exec "ocamlmklib";; ++let ocamlmktop_default = add_exec "ocamlmktop";; ++let ocamldep_default = add_exec "ocamldep";; ++let ocamlbrowser_default = add_exec "ocamlbrowser";; ++let ocamldoc_default = add_exec "ocamldoc";; ++ + + + let init_manually +--- ./src/findlib/fl_package_base.ml ++++ ./src/findlib/fl_package_base.ml +@@ -133,7 +133,15 @@ + List.find (fun def -> def.def_var = "exists_if") p.package_defs in + let files = Fl_split.in_words def.def_value in + List.exists +- (fun file -> Sys.file_exists (Filename.concat d' file)) ++ (fun file -> ++ let fln = Filename.concat d' file in ++ let e = Sys.file_exists fln in ++ (* necessary for ppx executables *) ++ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then ++ e ++ else ++ Sys.file_exists (fln ^ ".exe") ++ ) + files + with Not_found -> true in + +--- ./src/findlib/fl_split.ml ++++ ./src/findlib/fl_split.ml +@@ -126,10 +126,17 @@ + | '/' | '\\' -> true + | _ -> false in + let norm_dir_win() = +- if l >= 1 && s.[0] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; +- if l >= 2 && s.[1] = '/' then +- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; ++ if l >= 1 then ( ++ if s.[0] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[0] ; ++ if l >= 2 then ++ if s.[1] = '/' then ++ Buffer.add_char b '\\' ++ else ++ Buffer.add_char b s.[1]; ++ ); + for k = 2 to l - 1 do + let c = s.[k] in + if is_slash c then ( +--- ./src/findlib/frontend.ml ++++ ./src/findlib/frontend.ml +@@ -31,10 +31,18 @@ + else + Sys_error (arg ^ ": " ^ Unix.error_message code) + ++let is_win = Sys.os_type = "Win32" ++ ++let () = ++ match Findlib_config.system with ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> ++ (try set_binary_mode_out stdout true with _ -> ()); ++ (try set_binary_mode_out stderr true with _ -> ()); ++ | _ -> () + + let slashify s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> + let b = Buffer.create 80 in + String.iter + (function +@@ -49,7 +57,7 @@ + + let out_path ?(prefix="") s = + match Findlib_config.system with +- | "mingw" | "mingw64" | "cygwin" -> ++ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> + let u = slashify s in + prefix ^ + (if String.contains u ' ' then +@@ -273,11 +281,9 @@ + + + let identify_dir d = +- match Sys.os_type with +- | "Win32" -> +- failwith "identify_dir" (* not available *) +- | _ -> +- let s = Unix.stat d in ++ if is_win then ++ failwith "identify_dir"; (* not available *) ++ let s = Unix.stat d in + (s.Unix.st_dev, s.Unix.st_ino) + ;; + +@@ -459,6 +465,96 @@ + ) + packages + ++let rewrite_cmd s = ++ if s = "" || not is_win then ++ s ++ else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_cmd s = ++ if s = "" || not is_win then s else ++ let s = ++ let l = String.length s in ++ let b = Buffer.create l in ++ for i = 0 to pred l do ++ match s.[i] with ++ | '/' -> Buffer.add_char b '\\' ++ | x -> Buffer.add_char b x ++ done; ++ Buffer.contents b ++ in ++ if (Filename.is_implicit s && String.contains s '\\' = false) || ++ Filename.check_suffix (String.lowercase s) ".exe" then ++ s ++ else ++ let s' = s ^ ".exe" in ++ if Sys.file_exists s' then ++ s' ++ else ++ s ++ ++let rewrite_pp cmd = ++ if not is_win then cmd else ++ let module T = struct exception Keep end in ++ let is_whitespace = function ++ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true ++ | _ -> false in ++ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) ++ let is_unsafe_char = function ++ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true ++ | _ -> false in ++ let len = String.length cmd in ++ let buf = Buffer.create (len + 4) in ++ let buf_cmd = Buffer.create len in ++ let rec iter_ws i = ++ if i >= len then () else ++ let cur = cmd.[i] in ++ if is_whitespace cur then ( ++ Buffer.add_char buf cur; ++ iter_ws (succ i) ++ ) ++ else ++ iter_cmd i ++ and iter_cmd i = ++ if i >= len then add_buf_cmd () else ++ let cur = cmd.[i] in ++ if is_unsafe_char cur || cur = '"' || cur = '\'' then ++ raise T.Keep; ++ if is_whitespace cur then ( ++ add_buf_cmd (); ++ Buffer.add_substring buf cmd i (len - i) ++ ) ++ else ( ++ Buffer.add_char buf_cmd cur; ++ iter_cmd (succ i) ++ ) ++ and add_buf_cmd () = ++ if Buffer.length buf_cmd > 0 then ++ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) ++ in ++ try ++ iter_ws 0; ++ Buffer.contents buf ++ with ++ | T.Keep -> cmd + + let process_pp_spec syntax_preds packages pp_opts = + (* Returns: pp_command *) +@@ -549,7 +645,7 @@ + None -> [] + | Some cmd -> + ["-pp"; +- cmd ^ " " ^ ++ (rewrite_cmd cmd) ^ " " ^ + String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ + String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ + String.concat " " (List.map Filename.quote pp_opts)] +@@ -625,9 +721,11 @@ + in + try + let preprocessor = ++ rewrite_cmd ( + resolve_path + ~base ~explicit:true +- (package_property predicates pname "ppx") in ++ (package_property predicates pname "ppx") ) ++ in + ["-ppx"; String.concat " " (preprocessor :: options)] + with Not_found -> [] + ) +@@ -895,6 +993,14 @@ + switch (e.g. -L instead of -L ) + *) + ++(* We may need to remove files on which we do not have complete control. ++ On Windows, removing a read-only file fails so try to change the ++ mode of the file first. *) ++let remove_file fname = ++ try Sys.remove fname ++ with Sys_error _ when is_win -> ++ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); ++ Sys.remove fname + + let ocamlc which () = + +@@ -1022,9 +1128,12 @@ + + "-intf", + Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); +- ++ + "-pp", +- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); ++ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); ++ ++ "-ppx", ++ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); + + "-thread", + Arg.Unit (fun _ -> threads := threads_default); +@@ -1237,7 +1346,7 @@ + with + any -> + close_out initl; +- Sys.remove initl_file_name; ++ remove_file initl_file_name; + raise any + end; + +@@ -1245,9 +1354,9 @@ + at_exit + (fun () -> + let tr f x = try f x with _ -> () in +- tr Sys.remove initl_file_name; +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); +- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); ++ tr remove_file initl_file_name; ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); ++ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); + ); + + let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in +@@ -1493,7 +1602,9 @@ + [ "-v", Arg.Unit (fun () -> verbose := Verbose); + "-pp", Arg.String (fun s -> + pp_specified := true; +- options := !options @ ["-pp"; s]); ++ options := !options @ ["-pp"; rewrite_pp s]); ++ "-ppx", Arg.String (fun s -> ++ options := !options @ ["-ppx"; rewrite_pp s]); + ] + ) + ) +@@ -1672,7 +1783,9 @@ + Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); + + "-pp", Arg.String (fun s -> pp_specified := true; +- add_spec_fn "-pp" s); ++ add_spec_fn "-pp" (rewrite_pp s)); ++ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); ++ + ] + ) + ) +@@ -1830,7 +1943,10 @@ + output_string ch_out append; + close_out ch_out; + close_in ch_in; +- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; ++ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime ++ with Unix.Unix_error(e,_,_) -> ++ prerr_endline("Warning: setting utimes for " ^ outpath ++ ^ ": " ^ Unix.error_message e)); + + prerr_endline("Installed " ^ outpath); + with +@@ -1882,6 +1998,8 @@ + Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in + let f = + Unix.in_channel_of_descr fd in ++ if is_win then ++ set_binary_mode_in f false; + try + let line = input_line f in + let is_my_file = (line = pkg) in +@@ -2208,7 +2326,7 @@ + let lines = read_ldconf !ldconf in + let dlldir_norm = Fl_split.norm_dir dlldir in + let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in +- let ci_filesys = (Sys.os_type = "Win32") in ++ let ci_filesys = is_win in + let check_dir d = + let d' = Fl_split.norm_dir d in + (d' = dlldir_norm) || +@@ -2356,7 +2474,7 @@ + List.iter + (fun file -> + let absfile = Filename.concat dlldir file in +- Sys.remove absfile; ++ remove_file absfile; + prerr_endline ("Removed " ^ absfile) + ) + dll_files +@@ -2365,7 +2483,7 @@ + (* Remove the files from the package directory: *) + if Sys.file_exists pkgdir then begin + let files = Sys.readdir pkgdir in +- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; ++ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; + Unix.rmdir pkgdir; + prerr_endline ("Removed " ^ pkgdir) + end +@@ -2415,7 +2533,9 @@ + + + let print_configuration() = ++ let sl = slashify in + let dir s = ++ let s = sl s in + if Sys.file_exists s then + s + else +@@ -2453,27 +2573,27 @@ + if md = "" then "the corresponding package directories" else dir md + ); + Printf.printf "The standard library is assumed to reside in:\n %s\n" +- (Findlib.ocaml_stdlib()); ++ (sl (Findlib.ocaml_stdlib())); + Printf.printf "The ld.conf file can be found here:\n %s\n" +- (Findlib.ocaml_ldconf()); ++ (sl (Findlib.ocaml_ldconf())); + flush stdout + | Some "conf" -> +- print_endline (Findlib.config_file()) ++ print_endline (sl (Findlib.config_file())) + | Some "path" -> +- List.iter print_endline (Findlib.search_path()) ++ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) + | Some "destdir" -> +- print_endline (Findlib.default_location()) ++ print_endline ( sl (Findlib.default_location())) + | Some "metadir" -> +- print_endline (Findlib.meta_directory()) ++ print_endline ( sl (Findlib.meta_directory())) + | Some "metapath" -> + let mdir = Findlib.meta_directory() in + let ddir = Findlib.default_location() in +- print_endline +- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") ++ print_endline ( sl ++ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) + | Some "stdlib" -> +- print_endline (Findlib.ocaml_stdlib()) ++ print_endline ( sl (Findlib.ocaml_stdlib())) + | Some "ldconf" -> +- print_endline (Findlib.ocaml_ldconf()) ++ print_endline ( sl (Findlib.ocaml_ldconf())) + | _ -> + assert false + ;; +@@ -2481,7 +2601,7 @@ + + let ocamlcall pkg cmd = + let dir = package_directory pkg in +- let path = Filename.concat dir cmd in ++ let path = rewrite_cmd (Filename.concat dir cmd) in + begin + try Unix.access path [ Unix.X_OK ] + with +@@ -2647,6 +2767,10 @@ + | Sys_error f -> + prerr_endline ("ocamlfind: " ^ f); + exit 2 ++ | Unix.Unix_error (e, fn, f) -> ++ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f ++ ^ ": " ^ Unix.error_message e); ++ exit 2 + | Findlib.No_such_package(pkg,info) -> + prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ + (if info <> "" then " - " ^ info else "")); +--- ./src/findlib/Makefile ++++ ./src/findlib/Makefile +@@ -90,6 +90,7 @@ + cat findlib_config.mlp | \ + $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ + $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ ++ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ + sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ + -e 's;@SYSTEM@;$(SYSTEM);g' \ + >findlib_config.ml +--- ./src/findlib/frontend.ml ++++ ./src/findlib/frontend.ml +@@ -281,10 +281,8 @@ + + + let identify_dir d = +- if is_win then +- failwith "identify_dir"; (* not available *) + let s = Unix.stat d in +- (s.Unix.st_dev, s.Unix.st_ino) ++ (s.Unix.st_dev, s.Unix.st_ino) + ;; + + diff --git a/compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json b/compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/package.json similarity index 100% rename from compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/package.json rename to compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.3_opam_override/package.json diff --git a/compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch b/compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch deleted file mode 100644 index d545632af9..0000000000 --- a/compiler/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.9.6_opam_override/files/findlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -55,7 +55,7 @@ - export USE_CYGPATH; \ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' | \ -- $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' -p >findlib.conf -+ $(SH) tools/patch '@FINDLIB_PATH@' '$(FINDLIB_PATH)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ - echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ - fi From 70cceaf01cc4e6ad21674be5d3ad12dcbbf40470 Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Mon, 1 Jul 2024 08:50:01 -0500 Subject: [PATCH 12/14] Only record backtrace when not running in jsoo --- compiler/grainc/grainc.re | 2 +- compiler/src/typed/module_resolution.re | 2 +- compiler/test/TestFramework.re | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/grainc/grainc.re b/compiler/grainc/grainc.re index f903e0b11d..251b2e3ed4 100644 --- a/compiler/grainc/grainc.re +++ b/compiler/grainc/grainc.re @@ -28,7 +28,7 @@ let () = let compile_file = (name, outfile_arg) => { if (!Printexc.backtrace_status() && Grain_utils.Config.verbose^) { - Printexc.record_backtrace(true); + Printexc.record_backtrace(Sys.backend_type != Other("js_of_ocaml")); }; try({ let outfile = diff --git a/compiler/src/typed/module_resolution.re b/compiler/src/typed/module_resolution.re index 39b542cf31..70a7a0b145 100644 --- a/compiler/src/typed/module_resolution.re +++ b/compiler/src/typed/module_resolution.re @@ -578,4 +578,4 @@ let () = | _ => None, ); -let () = Printexc.record_backtrace(true); +let () = Printexc.record_backtrace(Sys.backend_type != Other("js_of_ocaml")); diff --git a/compiler/test/TestFramework.re b/compiler/test/TestFramework.re index e1c612cad2..e3a386fe4e 100644 --- a/compiler/test/TestFramework.re +++ b/compiler/test/TestFramework.re @@ -64,7 +64,7 @@ let () = { Config.debug := true; Config.wat := true; Config.color_enabled := false; - Printexc.record_backtrace(true); + Printexc.record_backtrace(Sys.backend_type != Other("js_of_ocaml")); }; include Rely.Make({ From e6d84eae05e65414c0f2bc73d6eb83244fe0e03f Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Mon, 1 Jul 2024 09:50:39 -0500 Subject: [PATCH 13/14] dune 3 and hacks.js --- compiler/dune | 5 +++++ compiler/dune-project | 2 +- compiler/grainc/dune | 3 +-- compiler/graindoc/dune | 3 +-- compiler/grainformat/dune | 3 +-- compiler/grainlsp/dune | 1 - compiler/test/dune | 2 +- compiler/test/hacks.js | 4 ++++ 8 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 compiler/test/hacks.js diff --git a/compiler/dune b/compiler/dune index 86e47b4b25..de1f90367c 100644 --- a/compiler/dune +++ b/compiler/dune @@ -7,3 +7,8 @@ (name js) (deps grainc/grainc.bc.js graindoc/graindoc.bc.js grainformat/grainformat.bc.js grainlsp/grainlsp.bc.js test/test.bc.js)) + +(env + (_ + (js_of_ocaml + (flags :standard --no-sourcemap --no-extern-fs --disable use-js-string)))) diff --git a/compiler/dune-project b/compiler/dune-project index 961845d1ae..4342c30eee 100644 --- a/compiler/dune-project +++ b/compiler/dune-project @@ -1,4 +1,4 @@ -(lang dune 2.3) +(lang dune 3.0) (name grain) (version 0.6.4) (using menhir 2.0) diff --git a/compiler/grainc/dune b/compiler/grainc/dune index d3badcfbe1..75ca29f039 100644 --- a/compiler/grainc/dune +++ b/compiler/grainc/dune @@ -8,5 +8,4 @@ (:standard (:include ./config/flags.sexp))) (libraries grain grain_diagnostics binaryen dune-build-info) - (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet))) + (js_of_ocaml)) diff --git a/compiler/graindoc/dune b/compiler/graindoc/dune index d60378893c..d2b25249b8 100644 --- a/compiler/graindoc/dune +++ b/compiler/graindoc/dune @@ -17,5 +17,4 @@ binaryen dune-build-info) (preprocess (pps ppx_deriving_cmdliner)) - (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet))) + (js_of_ocaml)) diff --git a/compiler/grainformat/dune b/compiler/grainformat/dune index 90d1ad7e06..99c281e439 100644 --- a/compiler/grainformat/dune +++ b/compiler/grainformat/dune @@ -11,5 +11,4 @@ binaryen dune-build-info) (preprocess (pps ppx_deriving_cmdliner)) - (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet))) + (js_of_ocaml)) diff --git a/compiler/grainlsp/dune b/compiler/grainlsp/dune index 26f090ca4e..b948d8c861 100644 --- a/compiler/grainlsp/dune +++ b/compiler/grainlsp/dune @@ -10,5 +10,4 @@ (libraries cmdliner grain_utils grain_language_server grain_formatting dune-build-info) (js_of_ocaml - (flags --no-sourcemap --no-extern-fs --quiet) (javascript_files hacks.js))) diff --git a/compiler/test/dune b/compiler/test/dune index a8b92d0ccd..9d5576490b 100644 --- a/compiler/test/dune +++ b/compiler/test/dune @@ -22,4 +22,4 @@ (libraries grain grain-tests.framework grain-tests.suites grain-tests.utils) (modules test) (js_of_ocaml - (flags --no-sourcemap --quiet))) + (javascript_files hacks.js))) diff --git a/compiler/test/hacks.js b/compiler/test/hacks.js new file mode 100644 index 0000000000..4b4d11b9c1 --- /dev/null +++ b/compiler/test/hacks.js @@ -0,0 +1,4 @@ +//Provides: caml_record_backtrace +function caml_record_backtrace(b) { + return 0; +} From f41b8fdf72aa5ff2bd3ce0d990fc9c800249387a Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Sun, 28 Jul 2024 09:12:13 -0500 Subject: [PATCH 14/14] test jsoo master --- compiler/esy.json | 5 +- compiler/esy.lock/index.json | 72 +++++++++---------- .../opam | 7 +- .../{ppxlib.0.32.1 => ppxlib.0.33.0}/opam | 8 +-- compiler/test/dune | 4 +- compiler/test/hacks.js | 4 -- 6 files changed, 46 insertions(+), 54 deletions(-) rename compiler/esy.lock/opam/{bigstringaf.0.9.1 => bigstringaf.0.10.0}/opam (85%) rename compiler/esy.lock/opam/{ppxlib.0.32.1 => ppxlib.0.33.0}/opam (82%) delete mode 100644 compiler/test/hacks.js diff --git a/compiler/esy.json b/compiler/esy.json index f3597c5e0e..46c85a8ca5 100644 --- a/compiler/esy.json +++ b/compiler/esy.json @@ -57,7 +57,7 @@ "@opam/rely": "^4.0.0" }, "resolutions": { - "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6", + "@opam/js_of_ocaml-compiler": "ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#7221b9c8a6e54a2f008c8868abc62acf4825c993", "@opam/fp": "reasonml/reason-native:fp.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/fs": "reasonml/reason-native:fs.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/ppx_deriving_cmdliner": "hammerlab/ppx_deriving_cmdliner:ppx_deriving_cmdliner.opam#1f086651fe7f8dd98e371b09c6fcc4dbc6db1c7c", @@ -67,7 +67,8 @@ "@opam/pastel": "reasonml/reason-native:pastel.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/rely": "reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0", "@opam/ocamlfind": "1.9.3", - "@opam/ocamlbuild": "0.14.2+win" + "@opam/ocamlbuild": "0.14.2+win", + "@opam/num": "1.5" }, "installConfig": { "pnp": false diff --git a/compiler/esy.lock/index.json b/compiler/esy.lock/index.json index 33ba2a8306..69df7abb48 100644 --- a/compiler/esy.lock/index.json +++ b/compiler/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "447c6f8113a1cae14d025d727c262190", + "checksum": "8155a7110a745c3127a66214033ec09f", "root": "@grain/compiler@link-dev:./esy.json", "node": { "ocaml@4.14.1000@d41d8cd9": { @@ -385,12 +385,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", + "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", + "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/gen@opam:1.1@55327887", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, @@ -473,7 +473,7 @@ } ], "dependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", + "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ppx_derivers@opam:1.2.1@d78727cd", "@opam/ocamlfind@opam:1.9.3@6f4741ee", "@opam/merlin-extend@opam:0.6.1@7d979feb", @@ -483,7 +483,7 @@ "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.32.1@9897cafd", + "ocaml@4.14.1000@d41d8cd9", "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ppx_derivers@opam:1.2.1@d78727cd", "@opam/merlin-extend@opam:0.6.1@7d979feb", "@opam/menhir@opam:20220210@879a0c13", @@ -518,20 +518,20 @@ "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/ppxlib@opam:0.32.1@9897cafd": { - "id": "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc": { + "id": "@opam/ppxlib@opam:0.33.0@83023edc", "name": "@opam/ppxlib", - "version": "opam:0.32.1", + "version": "opam:0.33.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/9d/9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f#sha256:9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f", - "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.1/ppxlib-0.32.1.tbz#sha256:9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f" + "archive:https://opam.ocaml.org/cache/sha256/ff/ffa44ef551f23b75e21dbd698a30310431381aaf140b9fe4b81c2e70a2d2c63a#sha256:ffa44ef551f23b75e21dbd698a30310431381aaf140b9fe4b81c2e70a2d2c63a", + "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.33.0/ppxlib-0.33.0.tbz#sha256:ffa44ef551f23b75e21dbd698a30310431381aaf140b9fe4b81c2e70a2d2c63a" ], "opam": { "name": "ppxlib", - "version": "0.32.1", - "path": "esy.lock/opam/ppxlib.0.32.1" + "version": "0.33.0", + "path": "esy.lock/opam/ppxlib.0.33.0" } }, "overrides": [], @@ -595,14 +595,14 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base@opam:v0.15.1@e8a71f35", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/sexplib0@opam:v0.15.1@df7962ff", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/base@opam:v0.15.1@e8a71f35" ] }, @@ -625,13 +625,13 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", "@opam/dune@opam:3.16.0@33c4c9fe", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", "@opam/dune@opam:3.16.0@33c4c9fe" ] @@ -651,7 +651,7 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/cmdliner@opam:1.3.0@f8c5e0f3", @@ -659,7 +659,7 @@ ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ppx_deriving@opam:5.2.1@2315fdd0", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/cmdliner@opam:1.3.0@f8c5e0f3" @@ -684,7 +684,7 @@ "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ppx_derivers@opam:1.2.1@d78727cd", "@opam/ocamlfind@opam:1.9.3@6f4741ee", "@opam/dune@opam:3.16.0@33c4c9fe", "@opam/cppo@opam:1.6.9@db929a12", @@ -692,7 +692,7 @@ ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/result@opam:1.5@5a755845", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ppx_derivers@opam:1.2.1@d78727cd", "@opam/ocamlfind@opam:1.9.3@6f4741ee", "@opam/dune@opam:3.16.0@33c4c9fe" @@ -1226,23 +1226,23 @@ "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6@d41d8cd9": { + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#7221b9c8a6e54a2f008c8868abc62acf4825c993@d41d8cd9": { "id": - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6@d41d8cd9", + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#7221b9c8a6e54a2f008c8868abc62acf4825c993@d41d8cd9", "name": "@opam/js_of_ocaml-compiler", "version": - "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6", + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#7221b9c8a6e54a2f008c8868abc62acf4825c993", "source": { "type": "install", "source": [ - "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6" + "github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#7221b9c8a6e54a2f008c8868abc62acf4825c993" ] }, "overrides": [], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/sedlex@opam:3.2@eab3a2e0", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/ocamlfind@opam:1.9.3@6f4741ee", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", @@ -1254,7 +1254,7 @@ "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/yojson@opam:2.2.2@0786d153", "@opam/sedlex@opam:3.2@eab3a2e0", - "@opam/ppxlib@opam:0.32.1@9897cafd", + "@opam/ppxlib@opam:0.33.0@83023edc", "@opam/menhirSdk@opam:20220210@fe146ed3", "@opam/menhirLib@opam:20220210@9afeb270", "@opam/menhir@opam:20220210@879a0c13", @@ -1699,20 +1699,20 @@ "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe" ] }, - "@opam/bigstringaf@opam:0.9.1@5d112382": { - "id": "@opam/bigstringaf@opam:0.9.1@5d112382", + "@opam/bigstringaf@opam:0.10.0@445b7d74": { + "id": "@opam/bigstringaf@opam:0.10.0@445b7d74", "name": "@opam/bigstringaf", - "version": "opam:0.9.1", + "version": "opam:0.10.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/87/87f99277d614998b6550941c5218dfe1bafeac1ad2821254c987ec281a6a550b#sha256:87f99277d614998b6550941c5218dfe1bafeac1ad2821254c987ec281a6a550b", - "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.9.1.tar.gz#sha256:87f99277d614998b6550941c5218dfe1bafeac1ad2821254c987ec281a6a550b" + "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" ], "opam": { "name": "bigstringaf", - "version": "0.9.1", - "path": "esy.lock/opam/bigstringaf.0.9.1" + "version": "0.10.0", + "path": "esy.lock/opam/bigstringaf.0.10.0" } }, "overrides": [], @@ -1849,12 +1849,12 @@ "ocaml@4.14.1000@d41d8cd9", "@opam/ocaml-syntax-shims@opam:1.0.0@9f361fbb", "@opam/dune@opam:3.16.0@33c4c9fe", - "@opam/bigstringaf@opam:0.9.1@5d112382", + "@opam/bigstringaf@opam:0.10.0@445b7d74", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/dune@opam:3.16.0@33c4c9fe", - "@opam/bigstringaf@opam:0.9.1@5d112382" + "@opam/bigstringaf@opam:0.10.0@445b7d74" ] }, "@grain/libbinaryen@114.0.0@d41d8cd9": { @@ -1906,7 +1906,7 @@ "devDependencies": [ "@opam/rely@github:reasonml/reason-native:rely.opam#fcb74949f8dcbe68f10d4daaee6b9b864b5baff0@d41d8cd9", "@opam/ocaml-lsp-server@opam:1.14.1@ac41cc96", - "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#e075fca17035ef740a2a247ab5f0e3c35c19ada6@d41d8cd9" + "@opam/js_of_ocaml-compiler@github:ocsigen/js_of_ocaml:js_of_ocaml-compiler.opam#7221b9c8a6e54a2f008c8868abc62acf4825c993@d41d8cd9" ], "installConfig": { "pnp": false } }, diff --git a/compiler/esy.lock/opam/bigstringaf.0.9.1/opam b/compiler/esy.lock/opam/bigstringaf.0.10.0/opam similarity index 85% rename from compiler/esy.lock/opam/bigstringaf.0.9.1/opam rename to compiler/esy.lock/opam/bigstringaf.0.10.0/opam index c3658ee7ad..1c3031ec4b 100644 --- a/compiler/esy.lock/opam/bigstringaf.0.9.1/opam +++ b/compiler/esy.lock/opam/bigstringaf.0.10.0/opam @@ -43,9 +43,6 @@ Bigstrings and other string-like types. So here they are. Go crazy. """ url { - src: "https://github.com/inhabitedtype/bigstringaf/archive/0.9.1.tar.gz" - checksum: [ - "sha256=87f99277d614998b6550941c5218dfe1bafeac1ad2821254c987ec281a6a550b" - "md5=909fdc277cf03096a35b565325d5314a" - ] + src: "https://github.com/inhabitedtype/bigstringaf/archive/0.10.0.tar.gz" + checksum: "md5=be0a44416840852777651150757a0a3b" } diff --git a/compiler/esy.lock/opam/ppxlib.0.32.1/opam b/compiler/esy.lock/opam/ppxlib.0.33.0/opam similarity index 82% rename from compiler/esy.lock/opam/ppxlib.0.32.1/opam rename to compiler/esy.lock/opam/ppxlib.0.33.0/opam index 0db44e20ba..6de792ba65 100644 --- a/compiler/esy.lock/opam/ppxlib.0.32.1/opam +++ b/compiler/esy.lock/opam/ppxlib.0.33.0/opam @@ -54,10 +54,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git" url { src: - "https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.1/ppxlib-0.32.1.tbz" + "https://github.com/ocaml-ppx/ppxlib/releases/download/0.33.0/ppxlib-0.33.0.tbz" checksum: [ - "sha256=9dbad8bcb1c8b4f3df3f58bca60a5ed23d86531f0da34b4196c86bd585c09d7f" - "sha512=7b93b622b119478dde03adcf4993e73ea937c91c280e453ccee631c682d8589ecb31841f11d6a14966239954e22e000da8afbe25a0f089532c7210b698c52553" + "sha256=ffa44ef551f23b75e21dbd698a30310431381aaf140b9fe4b81c2e70a2d2c63a" + "sha512=cd865efc78e85d662fab3d05de7675a46252a241db44cbf13a930017c6890da5f161fbf8511b97abd9d61bffca0cb84b3adf580b55a3820afdb4a2337e9a4a63" ] } -x-commit-hash: "cd138a752ae6f21ad649c531b3b2276f332b3bb0" +x-commit-hash: "563d5651e877c6f7d5561f9d8ca93fca05b07d07" diff --git a/compiler/test/dune b/compiler/test/dune index 9d5576490b..df0641ceeb 100644 --- a/compiler/test/dune +++ b/compiler/test/dune @@ -20,6 +20,4 @@ -40 (:include ./config/flags.sexp))) (libraries grain grain-tests.framework grain-tests.suites grain-tests.utils) - (modules test) - (js_of_ocaml - (javascript_files hacks.js))) + (modules test)) diff --git a/compiler/test/hacks.js b/compiler/test/hacks.js deleted file mode 100644 index 4b4d11b9c1..0000000000 --- a/compiler/test/hacks.js +++ /dev/null @@ -1,4 +0,0 @@ -//Provides: caml_record_backtrace -function caml_record_backtrace(b) { - return 0; -}