diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml index 79673f6..27852d8 100644 --- a/.github/workflows/opam.yml +++ b/.github/workflows/opam.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - ocaml-compiler: [4.12.0] + ocaml-compiler: [4.12.0, 4.13.1] steps: - name: Checkout project diff --git a/README.md b/README.md index 7e7e775..bf15056 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,7 @@ Inside your dune file, you can depend on `libbinaryen` as such: (foreign_stubs (language c) (names binaryen_stubs) - (flags :standard -O2 -Wall -Wextra)) - (c_library_flags :standard -lstdc++ -lpthread)) + (flags :standard -O2 -Wall -Wextra))) ``` ## Dependencies @@ -28,17 +27,39 @@ When installing with opam, both of these dependencies will be checked using `con When installing with esy, CMake will be built from source, and, on Mac or Linux, Python must be globally installed within a location that esy knows about (those being `/usr/local/bin`, `/usr/bin`, `/bin`, `/usr/sbin`, or `/sbin`). On Windows, a suitable python is already available from esy-bash. -## Library flags +## MacOS C++ Compiler -This package attempts to smooth over configuration frustrations by providing specific `library_flags` when built. +When including this library in your `dune` MacOS executables, you'll need to specify `-cc clang++` in your `(flags)` stanza. This is required because Binaryen will throw errors for itself to catch and using `clang++` is the only way to handle them correctly. You can find more info on this [ocaml issue](https://github.com/ocaml/ocaml/issues/10423). -### MacOS +Your stanza could look something like this: -In order to support Mac M1, this package assumes you are using `clang++` on MacOS and applies the flags `-cc clang++` to the built library. +```diff + (executable + (name example) + (public_name example) + (package example) ++ (flags -cc clang++) + (modules example) + (libraries binaryen)) +``` + +These flags likely won't work on other operating systems, so you'll probably need to use `dune-configurator` to vary the flags per platform. You can see an example of this in our [tests/](./tests/dune). + +## Static Linking -### Windows +If you are planning to create portable binaries for Windows, it will try to find Cygwin/MinGW locations in your `PATH`. To avoid this, you probably want to add this to your `(executable)` stanzas: + +```diff + (executable + (name example) + (public_name example) + (package example) ++ (flags (:standard -ccopt -- -ccopt -static)) + (modules example) + (libraries binaryen)) +``` -On Windows, this package assumes libbinaryen is built under MinGW and applies the flags `-ccopt -- -ccopt -static` to the built library. +These flags might not work on other operating systems (like MacOS), so you'll probably need to use `dune-configurator` to vary the flags per platform. You can see an example of this in our [tests/](./tests/dune). ## Contributing diff --git a/config/dune b/config/dune deleted file mode 100644 index 7c4e3de..0000000 --- a/config/dune +++ /dev/null @@ -1,8 +0,0 @@ -(executable - (name library_flags) - (libraries dune.configurator)) - -(rule - (targets library_flags.sexp) - (action - (run ./library_flags.exe))) diff --git a/dune b/dune index c3e8b0a..8eb7efc 100644 --- a/dune +++ b/dune @@ -2,8 +2,6 @@ (name libbinaryen_c) (public_name libbinaryen.c) (foreign_archives binaryen) - (library_flags - (:include ./config/library_flags.sexp)) (c_library_flags :standard -lstdc++ -lpthread) (install_c_headers binaryen-c)) @@ -43,7 +41,7 @@ -DBUILD_STATIC_LIB=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=binaryen) - (run cmake --build binaryen --config Release) + (run cmake --build binaryen --config Release -- -j4) (copy binaryen/lib/libbinaryen.a libbinaryen.a))))) (rule @@ -68,7 +66,7 @@ -DBUILD_STATIC_LIB=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=binaryen) - (run cmake --build binaryen --config Release) + (run cmake --build binaryen --config Release -- -j4) (copy binaryen/lib/libbinaryen.dylib dllbinaryen.so))))) (rule @@ -95,7 +93,7 @@ -DBUILD_STATIC_LIB=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=binaryen) - (run cmake --build binaryen --config Release) + (run cmake --build binaryen --config Release -- -j4) (copy binaryen/lib/libbinaryen.so dllbinaryen.so))))) (rule @@ -121,5 +119,5 @@ -DBUILD_STATIC_LIB=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=binaryen) - (run cmake --build binaryen --config Release) + (run cmake --build binaryen --config Release -- -j4) (copy binaryen/bin/libbinaryen.dll dllbinaryen.dll))))) diff --git a/esy.lock/index.json b/esy.lock/index.json index da94654..3ea239d 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,15 +1,15 @@ { - "checksum": "a76af2a5f90fd9d38fd5daef38abe3bf", + "checksum": "3a4cbbee0d26fe677fbf78af18682b2d", "root": "@grain/libbinaryen@link-dev:./package.json", "node": { - "ocaml@4.12.0@d41d8cd9": { - "id": "ocaml@4.12.0@d41d8cd9", + "ocaml@4.13.1000@d41d8cd9": { + "id": "ocaml@4.13.1000@d41d8cd9", "name": "ocaml", - "version": "4.12.0", + "version": "4.13.1000", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.12.0.tgz#sha1:2a979f37535faaded8aa3fdf82b6f16f2c71e284" + "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.13.1000.tgz#sha1:0a90128c74d5a3dd6d30e82a759694eb0a05859f" ] }, "overrides": [], @@ -34,13 +34,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", + "ocaml@4.13.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", "@opam/dune@opam:2.9.1@1e504822", "@opam/cppo@opam:1.6.8@7e48217d", "@opam/biniou@opam:1.2.1@420bda02", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", + "ocaml@4.13.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", "@opam/dune@opam:2.9.1@1e504822", "@opam/biniou@opam:1.2.1@420bda02" ] }, @@ -62,7 +62,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", + "ocaml@4.13.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", "@opam/topkg@opam:1.0.4@52d43104", "@opam/ocamlfind@opam:1.9.1@b748edf6", "@opam/ocamlbuild@opam:0.14.0@0dee4078", @@ -70,7 +70,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" + "ocaml@4.13.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea" ] }, "@opam/uuseg@opam:14.0.0@7d21466b": { @@ -91,7 +91,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.13.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:14.0.0@8715110e", "@opam/topkg@opam:1.0.4@52d43104", "@opam/ocamlfind@opam:1.9.1@b748edf6", "@opam/ocamlbuild@opam:0.14.0@0dee4078", @@ -99,7 +99,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uucp@opam:14.0.0@8715110e" + "ocaml@4.13.1000@d41d8cd9", "@opam/uucp@opam:14.0.0@8715110e" ] }, "@opam/uucp@opam:14.0.0@8715110e": { @@ -120,14 +120,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.13.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/topkg@opam:1.0.4@52d43104", "@opam/ocamlfind@opam:1.9.1@b748edf6", "@opam/ocamlbuild@opam:0.14.0@0dee4078", "@opam/cmdliner@opam:1.0.4@93208aac", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ] }, "@opam/uchar@opam:0.0.2@c8218eea": { "id": "@opam/uchar@opam:0.0.2@c8218eea", @@ -147,38 +147,10 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@0dee4078", + "ocaml@4.13.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@0dee4078", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] - }, - "@opam/tyxml@opam:4.5.0@0a609297": { - "id": "@opam/tyxml@opam:4.5.0@0a609297", - "name": "@opam/tyxml", - "version": "opam:4.5.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c6/c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068#sha256:c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068", - "archive:https://github.com/ocsigen/tyxml/releases/download/4.5.0/tyxml-4.5.0.tbz#sha256:c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068" - ], - "opam": { - "name": "tyxml", - "version": "4.5.0", - "path": "esy.lock/opam/tyxml.4.5.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.10.3@0585c65d", - "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.10.3@0585c65d", - "@opam/dune@opam:2.9.1@1e504822" - ] + "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ] }, "@opam/topkg@opam:1.0.4@52d43104": { "id": "@opam/topkg@opam:1.0.4@52d43104", @@ -198,64 +170,64 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/ocamlfind@opam:1.9.1@b748edf6", + "ocaml@4.13.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.1@b748edf6", "@opam/ocamlbuild@opam:0.14.0@0dee4078", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@0dee4078" + "ocaml@4.13.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@0dee4078" ] }, - "@opam/stdlib-shims@opam:0.3.0@0d088929": { - "id": "@opam/stdlib-shims@opam:0.3.0@0d088929", - "name": "@opam/stdlib-shims", - "version": "opam:0.3.0", + "@opam/stdio@opam:v0.14.0@a5affb43": { + "id": "@opam/stdio@opam:v0.14.0@a5affb43", + "name": "@opam/stdio", + "version": "opam:v0.14.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/ba/babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a#sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a", - "archive:https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz#sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a" + "archive:https://opam.ocaml.org/cache/md5/4c/4cbdf15f0be88c3258aaeff9e04e00e9#md5:4cbdf15f0be88c3258aaeff9e04e00e9", + "archive:https://ocaml.janestreet.com/ocaml-core/v0.14/files/stdio-v0.14.0.tar.gz#md5:4cbdf15f0be88c3258aaeff9e04e00e9" ], "opam": { - "name": "stdlib-shims", - "version": "0.3.0", - "path": "esy.lock/opam/stdlib-shims.0.3.0" + "name": "stdio", + "version": "v0.14.0", + "path": "esy.lock/opam/stdio.v0.14.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "@opam/base@opam:v0.14.2@04880a76", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "@opam/base@opam:v0.14.2@04880a76" ] }, - "@opam/stdio@opam:v0.14.0@a5affb43": { - "id": "@opam/stdio@opam:v0.14.0@a5affb43", - "name": "@opam/stdio", - "version": "opam:v0.14.0", + "@opam/spawn@opam:v0.15.0@4a27a4cb": { + "id": "@opam/spawn@opam:v0.15.0@4a27a4cb", + "name": "@opam/spawn", + "version": "opam:v0.15.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/4c/4cbdf15f0be88c3258aaeff9e04e00e9#md5:4cbdf15f0be88c3258aaeff9e04e00e9", - "archive:https://ocaml.janestreet.com/ocaml-core/v0.14/files/stdio-v0.14.0.tar.gz#md5:4cbdf15f0be88c3258aaeff9e04e00e9" + "archive:https://opam.ocaml.org/cache/sha256/31/310fb2a50ac7f64c738182cbabd9d27c1aeae1a08107fe14da8d35a87cbb57c7#sha256:310fb2a50ac7f64c738182cbabd9d27c1aeae1a08107fe14da8d35a87cbb57c7", + "archive:https://github.com/janestreet/spawn/archive/v0.15.0.tar.gz#sha256:310fb2a50ac7f64c738182cbabd9d27c1aeae1a08107fe14da8d35a87cbb57c7" ], "opam": { - "name": "stdio", - "version": "v0.14.0", - "path": "esy.lock/opam/stdio.v0.14.0" + "name": "spawn", + "version": "v0.15.0", + "path": "esy.lock/opam/spawn.v0.15.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", - "@opam/base@opam:v0.14.1@9b424fee", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", - "@opam/base@opam:v0.14.1@9b424fee" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, "@opam/sexplib0@opam:v0.14.0@155c136c": { @@ -276,11 +248,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -298,9 +270,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.13.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ] }, "@opam/result@opam:1.5@1c6a6533": { "id": "@opam/result@opam:1.5@1c6a6533", @@ -320,11 +292,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, "@opam/re@opam:1.10.3@0585c65d": { @@ -345,45 +317,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", + "ocaml@4.13.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.9.1@1e504822" - ] - }, - "@opam/ppxlib@opam:0.22.2@61009929": { - "id": "@opam/ppxlib@opam:0.22.2@61009929", - "name": "@opam/ppxlib", - "version": "opam:0.22.2", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d0/d0e8a1ebdc6220b1574d7a926f008460c5118ccef79bf9a0ce0242f34cff225a#sha256:d0e8a1ebdc6220b1574d7a926f008460c5118ccef79bf9a0ce0242f34cff225a", - "archive:https://github.com/ocaml-ppx/ppxlib/releases/download/0.22.2/ppxlib-0.22.2.tbz#sha256:d0e8a1ebdc6220b1574d7a926f008460c5118ccef79bf9a0ce0242f34cff225a" - ], - "opam": { - "name": "ppxlib", - "version": "0.22.2", - "path": "esy.lock/opam/ppxlib.0.22.2" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@0d088929", - "@opam/sexplib0@opam:v0.14.0@155c136c", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocaml-migrate-parsetree@opam:2.2.0@45331a3e", - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@0d088929", - "@opam/sexplib0@opam:v0.14.0@155c136c", - "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "@opam/ocaml-migrate-parsetree@opam:2.2.0@45331a3e", - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", + "ocaml@4.13.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/dune@opam:2.9.1@1e504822" ] }, @@ -405,177 +343,178 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", + "ocaml@4.13.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", + "ocaml@4.13.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", "@opam/dune@opam:2.9.1@1e504822" ] }, - "@opam/ppx_derivers@opam:1.2.1@e2cbad12": { - "id": "@opam/ppx_derivers@opam:1.2.1@e2cbad12", - "name": "@opam/ppx_derivers", - "version": "opam:1.2.1", + "@opam/pp@opam:1.1.2@89ad03b5": { + "id": "@opam/pp@opam:1.1.2@89ad03b5", + "name": "@opam/pp", + "version": "opam:1.1.2", "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/e4/e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56#sha256:e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56", + "archive:https://github.com/ocaml-dune/pp/releases/download/1.1.2/pp-1.1.2.tbz#sha256:e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56" ], "opam": { - "name": "ppx_derivers", - "version": "1.2.1", - "path": "esy.lock/opam/ppx_derivers.1.2.1" + "name": "pp", + "version": "1.1.2", + "path": "esy.lock/opam/pp.1.1.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, - "@opam/pp@opam:1.1.2@89ad03b5": { - "id": "@opam/pp@opam:1.1.2@89ad03b5", - "name": "@opam/pp", - "version": "opam:1.1.2", + "@opam/odoc-parser@opam:1.0.0@b1029bdf": { + "id": "@opam/odoc-parser@opam:1.0.0@b1029bdf", + "name": "@opam/odoc-parser", + "version": "opam:1.0.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/e4/e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56#sha256:e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56", - "archive:https://github.com/ocaml-dune/pp/releases/download/1.1.2/pp-1.1.2.tbz#sha256:e4a4e98d96b1bb76950fcd6da4e938c86d989df4d7e48f02f7a44595f5af1d56" + "archive:https://opam.ocaml.org/cache/sha256/b6/b6aa08ea71a9ebad9b2bebc4da1eda0d713cf3674e6d57d10459d934286e7aa1#sha256:b6aa08ea71a9ebad9b2bebc4da1eda0d713cf3674e6d57d10459d934286e7aa1", + "archive:https://github.com/ocaml-doc/odoc-parser/releases/download/1.0.0/odoc-parser-1.0.0.tbz#sha256:b6aa08ea71a9ebad9b2bebc4da1eda0d713cf3674e6d57d10459d934286e7aa1" ], "opam": { - "name": "pp", - "version": "1.1.2", - "path": "esy.lock/opam/pp.1.1.2" + "name": "odoc-parser", + "version": "1.0.0", + "path": "esy.lock/opam/odoc-parser.1.0.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "@opam/dune@opam:2.9.1@1e504822", + "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "@opam/dune@opam:2.9.1@1e504822", "@opam/astring@opam:0.8.5@1300cee8" ] }, - "@opam/odoc@opam:1.5.3@a56545ed": { - "id": "@opam/odoc@opam:1.5.3@a56545ed", - "name": "@opam/odoc", - "version": "opam:1.5.3", + "@opam/ocp-indent@opam:1.7.0@2da3c6e5": { + "id": "@opam/ocp-indent@opam:1.7.0@2da3c6e5", + "name": "@opam/ocp-indent", + "version": "opam:1.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/f2/f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45#sha256:f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45", - "archive:https://github.com/ocaml/odoc/releases/download/1.5.3/odoc-1.5.3.tbz#sha256:f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45" + "archive:https://opam.ocaml.org/cache/md5/3b/3bc327e38f453f38494098725c97d2cb#md5:3bc327e38f453f38494098725c97d2cb", + "archive:https://github.com/OCamlPro/ocp-indent/archive/1.7.0.tar.gz#md5:3bc327e38f453f38494098725c97d2cb" ], "opam": { - "name": "odoc", - "version": "1.5.3", - "path": "esy.lock/opam/odoc.1.5.3" + "name": "ocp-indent", + "version": "1.7.0", + "path": "esy.lock/opam/ocp-indent.1.7.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/tyxml@opam:4.5.0@0a609297", - "@opam/result@opam:1.5@1c6a6533", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/dune@opam:2.9.1@1e504822", "@opam/cppo@opam:1.6.8@7e48217d", + "ocaml@4.13.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.1@b748edf6", + "@opam/dune@opam:2.9.1@1e504822", "@opam/cmdliner@opam:1.0.4@93208aac", - "@opam/astring@opam:0.8.5@1300cee8", + "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/tyxml@opam:4.5.0@0a609297", - "@opam/result@opam:1.5@1c6a6533", "@opam/fpath@opam:0.7.3@674d8125", + "ocaml@4.13.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.1@b748edf6", "@opam/dune@opam:2.9.1@1e504822", "@opam/cmdliner@opam:1.0.4@93208aac", - "@opam/astring@opam:0.8.5@1300cee8" + "@opam/base-bytes@opam:base@19d0c2ff" ] }, - "@opam/ocamlformat-rpc-lib@opam:0.18.0@4bef249f": { - "id": "@opam/ocamlformat-rpc-lib@opam:0.18.0@4bef249f", + "@opam/ocamlformat-rpc-lib@opam:0.19.0@125cf11d": { + "id": "@opam/ocamlformat-rpc-lib@opam:0.19.0@125cf11d", "name": "@opam/ocamlformat-rpc-lib", - "version": "opam:0.18.0", + "version": "opam:0.19.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/98/981a44296485da6ca29ab2cd8c711270398e5e1d1624408ec403c0b0ea9fe114#sha256:981a44296485da6ca29ab2cd8c711270398e5e1d1624408ec403c0b0ea9fe114", - "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.18.0/ocamlformat-0.18.0.tbz#sha256:981a44296485da6ca29ab2cd8c711270398e5e1d1624408ec403c0b0ea9fe114" + "archive:https://opam.ocaml.org/cache/sha256/62/62fc46aae8f0a4a33ce7f8d7726d7109bff615ea6fcb50d1482f21d20ee50f46#sha256:62fc46aae8f0a4a33ce7f8d7726d7109bff615ea6fcb50d1482f21d20ee50f46", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.19.0/ocamlformat-0.19.0.tbz#sha256:62fc46aae8f0a4a33ce7f8d7726d7109bff615ea6fcb50d1482f21d20ee50f46" ], "opam": { "name": "ocamlformat-rpc-lib", - "version": "0.18.0", - "path": "esy.lock/opam/ocamlformat-rpc-lib.0.18.0" + "version": "0.19.0", + "path": "esy.lock/opam/ocamlformat-rpc-lib.0.19.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@155c136c", + "ocaml@4.13.1000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@155c136c", "@opam/dune@opam:2.9.1@1e504822", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@155c136c", + "ocaml@4.13.1000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@155c136c", "@opam/dune@opam:2.9.1@1e504822", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, - "@opam/ocamlformat@opam:0.18.0@a5c80606": { - "id": "@opam/ocamlformat@opam:0.18.0@a5c80606", + "@opam/ocamlformat@opam:0.20.1@6e37e311": { + "id": "@opam/ocamlformat@opam:0.20.1@6e37e311", "name": "@opam/ocamlformat", - "version": "opam:0.18.0", + "version": "opam:0.20.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/98/981a44296485da6ca29ab2cd8c711270398e5e1d1624408ec403c0b0ea9fe114#sha256:981a44296485da6ca29ab2cd8c711270398e5e1d1624408ec403c0b0ea9fe114", - "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.18.0/ocamlformat-0.18.0.tbz#sha256:981a44296485da6ca29ab2cd8c711270398e5e1d1624408ec403c0b0ea9fe114" + "archive:https://opam.ocaml.org/cache/sha256/7d/7d3a51645416fa78287344fa03af6b78450067a1a61e4790bf1b29779cd10235#sha256:7d3a51645416fa78287344fa03af6b78450067a1a61e4790bf1b29779cd10235", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.20.1/ocamlformat-0.20.1.tbz#sha256:7d3a51645416fa78287344fa03af6b78450067a1a61e4790bf1b29779cd10235" ], "opam": { "name": "ocamlformat", - "version": "0.18.0", - "path": "esy.lock/opam/ocamlformat.0.18.0" + "version": "0.20.1", + "path": "esy.lock/opam/ocamlformat.0.20.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.13.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uuseg@opam:14.0.0@7d21466b", "@opam/stdio@opam:v0.14.0@a5affb43", "@opam/re@opam:1.10.3@0585c65d", - "@opam/ppxlib@opam:0.22.2@61009929", - "@opam/odoc@opam:1.5.3@a56545ed", + "@opam/odoc-parser@opam:1.0.0@b1029bdf", + "@opam/ocp-indent@opam:1.7.0@2da3c6e5", "@opam/ocaml-version@opam:3.4.0@b6cd49e1", - "@opam/menhirSdk@opam:20211012@361dec19", - "@opam/menhirLib@opam:20211012@a4d7fb30", - "@opam/menhir@opam:20211012@1135eab2", + "@opam/menhirSdk@opam:20211230@9e0306fc", + "@opam/menhirLib@opam:20211230@bd2ff9c1", + "@opam/menhir@opam:20211230@1ea488a6", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/fix@opam:20201120@0b212fb9", + "@opam/fix@opam:20211231@dc797c73", + "@opam/either@opam:1.0.0@be5a1416", "@opam/dune-build-info@opam:2.9.1@c636b56a", "@opam/dune@opam:2.9.1@1e504822", "@opam/cmdliner@opam:1.0.4@93208aac", - "@opam/base-unix@opam:base@87d0b2eb", - "@opam/base@opam:v0.14.1@9b424fee", + "@opam/base@opam:v0.14.2@04880a76", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", + "ocaml@4.13.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uuseg@opam:14.0.0@7d21466b", "@opam/stdio@opam:v0.14.0@a5affb43", "@opam/re@opam:1.10.3@0585c65d", - "@opam/ppxlib@opam:0.22.2@61009929", - "@opam/odoc@opam:1.5.3@a56545ed", + "@opam/odoc-parser@opam:1.0.0@b1029bdf", + "@opam/ocp-indent@opam:1.7.0@2da3c6e5", "@opam/ocaml-version@opam:3.4.0@b6cd49e1", - "@opam/menhirSdk@opam:20211012@361dec19", - "@opam/menhirLib@opam:20211012@a4d7fb30", - "@opam/menhir@opam:20211012@1135eab2", + "@opam/menhirSdk@opam:20211230@9e0306fc", + "@opam/menhirLib@opam:20211230@bd2ff9c1", + "@opam/menhir@opam:20211230@1ea488a6", "@opam/fpath@opam:0.7.3@674d8125", - "@opam/fix@opam:20201120@0b212fb9", + "@opam/fix@opam:20211231@dc797c73", + "@opam/either@opam:1.0.0@be5a1416", "@opam/dune-build-info@opam:2.9.1@c636b56a", "@opam/dune@opam:2.9.1@1e504822", "@opam/cmdliner@opam:1.0.4@93208aac", - "@opam/base-unix@opam:base@87d0b2eb", - "@opam/base@opam:v0.14.1@9b424fee" + "@opam/base@opam:v0.14.2@04880a76" ] }, "@opam/ocamlfind@opam:1.9.1@b748edf6": { @@ -601,9 +540,9 @@ } ], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.13.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ] }, "@opam/ocamlbuild@opam:0.14.0@0dee4078": { "id": "@opam/ocamlbuild@opam:0.14.0@0dee4078", @@ -628,9 +567,9 @@ } ], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.13.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ] }, "@opam/ocaml-version@opam:3.4.0@b6cd49e1": { "id": "@opam/ocaml-version@opam:3.4.0@b6cd49e1", @@ -650,178 +589,127 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" - ] - }, - "@opam/ocaml-migrate-parsetree@opam:2.2.0@45331a3e": { - "id": "@opam/ocaml-migrate-parsetree@opam:2.2.0@45331a3e", - "name": "@opam/ocaml-migrate-parsetree", - "version": "opam:2.2.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/b2/b2a68f3d3899cec3a50a99b05738295cc8a18672680406d0f68fbc95c01f1ba1#sha256:b2a68f3d3899cec3a50a99b05738295cc8a18672680406d0f68fbc95c01f1ba1", - "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v2.2.0/ocaml-migrate-parsetree-v2.2.0.tbz#sha256:b2a68f3d3899cec3a50a99b05738295cc8a18672680406d0f68fbc95c01f1ba1" - ], - "opam": { - "name": "ocaml-migrate-parsetree", - "version": "2.2.0", - "path": "esy.lock/opam/ocaml-migrate-parsetree.2.2.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, - "@opam/ocaml-lsp-server@opam:1.8.3@b64dff17": { - "id": "@opam/ocaml-lsp-server@opam:1.8.3@b64dff17", + "@opam/ocaml-lsp-server@opam:1.9.1@1397dba9": { + "id": "@opam/ocaml-lsp-server@opam:1.9.1@1397dba9", "name": "@opam/ocaml-lsp-server", - "version": "opam:1.8.3", + "version": "opam:1.9.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/58/58ef5aa7bf176712428b4e0b1015feaf6d677cbd9474f8822d132b25223b14e9#sha256:58ef5aa7bf176712428b4e0b1015feaf6d677cbd9474f8822d132b25223b14e9", - "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.8.3/jsonrpc-1.8.3.tbz#sha256:58ef5aa7bf176712428b4e0b1015feaf6d677cbd9474f8822d132b25223b14e9" + "archive:https://opam.ocaml.org/cache/sha256/cf/cf1cdb257d4ef1ed1a05e951264b11c7dc7d3066bf448111cb17c67be56ddcee#sha256:cf1cdb257d4ef1ed1a05e951264b11c7dc7d3066bf448111cb17c67be56ddcee", + "archive:https://github.com/ocaml/ocaml-lsp/releases/download/1.9.1/jsonrpc-1.9.1.tbz#sha256:cf1cdb257d4ef1ed1a05e951264b11c7dc7d3066bf448111cb17c67be56ddcee" ], "opam": { "name": "ocaml-lsp-server", - "version": "1.8.3", - "path": "esy.lock/opam/ocaml-lsp-server.1.8.3" + "version": "1.9.1", + "path": "esy.lock/opam/ocaml-lsp-server.1.9.1" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", + "ocaml@4.13.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", + "@opam/spawn@opam:v0.15.0@4a27a4cb", "@opam/result@opam:1.5@1c6a6533", "@opam/re@opam:1.10.3@0585c65d", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@605a6997", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ocamlformat-rpc-lib@opam:0.18.0@4bef249f", + "@opam/ocamlformat-rpc-lib@opam:0.19.0@125cf11d", "@opam/dune-build-info@opam:2.9.1@c636b56a", - "@opam/dune@opam:2.9.1@1e504822", - "@opam/dot-merlin-reader@opam:4.1@84436e1c", - "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.9.1@1e504822", "@opam/csexp@opam:1.5.1@8a8fb3a7", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", + "ocaml@4.13.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", + "@opam/spawn@opam:v0.15.0@4a27a4cb", "@opam/result@opam:1.5@1c6a6533", "@opam/re@opam:1.10.3@0585c65d", "@opam/ppx_yojson_conv_lib@opam:v0.14.0@605a6997", "@opam/pp@opam:1.1.2@89ad03b5", - "@opam/ocamlformat-rpc-lib@opam:0.18.0@4bef249f", + "@opam/ocamlformat-rpc-lib@opam:0.19.0@125cf11d", "@opam/dune-build-info@opam:2.9.1@c636b56a", - "@opam/dune@opam:2.9.1@1e504822", - "@opam/dot-merlin-reader@opam:4.1@84436e1c", - "@opam/csexp@opam:1.5.1@8a8fb3a7" - ] - }, - "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882": { - "id": "@opam/ocaml-compiler-libs@opam:v0.12.4@41979882", - "name": "@opam/ocaml-compiler-libs", - "version": "opam:v0.12.4", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4e/4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760#sha256:4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760", - "archive:https://github.com/janestreet/ocaml-compiler-libs/releases/download/v0.12.4/ocaml-compiler-libs-v0.12.4.tbz#sha256:4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760" - ], - "opam": { - "name": "ocaml-compiler-libs", - "version": "v0.12.4", - "path": "esy.lock/opam/ocaml-compiler-libs.v0.12.4" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "@opam/dune@opam:2.9.1@1e504822", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, - "@opam/menhirSdk@opam:20211012@361dec19": { - "id": "@opam/menhirSdk@opam:20211012@361dec19", + "@opam/menhirSdk@opam:20211230@9e0306fc": { + "id": "@opam/menhirSdk@opam:20211230@9e0306fc", "name": "@opam/menhirSdk", - "version": "opam:20211012", + "version": "opam:20211230", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/f6/f631f4c03859254a7d725f054633ee44#md5:f631f4c03859254a7d725f054633ee44", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20211012/archive.tar.gz#md5:f631f4c03859254a7d725f054633ee44" + "archive:https://opam.ocaml.org/cache/md5/ff/ff8b8c4c58b1365128d0d2aeaad85d1c#md5:ff8b8c4c58b1365128d0d2aeaad85d1c", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20211230/archive.tar.gz#md5:ff8b8c4c58b1365128d0d2aeaad85d1c" ], "opam": { "name": "menhirSdk", - "version": "20211012", - "path": "esy.lock/opam/menhirSdk.20211012" + "version": "20211230", + "path": "esy.lock/opam/menhirSdk.20211230" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, - "@opam/menhirLib@opam:20211012@a4d7fb30": { - "id": "@opam/menhirLib@opam:20211012@a4d7fb30", + "@opam/menhirLib@opam:20211230@bd2ff9c1": { + "id": "@opam/menhirLib@opam:20211230@bd2ff9c1", "name": "@opam/menhirLib", - "version": "opam:20211012", + "version": "opam:20211230", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/f6/f631f4c03859254a7d725f054633ee44#md5:f631f4c03859254a7d725f054633ee44", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20211012/archive.tar.gz#md5:f631f4c03859254a7d725f054633ee44" + "archive:https://opam.ocaml.org/cache/md5/ff/ff8b8c4c58b1365128d0d2aeaad85d1c#md5:ff8b8c4c58b1365128d0d2aeaad85d1c", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20211230/archive.tar.gz#md5:ff8b8c4c58b1365128d0d2aeaad85d1c" ], "opam": { "name": "menhirLib", - "version": "20211012", - "path": "esy.lock/opam/menhirLib.20211012" + "version": "20211230", + "path": "esy.lock/opam/menhirLib.20211230" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, - "@opam/menhir@opam:20211012@1135eab2": { - "id": "@opam/menhir@opam:20211012@1135eab2", + "@opam/menhir@opam:20211230@1ea488a6": { + "id": "@opam/menhir@opam:20211230@1ea488a6", "name": "@opam/menhir", - "version": "opam:20211012", + "version": "opam:20211230", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/f6/f631f4c03859254a7d725f054633ee44#md5:f631f4c03859254a7d725f054633ee44", - "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20211012/archive.tar.gz#md5:f631f4c03859254a7d725f054633ee44" + "archive:https://opam.ocaml.org/cache/md5/ff/ff8b8c4c58b1365128d0d2aeaad85d1c#md5:ff8b8c4c58b1365128d0d2aeaad85d1c", + "archive:https://gitlab.inria.fr/fpottier/menhir/-/archive/20211230/archive.tar.gz#md5:ff8b8c4c58b1365128d0d2aeaad85d1c" ], "opam": { "name": "menhir", - "version": "20211012", - "path": "esy.lock/opam/menhir.20211012" + "version": "20211230", + "path": "esy.lock/opam/menhir.20211230" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/menhirSdk@opam:20211012@361dec19", - "@opam/menhirLib@opam:20211012@a4d7fb30", + "ocaml@4.13.1000@d41d8cd9", "@opam/menhirSdk@opam:20211230@9e0306fc", + "@opam/menhirLib@opam:20211230@bd2ff9c1", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/menhirSdk@opam:20211012@361dec19", - "@opam/menhirLib@opam:20211012@a4d7fb30", + "ocaml@4.13.1000@d41d8cd9", "@opam/menhirSdk@opam:20211230@9e0306fc", + "@opam/menhirLib@opam:20211230@bd2ff9c1", "@opam/dune@opam:2.9.1@1e504822" ] }, @@ -843,41 +731,63 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/topkg@opam:1.0.4@52d43104", + "ocaml@4.13.1000@d41d8cd9", "@opam/topkg@opam:1.0.4@52d43104", "@opam/ocamlfind@opam:1.9.1@b748edf6", "@opam/ocamlbuild@opam:0.14.0@0dee4078", "@opam/astring@opam:0.8.5@1300cee8", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/astring@opam:0.8.5@1300cee8" + "ocaml@4.13.1000@d41d8cd9", "@opam/astring@opam:0.8.5@1300cee8" ] }, - "@opam/fix@opam:20201120@0b212fb9": { - "id": "@opam/fix@opam:20201120@0b212fb9", + "@opam/fix@opam:20211231@dc797c73": { + "id": "@opam/fix@opam:20211231@dc797c73", "name": "@opam/fix", - "version": "opam:20201120", + "version": "opam:20211231", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3", - "archive:https://gitlab.inria.fr/fpottier/fix/-/archive/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3" + "archive:https://opam.ocaml.org/cache/md5/0f/0f633b0cdd5faba947d11da113c81fcc#md5:0f633b0cdd5faba947d11da113c81fcc", + "archive:https://gitlab.inria.fr/fpottier/fix/-/archive/20211231/archive.tar.gz#md5:0f633b0cdd5faba947d11da113c81fcc" ], "opam": { "name": "fix", - "version": "20201120", - "path": "esy.lock/opam/fix.20201120" + "version": "20211231", + "path": "esy.lock/opam/fix.20211231" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, + "@opam/either@opam:1.0.0@be5a1416": { + "id": "@opam/either@opam:1.0.0@be5a1416", + "name": "@opam/either", + "version": "opam:1.0.0", + "source": { + "type": "install", + "source": [ + "archive:https://opam.ocaml.org/cache/sha256/bf/bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884#sha256:bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884", + "archive:https://github.com/mirage/either/releases/download/1.0.0/either-1.0.0.tbz#sha256:bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884" + ], + "opam": { + "name": "either", + "version": "1.0.0", + "path": "esy.lock/opam/either.1.0.0" + } + }, + "overrides": [], + "dependencies": [ + "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ "@opam/dune@opam:2.9.1@1e504822" ] + }, "@opam/easy-format@opam:1.3.2@1ea9f987": { "id": "@opam/easy-format@opam:1.3.2@1ea9f987", "name": "@opam/easy-format", @@ -896,11 +806,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, "@opam/dune-configurator@opam:2.9.1@b7cf7a02": { @@ -921,12 +831,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@4.13.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", "@opam/dune@opam:2.9.1@1e504822", "@opam/csexp@opam:1.5.1@8a8fb3a7", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", + "ocaml@4.13.1000@d41d8cd9", "@opam/result@opam:1.5@1c6a6533", "@opam/dune@opam:2.9.1@1e504822", "@opam/csexp@opam:1.5.1@8a8fb3a7" ] }, @@ -970,46 +880,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.13.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.13.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, - "@opam/dot-merlin-reader@opam:4.1@84436e1c": { - "id": "@opam/dot-merlin-reader@opam:4.1@84436e1c", - "name": "@opam/dot-merlin-reader", - "version": "opam:4.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/14/14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd#sha256:14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd", - "archive:https://github.com/ocaml/merlin/releases/download/v4.1/dot-merlin-reader-v4.1.tbz#sha256:14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd" - ], - "opam": { - "name": "dot-merlin-reader", - "version": "4.1", - "path": "esy.lock/opam/dot-merlin-reader.4.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ocamlfind@opam:1.9.1@b748edf6", - "@opam/dune@opam:2.9.1@1e504822", "@opam/csexp@opam:1.5.1@8a8fb3a7", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/yojson@opam:1.7.0@69d87312", - "@opam/result@opam:1.5@1c6a6533", - "@opam/ocamlfind@opam:1.9.1@b748edf6", - "@opam/dune@opam:2.9.1@1e504822", "@opam/csexp@opam:1.5.1@8a8fb3a7" - ] - }, "@opam/csexp@opam:1.5.1@8a8fb3a7": { "id": "@opam/csexp@opam:1.5.1@8a8fb3a7", "name": "@opam/csexp", @@ -1028,11 +907,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822" ] }, "@opam/cppo@opam:1.6.8@7e48217d": { @@ -1053,12 +932,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune@opam:2.9.1@1e504822", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -1096,9 +975,9 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.13.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ] }, "@opam/biniou@opam:1.2.1@420bda02": { "id": "@opam/biniou@opam:1.2.1@420bda02", @@ -1118,11 +997,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", + "ocaml@4.13.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", + "ocaml@4.13.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@1ea9f987", "@opam/dune@opam:2.9.1@1e504822" ] }, @@ -1160,30 +1039,52 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/base@opam:v0.14.1@9b424fee": { - "id": "@opam/base@opam:v0.14.1@9b424fee", + "@opam/base-bytes@opam:base@19d0c2ff": { + "id": "@opam/base-bytes@opam:base@19d0c2ff", + "name": "@opam/base-bytes", + "version": "opam:base", + "source": { + "type": "install", + "source": [ "no-source:" ], + "opam": { + "name": "base-bytes", + "version": "base", + "path": "esy.lock/opam/base-bytes.base" + } + }, + "overrides": [], + "dependencies": [ + "ocaml@4.13.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.1@b748edf6", + "@esy-ocaml/substs@0.0.1@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.13.1000@d41d8cd9", "@opam/ocamlfind@opam:1.9.1@b748edf6" + ] + }, + "@opam/base@opam:v0.14.2@04880a76": { + "id": "@opam/base@opam:v0.14.2@04880a76", "name": "@opam/base", - "version": "opam:v0.14.1", + "version": "opam:v0.14.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/e4/e4419eae60f57e553b154856f0cacf42#md5:e4419eae60f57e553b154856f0cacf42", - "archive:https://github.com/janestreet/base/archive/v0.14.1.tar.gz#md5:e4419eae60f57e553b154856f0cacf42" + "archive:https://opam.ocaml.org/cache/md5/0d/0d1a2d0322b8c446e5dda20290112e5c#md5:0d1a2d0322b8c446e5dda20290112e5c", + "archive:https://github.com/janestreet/base/archive/v0.14.2.tar.gz#md5:0d1a2d0322b8c446e5dda20290112e5c" ], "opam": { "name": "base", - "version": "v0.14.1", - "path": "esy.lock/opam/base.v0.14.1" + "version": "v0.14.2", + "path": "esy.lock/opam/base.v0.14.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@155c136c", + "ocaml@4.13.1000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@155c136c", "@opam/dune-configurator@opam:2.9.1@b7cf7a02", "@opam/dune@opam:2.9.1@1e504822", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@155c136c", + "ocaml@4.13.1000@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@155c136c", "@opam/dune-configurator@opam:2.9.1@b7cf7a02", "@opam/dune@opam:2.9.1@1e504822" ] @@ -1206,12 +1107,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", "@opam/topkg@opam:1.0.4@52d43104", + "ocaml@4.13.1000@d41d8cd9", "@opam/topkg@opam:1.0.4@52d43104", "@opam/ocamlfind@opam:1.9.1@b748edf6", "@opam/ocamlbuild@opam:0.14.0@0dee4078", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "ocaml@4.12.0@d41d8cd9" ] + "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ] }, "@grain/libbinaryen@link-dev:./package.json": { "id": "@grain/libbinaryen@link-dev:./package.json", @@ -1224,14 +1125,14 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.12.0@d41d8cd9", + "ocaml@4.13.1000@d41d8cd9", "@opam/dune-configurator@opam:2.9.1@b7cf7a02", "@opam/dune@opam:2.9.1@1e504822", "@opam/conf-cmake@github:grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869@d41d8cd9" ], "devDependencies": [ - "@opam/ocamlformat@opam:0.18.0@a5c80606", - "@opam/ocaml-lsp-server@opam:1.8.3@b64dff17" + "@opam/ocamlformat@opam:0.20.1@6e37e311", + "@opam/ocaml-lsp-server@opam:1.9.1@1397dba9" ], "installConfig": { "pnp": false } }, diff --git a/esy.lock/opam/base-bytes.base/opam b/esy.lock/opam/base-bytes.base/opam new file mode 100644 index 0000000..f1cae50 --- /dev/null +++ b/esy.lock/opam/base-bytes.base/opam @@ -0,0 +1,9 @@ +opam-version: "2.0" +maintainer: " " +authors: " " +homepage: " " +depends: [ + "ocaml" {>= "4.02.0"} + "ocamlfind" {>= "1.5.3"} +] +synopsis: "Bytes library distributed with the OCaml compiler" diff --git a/esy.lock/opam/base.v0.14.1/opam b/esy.lock/opam/base.v0.14.2/opam similarity index 90% rename from esy.lock/opam/base.v0.14.1/opam rename to esy.lock/opam/base.v0.14.2/opam index eb9603e..250f5be 100644 --- a/esy.lock/opam/base.v0.14.1/opam +++ b/esy.lock/opam/base.v0.14.2/opam @@ -31,6 +31,6 @@ provided by companion libraries such as stdio: https://github.com/janestreet/stdio " url { - src: "https://github.com/janestreet/base/archive/v0.14.1.tar.gz" - checksum: "md5=e4419eae60f57e553b154856f0cacf42" + src: "https://github.com/janestreet/base/archive/v0.14.2.tar.gz" + checksum: "md5=0d1a2d0322b8c446e5dda20290112e5c" } diff --git a/esy.lock/opam/dot-merlin-reader.4.1/opam b/esy.lock/opam/dot-merlin-reader.4.1/opam deleted file mode 100644 index f860cab..0000000 --- a/esy.lock/opam/dot-merlin-reader.4.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "defree@gmail.com" -authors: "The Merlin team" -synopsis: "Reads config files for merlin" -homepage: "https://github.com/ocaml/merlin" -bug-reports: "https://github.com/ocaml/merlin/issues" -dev-repo: "git+https://github.com/ocaml/merlin.git" -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "ocaml" {>= "4.06.1" } - "dune" {>= "2.7.0"} - "yojson" {>= "1.6.0"} - "ocamlfind" {>= "1.6.0"} - "csexp" {>= "1.2.3"} - "result" {>= "1.5"} -] -description: - "Helper process: reads .merlin files and gives the normalized content to merlin" -x-commit-hash: "ab02f60994c81166820791b5f465f467d752b8dc" -url { - src: - "https://github.com/ocaml/merlin/releases/download/v4.1/dot-merlin-reader-v4.1.tbz" - checksum: [ - "sha256=14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd" - "sha512=65fd4ab08904c05651a7ef8971802ffaa428daa920765dbcf162e3c56e8047e4c9e4356daa45efccce7c73a586635c8f6cf8118fd3059789de9aff68579bd436" - ] -} diff --git a/esy.lock/opam/either.1.0.0/opam b/esy.lock/opam/either.1.0.0/opam new file mode 100644 index 0000000..651c06e --- /dev/null +++ b/esy.lock/opam/either.1.0.0/opam @@ -0,0 +1,40 @@ +opam-version: "2.0" +synopsis: "Compatibility Either module" +description: """ +Projects that want to use the Either module defined in OCaml 4.12.0 while +staying compatible with older versions of OCaml should use this library +instead. +""" +maintainer: ["Craig Ferguson "] +authors: ["Craig Ferguson "] +license: "MIT" +homepage: "https://github.com/mirage/either" +doc: "https://mirage.github.io/either" +bug-reports: "https://github.com/mirage/either/issues" +depends: [ + "dune" {>= "2.0"} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/mirage/either.git" +x-commit-hash: "a270ceac58e3e5bed6fe7e8bfb7132b14ee9c322" +url { + src: + "https://github.com/mirage/either/releases/download/1.0.0/either-1.0.0.tbz" + checksum: [ + "sha256=bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884" + "sha512=147854c09f897dd028b18a9f19acea8666107aaa7b1aab3c92f568af531364f57298edcaf3897d74246d3857d52e9bfb7ad0fc39220d988d9f14694ca1d5e9ed" + ] +} diff --git a/esy.lock/opam/fix.20201120/opam b/esy.lock/opam/fix.20211231/opam similarity index 51% rename from esy.lock/opam/fix.20201120/opam rename to esy.lock/opam/fix.20211231/opam index 65de74d..23b3f90 100644 --- a/esy.lock/opam/fix.20201120/opam +++ b/esy.lock/opam/fix.20211231/opam @@ -1,3 +1,4 @@ + opam-version: "2.0" maintainer: "francois.pottier@inria.fr" authors: [ @@ -6,19 +7,20 @@ authors: [ homepage: "https://gitlab.inria.fr/fpottier/fix" dev-repo: "git+https://gitlab.inria.fr/fpottier/fix.git" bug-reports: "francois.pottier@inria.fr" +license: "LGPL-2.0-only" build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ "ocaml" { >= "4.03" } - "dune" {>= "1.3" } + "dune" { >= "1.3" } ] -synopsis: "Facilities for memoization and fixed points" +synopsis: "Algorithmic building blocks for memoization, recursion, and more" url { src: - "https://gitlab.inria.fr/fpottier/fix/-/archive/20201120/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/fix/-/archive/20211231/archive.tar.gz" checksum: [ - "md5=7eb570b759635fe66f3556d2b1cc88e3" - "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4" + "md5=0f633b0cdd5faba947d11da113c81fcc" + "sha512=6817ce5c79e0c957ef01def7b89059262414af8e8bc7ffafef96430cfb1d78e32350fe7a57e118e68727962338c4fc45023cddb1c4db8c344910d6c8c1873a18" ] } diff --git a/esy.lock/opam/menhir.20211012/opam b/esy.lock/opam/menhir.20211230/opam similarity index 67% rename from esy.lock/opam/menhir.20211012/opam rename to esy.lock/opam/menhir.20211230/opam index 2849d81..07dd7d9 100644 --- a/esy.lock/opam/menhir.20211012/opam +++ b/esy.lock/opam/menhir.20211230/opam @@ -1,3 +1,4 @@ + opam-version: "2.0" maintainer: "francois.pottier@inria.fr" authors: [ @@ -12,17 +13,17 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "2.2.0"} + "ocaml" {>= "4.03.0"} + "dune" {>= "2.8.0"} "menhirLib" {= version} "menhirSdk" {= version} ] synopsis: "An LR(1) parser generator" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211012/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211230/archive.tar.gz" checksum: [ - "md5=f631f4c03859254a7d725f054633ee44" - "sha512=13376d3c07158c36dd9b4617294a7e4d53ba90062ab09fae48c36b76f08133e2ffc4be13a1bc88980617c5d1046631844815c9ee7fd7c821699bacaf245b1ed8" + "md5=ff8b8c4c58b1365128d0d2aeaad85d1c" + "sha512=361d4d81ac92fbe78a88ca731e8ec7e3287bf536b430949c88f87a7dca63e0d65ec30130331e5f00692b7cbbfcec8f3b2a7733cf023fe71067419bcc38ced91e" ] } diff --git a/esy.lock/opam/menhirLib.20211012/opam b/esy.lock/opam/menhirLib.20211230/opam similarity index 67% rename from esy.lock/opam/menhirLib.20211012/opam rename to esy.lock/opam/menhirLib.20211230/opam index 0a599d2..eb44f93 100644 --- a/esy.lock/opam/menhirLib.20211012/opam +++ b/esy.lock/opam/menhirLib.20211230/opam @@ -1,3 +1,4 @@ + opam-version: "2.0" maintainer: "francois.pottier@inria.fr" authors: [ @@ -12,8 +13,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" { >= "4.02.3" } - "dune" { >= "2.0.0" } + "ocaml" { >= "4.03.0" } + "dune" { >= "2.8.0" } ] conflicts: [ "menhir" { != version } @@ -21,9 +22,9 @@ conflicts: [ synopsis: "Runtime support library for parsers generated by Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211012/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211230/archive.tar.gz" checksum: [ - "md5=f631f4c03859254a7d725f054633ee44" - "sha512=13376d3c07158c36dd9b4617294a7e4d53ba90062ab09fae48c36b76f08133e2ffc4be13a1bc88980617c5d1046631844815c9ee7fd7c821699bacaf245b1ed8" + "md5=ff8b8c4c58b1365128d0d2aeaad85d1c" + "sha512=361d4d81ac92fbe78a88ca731e8ec7e3287bf536b430949c88f87a7dca63e0d65ec30130331e5f00692b7cbbfcec8f3b2a7733cf023fe71067419bcc38ced91e" ] } diff --git a/esy.lock/opam/menhirSdk.20211012/opam b/esy.lock/opam/menhirSdk.20211230/opam similarity index 67% rename from esy.lock/opam/menhirSdk.20211012/opam rename to esy.lock/opam/menhirSdk.20211230/opam index 09da271..0a45cbb 100644 --- a/esy.lock/opam/menhirSdk.20211012/opam +++ b/esy.lock/opam/menhirSdk.20211230/opam @@ -1,3 +1,4 @@ + opam-version: "2.0" maintainer: "francois.pottier@inria.fr" authors: [ @@ -12,8 +13,8 @@ build: [ ["dune" "build" "-p" name "-j" jobs] ] depends: [ - "ocaml" { >= "4.02.3" } - "dune" { >= "2.0.0" } + "ocaml" { >= "4.03.0" } + "dune" { >= "2.8.0" } ] conflicts: [ "menhir" { != version } @@ -21,9 +22,9 @@ conflicts: [ synopsis: "Compile-time library for auxiliary tools related to Menhir" url { src: - "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211012/archive.tar.gz" + "https://gitlab.inria.fr/fpottier/menhir/-/archive/20211230/archive.tar.gz" checksum: [ - "md5=f631f4c03859254a7d725f054633ee44" - "sha512=13376d3c07158c36dd9b4617294a7e4d53ba90062ab09fae48c36b76f08133e2ffc4be13a1bc88980617c5d1046631844815c9ee7fd7c821699bacaf245b1ed8" + "md5=ff8b8c4c58b1365128d0d2aeaad85d1c" + "sha512=361d4d81ac92fbe78a88ca731e8ec7e3287bf536b430949c88f87a7dca63e0d65ec30130331e5f00692b7cbbfcec8f3b2a7733cf023fe71067419bcc38ced91e" ] } diff --git a/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam b/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam deleted file mode 100644 index 14c9f75..0000000 --- a/esy.lock/opam/ocaml-compiler-libs.v0.12.4/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml compiler libraries repackaged" -description: """ -This packages exposes the OCaml compiler libraries repackages under -the toplevel names Ocaml_common, Ocaml_bytecomp, Ocaml_optcomp, ...""" -maintainer: ["Jane Street developers"] -authors: ["Jane Street Group, LLC"] -license: "MIT" -homepage: "https://github.com/janestreet/ocaml-compiler-libs" -bug-reports: "https://github.com/janestreet/ocaml-compiler-libs/issues" -depends: [ - "dune" {>= "2.8"} - "ocaml" {>= "4.04.1"} - "odoc" {with-doc} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/janestreet/ocaml-compiler-libs.git" -url { - src: - "https://github.com/janestreet/ocaml-compiler-libs/releases/download/v0.12.4/ocaml-compiler-libs-v0.12.4.tbz" - checksum: [ - "sha256=4ec9c9ec35cc45c18c7a143761154ef1d7663036a29297f80381f47981a07760" - "sha512=978dba8dfa61f98fa24fda7a9c26c2e837081f37d1685fe636dc19cfc3278a940cf01a10293504b185c406706bc1008bc54313d50f023bcdea6d5ac6c0788b35" - ] -} -x-commit-hash: "8cd12f18bb7171c2b67d661868c4271fae528d93" diff --git a/esy.lock/opam/ocaml-lsp-server.1.8.3/opam b/esy.lock/opam/ocaml-lsp-server.1.9.1/opam similarity index 69% rename from esy.lock/opam/ocaml-lsp-server.1.8.3/opam rename to esy.lock/opam/ocaml-lsp-server.1.9.1/opam index 299e3ec..5e23617 100644 --- a/esy.lock/opam/ocaml-lsp-server.1.8.3/opam +++ b/esy.lock/opam/ocaml-lsp-server.1.9.1/opam @@ -23,13 +23,13 @@ depends: [ "re" {>= "1.5.0"} "ppx_yojson_conv_lib" {>= "v0.14"} "dune-build-info" - "dot-merlin-reader" + "spawn" "pp" {>= "1.1.2"} "csexp" {>= "1.5"} "result" {>= "1.5"} - "ocamlformat-rpc-lib" {>= "0.18.0" & < "0.19.0"} + "ocamlformat-rpc-lib" {>= "0.18.0" & < "0.20.0"} "odoc" {with-doc} - "ocaml" {>= "4.12" & < "4.13"} + "ocaml" {>= "4.13" & < "4.14"} ] dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" build: [ @@ -45,10 +45,10 @@ build: [ ] url { src: - "https://github.com/ocaml/ocaml-lsp/releases/download/1.8.3/jsonrpc-1.8.3.tbz" + "https://github.com/ocaml/ocaml-lsp/releases/download/1.9.1/jsonrpc-1.9.1.tbz" checksum: [ - "sha256=58ef5aa7bf176712428b4e0b1015feaf6d677cbd9474f8822d132b25223b14e9" - "sha512=a368e3bc25eb6608110bd84b87142b6829a32182b61c336ad5faad597932e3c3db806a8043f52b234f2a05cc6ee88230267121fda81fff35c552cbb47ba895ab" + "sha256=cf1cdb257d4ef1ed1a05e951264b11c7dc7d3066bf448111cb17c67be56ddcee" + "sha512=1f073db86a8d44e5a4501f0d5c233f07f2dd4e8dd6abb918ef50846031af63e4ab9b408fffd9b32d1a7e9e5c7343c9b6ce97b07effed8359f7b610818f78e967" ] } -x-commit-hash: "7bf6200c165b5959e49651c84093d61a64cf705d" +x-commit-hash: "435d22d25561b36010e4c6c07d52e413d4063bdf" diff --git a/esy.lock/opam/ocaml-migrate-parsetree.2.2.0/opam b/esy.lock/opam/ocaml-migrate-parsetree.2.2.0/opam deleted file mode 100644 index 6b14281..0000000 --- a/esy.lock/opam/ocaml-migrate-parsetree.2.2.0/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -maintainer: "frederic.bour@lakaban.net" -authors: [ - "Frédéric Bour " - "Jérémie Dimino " -] -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" -homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree" -bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues" -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git" -doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/" -tags: [ "syntax" "org:ocamllabs" ] -build: ["dune" "build" "-p" name "-j" jobs] -run-test: ["dune" "runtest" "-p" name "-j" jobs] -depends: [ - "dune" {>= "2.3"} - "ocaml" {>= "4.02.3" & < "4.14"} - "cinaps" {with-test & >= "v0.13.0"} -] -conflicts: [ - "base-effects" -] -synopsis: "Convert OCaml parsetrees between different versions" -description: """ -Convert OCaml parsetrees between different versions - -This library converts parsetrees, outcometree and ast mappers between -different OCaml versions. High-level functions help making PPX -rewriters independent of a compiler version. -""" -url { - src: - "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v2.2.0/ocaml-migrate-parsetree-v2.2.0.tbz" - checksum: [ - "sha256=b2a68f3d3899cec3a50a99b05738295cc8a18672680406d0f68fbc95c01f1ba1" - "sha512=d1a6e2a639f77d297690f9ed79318b7a403444585b062d2add9f370320f735ba54bca191a34401f15c576c7ee55b5ed232f20d9599aa67821c747d7e684fc5a7" - ] -} -x-commit-hash: "aeeb9317936937d360aa6cdb0cab953d11ff2c5d" diff --git a/esy.lock/opam/ocamlformat-rpc-lib.0.18.0/opam b/esy.lock/opam/ocamlformat-rpc-lib.0.19.0/opam similarity index 71% rename from esy.lock/opam/ocamlformat-rpc-lib.0.18.0/opam rename to esy.lock/opam/ocamlformat-rpc-lib.0.19.0/opam index 3ce7021..0792372 100644 --- a/esy.lock/opam/ocamlformat-rpc-lib.0.18.0/opam +++ b/esy.lock/opam/ocamlformat-rpc-lib.0.19.0/opam @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-ppx/ocamlformat" bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" depends: [ "dune" {>= "2.8"} - "ocaml" {>= "4.08" & < "4.13"} + "ocaml" {>= "4.08" & < "4.14"} "csexp" "sexplib0" "odoc" {with-doc} @@ -29,12 +29,12 @@ build: [ ] ] dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git" -x-commit-hash: "3697f0f92854a681fd1156fe4f6fb97d060da1d8" url { src: - "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.18.0/ocamlformat-0.18.0.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.19.0/ocamlformat-0.19.0.tbz" checksum: [ - "sha256=981a44296485da6ca29ab2cd8c711270398e5e1d1624408ec403c0b0ea9fe114" - "sha512=d1cbd63e4b82ff2e9ec0c96a9305704d3eea3e978c703ef9d1244853d8aaea912ad9f934379eeddfc1a0468b1cb1c2dc39ecf452189f2a35fa1ae53aec10b277" + "sha256=62fc46aae8f0a4a33ce7f8d7726d7109bff615ea6fcb50d1482f21d20ee50f46" + "sha512=408b3af533169f201d7492be869f8ae4acde5583e01693c586929f44b76d569d3d6d555bc056378743d7cb3bd8e11ebc9cbd178ca196bcb82db33127d14902f8" ] } +x-commit-hash: "ba67af28ddca8718ef8816b2b0dc1e5b2f5e9591" diff --git a/esy.lock/opam/ocamlformat.0.18.0/opam b/esy.lock/opam/ocamlformat.0.20.1/opam similarity index 55% rename from esy.lock/opam/ocamlformat.0.18.0/opam rename to esy.lock/opam/ocamlformat.0.20.1/opam index 1d9f0c3..209f368 100644 --- a/esy.lock/opam/ocamlformat.0.18.0/opam +++ b/esy.lock/opam/ocamlformat.0.20.1/opam @@ -4,31 +4,29 @@ description: "OCamlFormat is a tool to automatically format OCaml code in a uniform style." maintainer: ["OCamlFormat Team "] authors: ["Josh Berdine "] -license: "MIT" homepage: "https://github.com/ocaml-ppx/ocamlformat" bug-reports: "https://github.com/ocaml-ppx/ocamlformat/issues" depends: [ "dune" {>= "2.8"} - "ocaml" {>= "4.08" & < "4.13"} - "ocaml-version" {>= "3.1.0"} + "ocaml" {>= "4.08" & < "4.15"} "alcotest" {with-test} "base" {>= "v0.12.0" & < "v0.15"} - "base-unix" "cmdliner" "dune-build-info" + "either" "fix" "fpath" - "menhir" {>= "20180528"} - "menhirLib" {>= "20200624"} - "menhirSdk" {>= "20200624"} - "ocp-indent" {with-test} - "bisect_ppx" {dev & >= "2.5.0"} - "odoc" {>= "1.4.2" & < "2.0.0"} - "ppxlib" {>= "0.22.0" & < "0.23.0"} + "menhir" {>= "20201216"} + "menhirLib" {>= "20201216"} + "menhirSdk" {>= "20201216"} + "ocaml-version" {>= "3.3.0"} + "ocp-indent" + "odoc-parser" {>= "1.0.0"} "re" {>= "1.7.2"} "stdio" {< "v0.15"} "uuseg" {>= "10.0.0"} "uutf" {>= "1.0.1"} + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} @@ -45,12 +43,13 @@ build: [ ] ] dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git" -x-commit-hash: "3697f0f92854a681fd1156fe4f6fb97d060da1d8" +license: ["MIT" "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"] url { src: - "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.18.0/ocamlformat-0.18.0.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.20.1/ocamlformat-0.20.1.tbz" checksum: [ - "sha256=981a44296485da6ca29ab2cd8c711270398e5e1d1624408ec403c0b0ea9fe114" - "sha512=d1cbd63e4b82ff2e9ec0c96a9305704d3eea3e978c703ef9d1244853d8aaea912ad9f934379eeddfc1a0468b1cb1c2dc39ecf452189f2a35fa1ae53aec10b277" + "sha256=7d3a51645416fa78287344fa03af6b78450067a1a61e4790bf1b29779cd10235" + "sha512=8cc8bc9ebf822b18cf54f2f5b0b61c7bf775a1de9b984f57448dcee391627a08d43e7b15a2cfbd287f5ae16b3b9dd18c42086b59ccfbe3174184418652c4f668" ] } +x-commit-hash: "74668925ca977e252acb084bd139b3077cf95b58" # OCamlFormat is distributed under the MIT license. Parts of the OCaml library are vendored for OCamlFormat and distributed under their original LGPL 2.1 license diff --git a/esy.lock/opam/ocp-indent.1.7.0/opam b/esy.lock/opam/ocp-indent.1.7.0/opam new file mode 100644 index 0000000..3e65bc1 --- /dev/null +++ b/esy.lock/opam/ocp-indent.1.7.0/opam @@ -0,0 +1,57 @@ +opam-version: "2.0" +maintainer: "contact@ocamlpro.com" +synopsis: "A simple tool to indent OCaml programs" +description: """ +Ocp-indent is based on an approximate, tolerant OCaml parser and a simple stack +machine ; this is much faster and more reliable than using regexps. Presets and +configuration options available, with the possibility to set them project-wide. +Supports most common syntax extensions, and extensible for others. + +Includes: +- An indentor program, callable from the command-line or from within editors +- Bindings for popular editors +- A library that can be directly used by editor writers, or just for + fault-tolerant/approximate parsing. +""" +authors: [ + "Louis Gesbert " + "Thomas Gazagnaire " + "Jun Furuse" +] +homepage: "http://www.typerex.org/ocp-indent.html" +bug-reports: "https://github.com/OCamlPro/ocp-indent/issues" +license: "LGPL-2.0-or-later" +tags: ["org:ocamlpro" "org:typerex"] +dev-repo: "git+https://github.com/OCamlPro/ocp-indent.git" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] +run-test: [ + ["dune" "runtest" "-p" name] +] +depends: [ + "ocaml" + "dune" + "cmdliner" {>= "1.0.0"} + "ocamlfind" + "base-bytes" +] +post-messages: [ + "This package requires additional configuration for use in editors. Install package 'user-setup', or manually: + +* for Emacs, add these lines to ~/.emacs: + (add-to-list 'load-path \"%{share}%/emacs/site-lisp\") + (require 'ocp-indent) + +* for Vim, add this line to ~/.vimrc: + set rtp^=\"%{share}%/ocp-indent/vim\" +" + {success & !user-setup:installed} +] +url { + src: "https://github.com/OCamlPro/ocp-indent/archive/1.7.0.tar.gz" + checksum: [ + "md5=3bc327e38f453f38494098725c97d2cb" + "sha512=5b28ae8695612c95cb0f5748de9b9f01d8ef4ad18b31340dc526ccae5fb1b6ee7e12024ff1beb817a43796183a83bca144222ca2d77d7750f2ff56108b5fa350" + ] +} diff --git a/esy.lock/opam/odoc-parser.1.0.0/opam b/esy.lock/opam/odoc-parser.1.0.0/opam new file mode 100644 index 0000000..cbf8c8b --- /dev/null +++ b/esy.lock/opam/odoc-parser.1.0.0/opam @@ -0,0 +1,46 @@ +opam-version: "2.0" +synopsis: "Parser for ocaml documentation comments" +description: """ +Odoc_parser is a library for parsing the contents of OCaml documentation +comments, formatted using 'odoc' syntax, an extension of the language +understood by ocamldoc.""" +maintainer: ["Jon Ludlam "] +authors: ["Anton Bachin "] +license: "ISC" +homepage: "https://github.com/ocaml-doc/odoc-parser" +bug-reports: "https://github.com/ocaml-doc/odoc-parser/issues" +dev-repo: "git+https://github.com/ocaml-doc/odoc-parser.git" +# This template exists because without it dune pop is dependencies and build rules +# involving odoc. Since odoc depends on this package, this doesn't work. +doc: "https://ocaml-doc.github.io/odoc-parser/" +depends: [ + "dune" {>= "2.8"} + "ocaml" {>= "4.02.0"} + "astring" + "result" + "ppx_expect" {with-test} + ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test}) +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + ] +] +url { + src: + "https://github.com/ocaml-doc/odoc-parser/releases/download/1.0.0/odoc-parser-1.0.0.tbz" + checksum: [ + "sha256=b6aa08ea71a9ebad9b2bebc4da1eda0d713cf3674e6d57d10459d934286e7aa1" + "sha512=b5caee3a0d288aeaa95e3f32de8e5f75f169ad2691d75f8d6c932e4fb0e6cb188813ac2d92d4076fe75b12217130e6999c46e7890cf0fa765070870f85a96d63" + ] +} +x-commit-hash: "b13ffc2f30ca20ca5bb733be4f630d46bd274fd6" + diff --git a/esy.lock/opam/odoc.1.5.3/opam b/esy.lock/opam/odoc.1.5.3/opam deleted file mode 100644 index eae8a5f..0000000 --- a/esy.lock/opam/odoc.1.5.3/opam +++ /dev/null @@ -1,53 +0,0 @@ -opam-version: "2.0" - -homepage: "http://github.com/ocaml/odoc" -doc: "https://ocaml.github.io/odoc/" -bug-reports: "https://github.com/ocaml/odoc/issues" -license: "ISC" - -authors: [ - "Thomas Refis " - "David Sheets " - "Leo White " - "Anton Bachin " - "Jon Ludlam " -] -maintainer: "Jon Ludlam " -dev-repo: "git+https://github.com/ocaml/odoc.git" - -synopsis: "OCaml documentation generator" -description: """ -Odoc is a documentation generator for OCaml. It reads doc comments, -delimited with `(** ... *)`, and outputs HTML. -""" - -depends: [ - "astring" - "cmdliner" {>= "1.0.0"} - "cppo" {build & >= "1.1.0"} - "dune" - "fpath" - "ocaml" {>= "4.02.0"} - "result" - "tyxml" {>= "4.3.0"} - - "alcotest" {dev & >= "0.8.3" & with-test} - "markup" {dev & >= "1.0.0" & with-test} - "ocamlfind" {dev} - "sexplib" {dev & >= "113.33.00" & with-test} - - "bisect_ppx" {dev & >= "1.3.0"} -] - -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: "https://github.com/ocaml/odoc/releases/download/1.5.3/odoc-1.5.3.tbz" - checksum: [ - "sha256=f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45" - "sha512=9e069590e0737c94813d25235b5cfe27feb5a0298a17ff9b9ee446c69827c3a0ea3b7da5d05b278639cd1f0202e0d83356707979edfaa2af73876fc000c23c4d" - ] -} -x-commit-hash: "8de4a36814533b25b461373fe5c0f54db55e5e7c" diff --git a/esy.lock/opam/ppx_derivers.1.2.1/opam b/esy.lock/opam/ppx_derivers.1.2.1/opam deleted file mode 100644 index 484b265..0000000 --- a/esy.lock/opam/ppx_derivers.1.2.1/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -maintainer: "jeremie@dimino.org" -authors: ["Jérémie Dimino"] -license: "BSD-3-Clause" -homepage: "https://github.com/ocaml-ppx/ppx_derivers" -bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues" -dev-repo: "git+https://github.com/ocaml-ppx/ppx_derivers.git" -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "ocaml" - "dune" -] -synopsis: "Shared [@@deriving] plugin registry" -description: """ -Ppx_derivers is a tiny package whose sole purpose is to allow -ppx_deriving and ppx_type_conv to inter-operate gracefully when linked -as part of the same ocaml-migrate-parsetree driver.""" -url { - src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.2.1.tar.gz" - checksum: "md5=5dc2bf130c1db3c731fe0fffc5648b41" -} diff --git a/esy.lock/opam/ppxlib.0.22.2/opam b/esy.lock/opam/ppxlib.0.22.2/opam deleted file mode 100644 index 754b88c..0000000 --- a/esy.lock/opam/ppxlib.0.22.2/opam +++ /dev/null @@ -1,59 +0,0 @@ -opam-version: "2.0" -synopsis: "Standard library for ppx rewriters" -description: """ -Ppxlib is the standard library for ppx rewriters and other programs -that manipulate the in-memory reprensation of OCaml programs, a.k.a -the "Parsetree". - -It also comes bundled with two ppx rewriters that are commonly used to -write tools that manipulate and/or generate Parsetree values; -`ppxlib.metaquot` which allows to construct Parsetree values using the -OCaml syntax directly and `ppxlib.traverse` which provides various -ways of automatically traversing values of a given type, in particular -allowing to inject a complex structured value into generated code. -""" -maintainer: ["opensource@janestreet.com"] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml-ppx/ppxlib" -doc: "https://ocaml-ppx.github.io/ppxlib/" -bug-reports: "https://github.com/ocaml-ppx/ppxlib/issues" -depends: [ - "dune" {>= "2.7"} - "ocaml" {>= "4.04.1" & < "4.14"} - "ocaml-compiler-libs" {>= "v0.11.0"} - "ocaml-migrate-parsetree" {>= "2.2.0"} - "ppx_derivers" {>= "1.0"} - "sexplib0" {>= "v0.12"} - "stdlib-shims" - "ocamlfind" {with-test} - "re" {with-test & >= "1.9.0"} - "cinaps" {with-test & >= "v0.12.1"} - "base" {with-test} - "stdio" {with-test} - "odoc" {with-doc} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git" -x-commit-hash: "3cf57772fef4666a2992041cf3a670dd2be98603" -url { - src: - "https://github.com/ocaml-ppx/ppxlib/releases/download/0.22.2/ppxlib-0.22.2.tbz" - checksum: [ - "sha256=d0e8a1ebdc6220b1574d7a926f008460c5118ccef79bf9a0ce0242f34cff225a" - "sha512=6010a59be6af873eaf193670f9cc8c9a7f091cfd89ec6c5b68d1f0c72d7c6015eec6371c009fc473cf2cb37d24f0934d04d0eacefa567a4945234197c3b31741" - ] -} diff --git a/esy.lock/opam/spawn.v0.15.0/opam b/esy.lock/opam/spawn.v0.15.0/opam new file mode 100644 index 0000000..d8d1578 --- /dev/null +++ b/esy.lock/opam/spawn.v0.15.0/opam @@ -0,0 +1,56 @@ +opam-version: "2.0" +synopsis: "Spawning sub-processes" +description: """ +Spawn is a small library exposing only one functionality: spawning sub-process. + +It has three main goals: + +1. provide missing features of Unix.create_process such as providing a +working directory + +2. provide better errors when a system call fails in the +sub-process. For instance if a command is not found, you get a proper +[Unix.Unix_error] exception + +3. improve performance by using vfork when available. It is often +claimed that nowadays fork is as fast as vfork, however in practice +fork takes time proportional to the process memory while vfork is +constant time. In application using a lot of memory, vfork can be +thousands of times faster than fork. +""" +maintainer: ["Jane Street developers"] +authors: ["Jane Street Group, LLC"] +license: "MIT" +homepage: "https://github.com/janestreet/spawn" +doc: "https://janestreet.github.io/spawn/" +bug-reports: "https://github.com/janestreet/spawn/issues" +depends: [ + "dune" {>= "2.8"} + "ppx_expect" {with-test} + "ocaml" {>= "4.05"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/janestreet/spawn.git" +x-commit-hash: "b5a25cab2f53a5ee9e10a7b8a96506cc61ce1198" +url { + src: + "https://github.com/janestreet/spawn/archive/v0.15.0.tar.gz" + checksum: [ + "sha256=310fb2a50ac7f64c738182cbabd9d27c1aeae1a08107fe14da8d35a87cbb57c7" + "sha512=3a775b57a73efee6adbc30b32fa779f27d11c7008a46f90fdb9da6288533e2d83fc49dbcd770c087f2e4560c5586ff72a9a2985d8929955773cc10d83f126013" + ] +} diff --git a/esy.lock/opam/stdlib-shims.0.3.0/opam b/esy.lock/opam/stdlib-shims.0.3.0/opam deleted file mode 100644 index d657e04..0000000 --- a/esy.lock/opam/stdlib-shims.0.3.0/opam +++ /dev/null @@ -1,31 +0,0 @@ -opam-version: "2.0" -maintainer: "The stdlib-shims programmers" -authors: "The stdlib-shims programmers" -homepage: "https://github.com/ocaml/stdlib-shims" -doc: "https://ocaml.github.io/stdlib-shims/" -dev-repo: "git+https://github.com/ocaml/stdlib-shims.git" -bug-reports: "https://github.com/ocaml/stdlib-shims/issues" -tags: ["stdlib" "compatibility" "org:ocaml"] -license: ["typeof OCaml system"] -depends: [ - "dune" - "ocaml" {>= "4.02.3"} -] -build: [ "dune" "build" "-p" name "-j" jobs ] -synopsis: "Backport some of the new stdlib features to older compiler" -description: """ -Backport some of the new stdlib features to older compiler, -such as the Stdlib module. - -This allows projects that require compatibility with older compiler to -use these new features in their code. -""" -x-commit-hash: "fb6815e5d745f07fd567c11671149de6ef2e74c8" -url { - src: - "https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz" - checksum: [ - "sha256=babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a" - "sha512=1151d7edc8923516e9a36995a3f8938d323aaade759ad349ed15d6d8501db61ffbe63277e97c4d86149cf371306ac23df0f581ec7e02611f58335126e1870980" - ] -} diff --git a/esy.lock/opam/tyxml.4.5.0/opam b/esy.lock/opam/tyxml.4.5.0/opam deleted file mode 100644 index 22c7760..0000000 --- a/esy.lock/opam/tyxml.4.5.0/opam +++ /dev/null @@ -1,42 +0,0 @@ -opam-version: "2.0" -synopsis: "A library for building correct HTML and SVG documents" -description: - "TyXML provides a set of convenient combinators that uses the OCaml type system to ensure the validity of the generated documents. TyXML can be used with any representation of HTML and SVG: the textual one, provided directly by this package, or DOM trees (`js_of_ocaml-tyxml`) virtual DOM (`virtual-dom`) and reactive or replicated trees (`eliom`). You can also create your own representation and use it to instantiate a new set of combinators." -maintainer: ["dev@ocsigen.org"] -authors: ["The ocsigen team"] -license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception" -homepage: "https://github.com/ocsigen/tyxml" -doc: "https://ocsigen.org/tyxml/latest/manual/intro" -bug-reports: "https://github.com/ocsigen/tyxml/issues" -depends: [ - "dune" {>= "2.0"} - "ocaml" {>= "4.02"} - "alcotest" {with-test} - "re" {>= "1.5.0"} - "seq" - "uutf" {>= "1.0.0"} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocsigen/tyxml.git" -x-commit-hash: "ef431a4bceaefb2d9248e79092e6c1a1a9420095" -url { - src: - "https://github.com/ocsigen/tyxml/releases/download/4.5.0/tyxml-4.5.0.tbz" - checksum: [ - "sha256=c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068" - "sha512=772535441b09c393d53c27152e65f404a0a541aa0cea1bda899a8d751ab64d1729237e583618c3ff33d75e3865d53503d1ea413c6bbc8c68c413347efd1709b3" - ] -} diff --git a/package.json b/package.json index f8c1a4e..10221c6 100644 --- a/package.json +++ b/package.json @@ -5,22 +5,32 @@ "author": "Blaine Bublitz ", "license": "Apache-2.0", "dependencies": { - "ocaml": "4.12.0", + "ocaml": ">= 4.12.0", "@opam/conf-cmake": "grain-lang/cmake:esy.json#1cead3871bbb27a45adab2263ef2dff4a38a8869", "@opam/dune": "^2.9.1", "@opam/dune-configurator": "^2.9.1" }, "devDependencies": { - "@opam/ocamlformat": "0.18.0", - "@opam/ocaml-lsp-server": "^1.8.2" + "@opam/ocamlformat": "0.20.1", + "@opam/ocaml-lsp-server": "^1.9.1" + }, + "resolutions": { + "@opam/ocp-indent": "1.7.0" }, "esy": { "build": [ - "dune build -p libbinaryen" + "dune build -p libbinaryen -j 4" ], "buildEnv": { + "PATH": "#{os == 'windows' ? '/usr/x86_64-w64-mingw32/sys-root/mingw/bin' : '' : $PATH }", "CC": "#{os == 'windows' ? 'x86_64-w64-mingw32-gcc' : ''}", "CXX": "#{os == 'windows' ? 'x86_64-w64-mingw32-g++' : ''}" + }, + "exportedEnv": { + "PATH": { + "val": "#{os == 'windows' ? '/usr/x86_64-w64-mingw32/sys-root/mingw/bin' : '' : $PATH }", + "scope": "global" + } } }, "scripts": { diff --git a/test/config/dune b/test/config/dune new file mode 100644 index 0000000..d44eca4 --- /dev/null +++ b/test/config/dune @@ -0,0 +1,8 @@ +(executable + (name flags) + (libraries dune.configurator)) + +(rule + (targets flags.sexp) + (action + (run ./flags.exe))) diff --git a/config/library_flags.ml b/test/config/flags.ml similarity index 64% rename from config/library_flags.ml rename to test/config/flags.ml index 52c2021..43b5329 100644 --- a/config/library_flags.ml +++ b/test/config/flags.ml @@ -1,17 +1,16 @@ module C = Configurator.V1 let () = - C.main ~name:"library_flags" (fun c -> + C.main ~name:"flags" (fun c -> let default = [] in - let library_flags = + let flags = match C.ocaml_config_var c "system" with | Some "macosx" -> (* These flags preserve the original C++ error behavior. Ref https://github.com/ocaml/ocaml/issues/10423 *) [ "-cc"; "clang++" ] - | Some "mingw64" -> [ "-ccopt"; "--"; "-ccopt"; "-static" ] | Some _ -> default | None -> default in - C.Flags.write_sexp "library_flags.sexp" library_flags) + C.Flags.write_sexp "flags.sexp" flags) diff --git a/test/dune b/test/dune index 4128cc3..18a3369 100644 --- a/test/dune +++ b/test/dune @@ -5,12 +5,14 @@ (foreign_stubs (language c) (names binaryen_stubs_types) - (flags :standard -O2 -Wall -Wextra)) - (c_library_flags :standard -lstdc++ -lpthread)) + (flags :standard -O2 -Wall -Wextra))) (test (name test) (modules test) (libraries binaryen) + (flags + :standard + (:include ./config/flags.sexp)) (action (run %{test})))