From 11d4fb4050903897cd9e2d56ce7a73856c30010a Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Tue, 1 Sep 2020 08:16:43 -0700 Subject: [PATCH] fix(ci): Fix CI for Onivim 2 - revert fetch dependencies (#997) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately, I'm still seeing issues with the set of dependencies for the `fetch-lwt` library, when building Onivim 2 - we get this error: I've been trying to avoid reverting this, and maintaining a separate 'oni2' branch w/o it - but it's a lot of extra overhead for me (we can't actually use `fetch` in Onivim 2, either - lack of Windows support & it isn't integrated with libuv). When building from Onivim 2, I get these errors: ``` Bryans-Mac-mini:oni2 bryphe$ esy run -f info building @reason-native-web/piaf@1.3.0@d41d8cd9 error: build failed with exit code: 1 build log: # esy-build-package: building: @reason-native-web/piaf@1.3.0 # esy-build-package: pwd: /Users/bryphe/.esy/source/i/reason_native_web__s__piaf__1.3.0__aac2317a # esy-build-package: running: 'dune' 'build' '--only-packages=piaf' '--profile=release' '-j' '4' '--root=./piaf' Entering directory '/Users/bryphe/.esy/source/i/reason_native_web__s__piaf__1.3.0__aac2317a/piaf' File "lib/http_intf.ml", line 1: Error: The files lib/.piaf.objs/byte/piaf__Scheme.cmi and /Users/bryphe/.esy/3__________________________________________________________________/i/reason_native_web__s__h2_lwt_unix-0.6.1000-eb9002c6/lib/h2-lwt-unix/h2_lwt_unix.cmi make inconsistent assumptions over interface Gluten_lwt_unix__Ssl_io error: command failed: 'dune' 'build' '--only-packages=piaf' '--profile=release' '-j' '4' '--root=./piaf' (exited with 1) esy-build-package: exiting with errors above... building @reason-native-web/piaf@1.3.0 esy: exiting due to errors above ``` I'd definitely like to have the `fetch` API - some details here: https://github.com/revery-ui/revery/issues/996 , and really appreciate all the pioneering work you've done @lessp ! If you have any other ideas, @lessp - let me know 👍 --- bench.esy.lock/index.json | 1116 +++------------- bench.esy.lock/opam/angstrom.0.14.1/opam | 32 - bench.esy.lock/opam/base64.3.4.0/opam | 38 - .../opam/bigarray-compat.1.0.0/opam | 23 - bench.esy.lock/opam/bigstringaf.0.6.1/opam | 43 - bench.esy.lock/opam/charInfo_width.1.1.0/opam | 10 +- bench.esy.lock/opam/conf-autoconf.0.1/opam | 30 - .../opam/dune-build-info.2.7.0}/opam | 11 +- .../opam/dune-configurator.2.7.0}/opam | 13 +- .../opam/dune-private-libs.2.6.2/opam | 42 - .../opam/dune.2.7.0}/opam | 8 +- .../opam/faraday-lwt-unix.0.7.1/opam | 24 - bench.esy.lock/opam/faraday-lwt.0.7.1/opam | 23 - bench.esy.lock/opam/faraday.0.7.1/opam | 30 - bench.esy.lock/opam/hpack.0.2.0/opam | 32 - bench.esy.lock/opam/magic-mime.1.1.2/opam | 41 - ...Don-t-build-manpages-for-stdlib-docs.patch | 24 - ...1-Fix-failure-to-install-tools-links.patch | 26 - .../files/fix-gcc10.patch | 34 - .../ocaml-secondary-compiler.4.08.1-1/opam | 51 - .../opam/ocaml-syntax-shims.1.0.0/opam | 39 - .../ocamlfind-secondary.1.8.1/files/META.in | 3 - .../files/ocaml-secondary-compiler.conf.in | 10 - .../opam/ocamlfind-secondary.1.8.1/opam | 32 - bench.esy.lock/opam/stringext.1.6.0/opam | 32 - bench.esy.lock/opam/uri.3.1.0/opam | 35 - .../package.json | 6 - .../package.json | 3 - .../files/clone-flexdll | 16 - .../files/configure-windows | 22 - .../files/esy-build | 24 - .../files/esy-configure | 29 - .../package.json | 28 - .../files/findlib-1.8.1.patch | 471 ------- .../files/gen-findlib-conf.sh | 14 - .../files/gen-meta.sh | 7 - .../package.json | 47 - doc.esy.lock/index.json | 1139 +++------------- doc.esy.lock/opam/angstrom.0.14.1/opam | 32 - doc.esy.lock/opam/base64.3.4.0/opam | 38 - doc.esy.lock/opam/bigarray-compat.1.0.0/opam | 23 - doc.esy.lock/opam/bigstringaf.0.6.1/opam | 43 - doc.esy.lock/opam/charInfo_width.1.1.0/opam | 10 +- doc.esy.lock/opam/conf-autoconf.0.1/opam | 30 - .../opam | 11 +- .../opam/dune-configurator.2.7.0}/opam | 13 +- .../opam/dune-private-libs.2.6.2/opam | 42 - .../opam/dune.2.7.0}/opam | 8 +- doc.esy.lock/opam/faraday-lwt-unix.0.7.1/opam | 24 - doc.esy.lock/opam/faraday-lwt.0.7.1/opam | 23 - doc.esy.lock/opam/faraday.0.7.1/opam | 30 - doc.esy.lock/opam/hpack.0.1.0/opam | 32 - doc.esy.lock/opam/magic-mime.1.1.2/opam | 41 - ...Don-t-build-manpages-for-stdlib-docs.patch | 24 - ...1-Fix-failure-to-install-tools-links.patch | 26 - .../files/fix-gcc10.patch | 34 - .../ocaml-secondary-compiler.4.08.1-1/opam | 51 - .../opam/ocaml-syntax-shims.1.0.0/opam | 39 - .../ocamlfind-secondary.1.8.1/files/META.in | 3 - .../files/ocaml-secondary-compiler.conf.in | 10 - .../opam/ocamlfind-secondary.1.8.1/opam | 32 - doc.esy.lock/opam/stringext.1.6.0/opam | 32 - doc.esy.lock/opam/uri.3.1.0/opam | 35 - .../package.json | 6 - .../package.json | 3 - .../files/clone-flexdll | 16 - .../files/configure-windows | 22 - .../files/esy-build | 24 - .../files/esy-configure | 29 - .../package.json | 28 - .../files/findlib-1.8.1.patch | 471 ------- .../files/gen-findlib-conf.sh | 14 - .../files/gen-meta.sh | 7 - .../package.json | 47 - esy.lock/index.json | 1116 +++------------- esy.lock/opam/angstrom.0.14.1/opam | 32 - esy.lock/opam/base64.3.4.0/opam | 38 - esy.lock/opam/bigarray-compat.1.0.0/opam | 23 - esy.lock/opam/bigstringaf.0.6.1/opam | 43 - esy.lock/opam/charInfo_width.1.1.0/opam | 10 +- esy.lock/opam/conf-autoconf.0.1/opam | 30 - .../opam/dune-build-info.2.7.0}/opam | 11 +- .../opam/dune-configurator.2.7.0}/opam | 13 +- esy.lock/opam/dune-private-libs.2.6.2/opam | 42 - .../opam/dune.2.7.0}/opam | 8 +- esy.lock/opam/faraday-lwt-unix.0.7.1/opam | 24 - esy.lock/opam/faraday-lwt.0.7.1/opam | 23 - esy.lock/opam/faraday.0.7.1/opam | 30 - esy.lock/opam/hpack.0.2.0/opam | 32 - esy.lock/opam/magic-mime.1.1.2/opam | 41 - ...Don-t-build-manpages-for-stdlib-docs.patch | 24 - ...1-Fix-failure-to-install-tools-links.patch | 26 - .../files/fix-gcc10.patch | 34 - .../ocaml-secondary-compiler.4.08.1-1/opam | 51 - esy.lock/opam/ocaml-syntax-shims.1.0.0/opam | 39 - .../ocamlfind-secondary.1.8.1/files/META.in | 3 - .../files/ocaml-secondary-compiler.conf.in | 10 - esy.lock/opam/ocamlfind-secondary.1.8.1/opam | 32 - esy.lock/opam/stringext.1.6.0/opam | 32 - esy.lock/opam/uri.3.1.0/opam | 35 - .../package.json | 6 - .../package.json | 3 - .../files/clone-flexdll | 16 - .../files/configure-windows | 22 - .../files/esy-build | 24 - .../files/esy-configure | 29 - .../package.json | 28 - .../files/findlib-1.8.1.patch | 471 ------- .../files/gen-findlib-conf.sh | 14 - .../files/gen-meta.sh | 7 - .../package.json | 47 - examples.esy.lock/index.json | 1116 +++------------- examples.esy.lock/opam/angstrom.0.14.1/opam | 32 - examples.esy.lock/opam/base64.3.4.0/opam | 38 - .../opam/bigarray-compat.1.0.0/opam | 23 - examples.esy.lock/opam/bigstringaf.0.6.1/opam | 43 - .../opam/charInfo_width.1.1.0/opam | 10 +- examples.esy.lock/opam/conf-autoconf.0.1/opam | 30 - .../opam/dune-build-info.2.7.0}/opam | 11 +- .../opam/dune-configurator.2.7.0}/opam | 13 +- .../opam/dune-private-libs.2.6.2/opam | 42 - .../opam/dune.2.7.0}/opam | 8 +- .../opam/faraday-lwt-unix.0.7.1/opam | 24 - examples.esy.lock/opam/faraday-lwt.0.7.1/opam | 23 - examples.esy.lock/opam/faraday.0.7.1/opam | 30 - examples.esy.lock/opam/hpack.0.2.0/opam | 32 - examples.esy.lock/opam/magic-mime.1.1.2/opam | 41 - ...Don-t-build-manpages-for-stdlib-docs.patch | 24 - ...1-Fix-failure-to-install-tools-links.patch | 26 - .../files/fix-gcc10.patch | 34 - .../ocaml-secondary-compiler.4.08.1-1/opam | 51 - .../opam/ocaml-syntax-shims.1.0.0/opam | 39 - .../ocamlfind-secondary.1.8.1/files/META.in | 3 - .../files/ocaml-secondary-compiler.conf.in | 10 - .../opam/ocamlfind-secondary.1.8.1/opam | 32 - examples.esy.lock/opam/stringext.1.6.0/opam | 32 - examples.esy.lock/opam/uri.3.1.0/opam | 35 - .../package.json | 6 - .../package.json | 3 - .../files/clone-flexdll | 16 - .../files/configure-windows | 22 - .../files/esy-build | 24 - .../files/esy-configure | 29 - .../package.json | 28 - .../files/findlib-1.8.1.patch | 471 ------- .../files/gen-findlib-conf.sh | 14 - .../files/gen-meta.sh | 7 - .../package.json | 47 - js.esy.lock/index.json | 1151 +++-------------- js.esy.lock/opam/angstrom.0.14.1/opam | 32 - js.esy.lock/opam/base64.3.4.0/opam | 38 - js.esy.lock/opam/bigarray-compat.1.0.0/opam | 23 - js.esy.lock/opam/bigstringaf.0.6.1/opam | 43 - js.esy.lock/opam/charInfo_width.1.1.0/opam | 10 +- js.esy.lock/opam/conf-autoconf.0.1/opam | 30 - js.esy.lock/opam/dune-build-info.2.6.2/opam | 40 - js.esy.lock/opam/dune-build-info.2.7.0/opam | 41 + js.esy.lock/opam/dune-configurator.2.6.2/opam | 43 - js.esy.lock/opam/dune-configurator.2.7.0/opam | 44 + js.esy.lock/opam/dune-private-libs.2.6.2/opam | 42 - js.esy.lock/opam/dune.2.6.2/opam | 55 - js.esy.lock/opam/dune.2.7.0/opam | 55 + js.esy.lock/opam/faraday-lwt-unix.0.7.1/opam | 24 - js.esy.lock/opam/faraday-lwt.0.7.1/opam | 23 - js.esy.lock/opam/faraday.0.7.1/opam | 30 - js.esy.lock/opam/hpack.0.2.0/opam | 32 - js.esy.lock/opam/magic-mime.1.1.2/opam | 41 - ...Don-t-build-manpages-for-stdlib-docs.patch | 24 - ...1-Fix-failure-to-install-tools-links.patch | 26 - .../files/fix-gcc10.patch | 34 - .../ocaml-secondary-compiler.4.08.1-1/opam | 51 - .../opam/ocaml-syntax-shims.1.0.0/opam | 39 - .../ocamlfind-secondary.1.8.1/files/META.in | 3 - .../files/ocaml-secondary-compiler.conf.in | 10 - .../opam/ocamlfind-secondary.1.8.1/opam | 32 - js.esy.lock/opam/stringext.1.6.0/opam | 32 - js.esy.lock/opam/uri.3.1.0/opam | 35 - .../package.json | 6 - .../package.json | 34 - .../package.json | 31 + .../files/clone-flexdll | 16 - .../files/configure-windows | 22 - .../files/esy-build | 24 - .../files/esy-configure | 29 - .../package.json | 28 - .../files/findlib-1.8.1.patch | 471 ------- .../files/gen-findlib-conf.sh | 14 - .../files/gen-meta.sh | 7 - .../package.json | 47 - package.json | 1 - src/IO/Image.re | 158 ++- src/IO/Image.rei | 2 +- src/IO/dune | 2 +- src/SVG/Parser.re | 10 +- src/UI_Components/Markdown.re | 2 +- src/UI_Primitives/Image.re | 12 +- src/UI_Primitives/Image.rei | 2 +- test.esy.lock/index.json | 1116 +++------------- test.esy.lock/opam/angstrom.0.14.1/opam | 32 - test.esy.lock/opam/base64.3.4.0/opam | 38 - test.esy.lock/opam/bigarray-compat.1.0.0/opam | 23 - test.esy.lock/opam/bigstringaf.0.6.1/opam | 43 - test.esy.lock/opam/charInfo_width.1.1.0/opam | 10 +- test.esy.lock/opam/conf-autoconf.0.1/opam | 30 - test.esy.lock/opam/dune-build-info.2.6.2/opam | 40 - test.esy.lock/opam/dune-build-info.2.7.0/opam | 41 + .../opam/dune-configurator.2.6.2/opam | 43 - .../opam/dune-configurator.2.7.0/opam | 44 + .../opam/dune-private-libs.2.6.2/opam | 42 - test.esy.lock/opam/dune.2.6.2/opam | 55 - test.esy.lock/opam/dune.2.7.0/opam | 55 + .../opam/faraday-lwt-unix.0.7.1/opam | 24 - test.esy.lock/opam/faraday-lwt.0.7.1/opam | 23 - test.esy.lock/opam/faraday.0.7.1/opam | 30 - test.esy.lock/opam/hpack.0.2.0/opam | 32 - test.esy.lock/opam/magic-mime.1.1.2/opam | 41 - ...Don-t-build-manpages-for-stdlib-docs.patch | 24 - ...1-Fix-failure-to-install-tools-links.patch | 26 - .../files/fix-gcc10.patch | 34 - .../ocaml-secondary-compiler.4.08.1-1/opam | 51 - .../opam/ocaml-syntax-shims.1.0.0/opam | 39 - .../ocamlfind-secondary.1.8.1/files/META.in | 3 - .../files/ocaml-secondary-compiler.conf.in | 10 - .../opam/ocamlfind-secondary.1.8.1/opam | 32 - test.esy.lock/opam/stringext.1.6.0/opam | 32 - test.esy.lock/opam/uri.3.1.0/opam | 35 - .../package.json | 6 - .../package.json | 34 - .../package.json | 31 + .../files/clone-flexdll | 16 - .../files/configure-windows | 22 - .../files/esy-build | 24 - .../files/esy-configure | 29 - .../package.json | 28 - .../files/findlib-1.8.1.patch | 471 ------- .../files/gen-findlib-conf.sh | 14 - .../files/gen-meta.sh | 7 - .../package.json | 47 - 238 files changed, 1605 insertions(+), 14072 deletions(-) delete mode 100644 bench.esy.lock/opam/angstrom.0.14.1/opam delete mode 100644 bench.esy.lock/opam/base64.3.4.0/opam delete mode 100644 bench.esy.lock/opam/bigarray-compat.1.0.0/opam delete mode 100644 bench.esy.lock/opam/bigstringaf.0.6.1/opam delete mode 100644 bench.esy.lock/opam/conf-autoconf.0.1/opam rename {esy.lock/opam/dune-build-info.2.6.2 => bench.esy.lock/opam/dune-build-info.2.7.0}/opam (71%) rename {doc.esy.lock/opam/dune-configurator.2.6.2 => bench.esy.lock/opam/dune-configurator.2.7.0}/opam (69%) delete mode 100644 bench.esy.lock/opam/dune-private-libs.2.6.2/opam rename {esy.lock/opam/dune.2.6.2 => bench.esy.lock/opam/dune.2.7.0}/opam (83%) delete mode 100644 bench.esy.lock/opam/faraday-lwt-unix.0.7.1/opam delete mode 100644 bench.esy.lock/opam/faraday-lwt.0.7.1/opam delete mode 100644 bench.esy.lock/opam/faraday.0.7.1/opam delete mode 100644 bench.esy.lock/opam/hpack.0.2.0/opam delete mode 100644 bench.esy.lock/opam/magic-mime.1.1.2/opam delete mode 100644 bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch delete mode 100644 bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch delete mode 100644 bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch delete mode 100644 bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam delete mode 100644 bench.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam delete mode 100644 bench.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in delete mode 100644 bench.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in delete mode 100644 bench.esy.lock/opam/ocamlfind-secondary.1.8.1/opam delete mode 100644 bench.esy.lock/opam/stringext.1.6.0/opam delete mode 100644 bench.esy.lock/opam/uri.3.1.0/opam delete mode 100644 bench.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json rename {doc.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override => bench.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override}/package.json (94%) delete mode 100755 bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll delete mode 100755 bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows delete mode 100755 bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build delete mode 100755 bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure delete mode 100644 bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json delete mode 100644 bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch delete mode 100644 bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh delete mode 100644 bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-meta.sh delete mode 100644 bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/package.json delete mode 100644 doc.esy.lock/opam/angstrom.0.14.1/opam delete mode 100644 doc.esy.lock/opam/base64.3.4.0/opam delete mode 100644 doc.esy.lock/opam/bigarray-compat.1.0.0/opam delete mode 100644 doc.esy.lock/opam/bigstringaf.0.6.1/opam delete mode 100644 doc.esy.lock/opam/conf-autoconf.0.1/opam rename doc.esy.lock/opam/{dune-build-info.2.6.2 => dune-build-info.2.7.0}/opam (71%) rename {esy.lock/opam/dune-configurator.2.6.2 => doc.esy.lock/opam/dune-configurator.2.7.0}/opam (69%) delete mode 100644 doc.esy.lock/opam/dune-private-libs.2.6.2/opam rename {examples.esy.lock/opam/dune.2.6.2 => doc.esy.lock/opam/dune.2.7.0}/opam (83%) delete mode 100644 doc.esy.lock/opam/faraday-lwt-unix.0.7.1/opam delete mode 100644 doc.esy.lock/opam/faraday-lwt.0.7.1/opam delete mode 100644 doc.esy.lock/opam/faraday.0.7.1/opam delete mode 100644 doc.esy.lock/opam/hpack.0.1.0/opam delete mode 100644 doc.esy.lock/opam/magic-mime.1.1.2/opam delete mode 100644 doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch delete mode 100644 doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch delete mode 100644 doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch delete mode 100644 doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam delete mode 100644 doc.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam delete mode 100644 doc.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in delete mode 100644 doc.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in delete mode 100644 doc.esy.lock/opam/ocamlfind-secondary.1.8.1/opam delete mode 100644 doc.esy.lock/opam/stringext.1.6.0/opam delete mode 100644 doc.esy.lock/opam/uri.3.1.0/opam delete mode 100644 doc.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json rename {bench.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override => doc.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override}/package.json (94%) delete mode 100755 doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll delete mode 100755 doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows delete mode 100755 doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build delete mode 100755 doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure delete mode 100644 doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json delete mode 100644 doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch delete mode 100644 doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh delete mode 100644 doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-meta.sh delete mode 100644 doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/package.json delete mode 100644 esy.lock/opam/angstrom.0.14.1/opam delete mode 100644 esy.lock/opam/base64.3.4.0/opam delete mode 100644 esy.lock/opam/bigarray-compat.1.0.0/opam delete mode 100644 esy.lock/opam/bigstringaf.0.6.1/opam delete mode 100644 esy.lock/opam/conf-autoconf.0.1/opam rename {examples.esy.lock/opam/dune-build-info.2.6.2 => esy.lock/opam/dune-build-info.2.7.0}/opam (71%) rename {examples.esy.lock/opam/dune-configurator.2.6.2 => esy.lock/opam/dune-configurator.2.7.0}/opam (69%) delete mode 100644 esy.lock/opam/dune-private-libs.2.6.2/opam rename {doc.esy.lock/opam/dune.2.6.2 => esy.lock/opam/dune.2.7.0}/opam (83%) delete mode 100644 esy.lock/opam/faraday-lwt-unix.0.7.1/opam delete mode 100644 esy.lock/opam/faraday-lwt.0.7.1/opam delete mode 100644 esy.lock/opam/faraday.0.7.1/opam delete mode 100644 esy.lock/opam/hpack.0.2.0/opam delete mode 100644 esy.lock/opam/magic-mime.1.1.2/opam delete mode 100644 esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch delete mode 100644 esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch delete mode 100644 esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch delete mode 100644 esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam delete mode 100644 esy.lock/opam/ocaml-syntax-shims.1.0.0/opam delete mode 100644 esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in delete mode 100644 esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in delete mode 100644 esy.lock/opam/ocamlfind-secondary.1.8.1/opam delete mode 100644 esy.lock/opam/stringext.1.6.0/opam delete mode 100644 esy.lock/opam/uri.3.1.0/opam delete mode 100644 esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json rename esy.lock/overrides/{opam__s__dune_opam__c__2.6.2_opam_override => opam__s__dune_opam__c__2.7.0_opam_override}/package.json (94%) delete mode 100755 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll delete mode 100755 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows delete mode 100755 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build delete mode 100755 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure delete mode 100644 esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-meta.sh delete mode 100644 esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/package.json delete mode 100644 examples.esy.lock/opam/angstrom.0.14.1/opam delete mode 100644 examples.esy.lock/opam/base64.3.4.0/opam delete mode 100644 examples.esy.lock/opam/bigarray-compat.1.0.0/opam delete mode 100644 examples.esy.lock/opam/bigstringaf.0.6.1/opam delete mode 100644 examples.esy.lock/opam/conf-autoconf.0.1/opam rename {bench.esy.lock/opam/dune-build-info.2.6.2 => examples.esy.lock/opam/dune-build-info.2.7.0}/opam (71%) rename {bench.esy.lock/opam/dune-configurator.2.6.2 => examples.esy.lock/opam/dune-configurator.2.7.0}/opam (69%) delete mode 100644 examples.esy.lock/opam/dune-private-libs.2.6.2/opam rename {bench.esy.lock/opam/dune.2.6.2 => examples.esy.lock/opam/dune.2.7.0}/opam (83%) delete mode 100644 examples.esy.lock/opam/faraday-lwt-unix.0.7.1/opam delete mode 100644 examples.esy.lock/opam/faraday-lwt.0.7.1/opam delete mode 100644 examples.esy.lock/opam/faraday.0.7.1/opam delete mode 100644 examples.esy.lock/opam/hpack.0.2.0/opam delete mode 100644 examples.esy.lock/opam/magic-mime.1.1.2/opam delete mode 100644 examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch delete mode 100644 examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch delete mode 100644 examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch delete mode 100644 examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam delete mode 100644 examples.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam delete mode 100644 examples.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in delete mode 100644 examples.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in delete mode 100644 examples.esy.lock/opam/ocamlfind-secondary.1.8.1/opam delete mode 100644 examples.esy.lock/opam/stringext.1.6.0/opam delete mode 100644 examples.esy.lock/opam/uri.3.1.0/opam delete mode 100644 examples.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json rename examples.esy.lock/overrides/{opam__s__dune_opam__c__2.6.2_opam_override => opam__s__dune_opam__c__2.7.0_opam_override}/package.json (94%) delete mode 100755 examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll delete mode 100755 examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows delete mode 100755 examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build delete mode 100755 examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure delete mode 100644 examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json delete mode 100644 examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch delete mode 100644 examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh delete mode 100644 examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-meta.sh delete mode 100644 examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/package.json delete mode 100644 js.esy.lock/opam/angstrom.0.14.1/opam delete mode 100644 js.esy.lock/opam/base64.3.4.0/opam delete mode 100644 js.esy.lock/opam/bigarray-compat.1.0.0/opam delete mode 100644 js.esy.lock/opam/bigstringaf.0.6.1/opam delete mode 100644 js.esy.lock/opam/conf-autoconf.0.1/opam delete mode 100644 js.esy.lock/opam/dune-build-info.2.6.2/opam create mode 100644 js.esy.lock/opam/dune-build-info.2.7.0/opam delete mode 100644 js.esy.lock/opam/dune-configurator.2.6.2/opam create mode 100644 js.esy.lock/opam/dune-configurator.2.7.0/opam delete mode 100644 js.esy.lock/opam/dune-private-libs.2.6.2/opam delete mode 100644 js.esy.lock/opam/dune.2.6.2/opam create mode 100644 js.esy.lock/opam/dune.2.7.0/opam delete mode 100644 js.esy.lock/opam/faraday-lwt-unix.0.7.1/opam delete mode 100644 js.esy.lock/opam/faraday-lwt.0.7.1/opam delete mode 100644 js.esy.lock/opam/faraday.0.7.1/opam delete mode 100644 js.esy.lock/opam/hpack.0.2.0/opam delete mode 100644 js.esy.lock/opam/magic-mime.1.1.2/opam delete mode 100644 js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch delete mode 100644 js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch delete mode 100644 js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch delete mode 100644 js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam delete mode 100644 js.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam delete mode 100644 js.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in delete mode 100644 js.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in delete mode 100644 js.esy.lock/opam/ocamlfind-secondary.1.8.1/opam delete mode 100644 js.esy.lock/opam/stringext.1.6.0/opam delete mode 100644 js.esy.lock/opam/uri.3.1.0/opam delete mode 100644 js.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json delete mode 100644 js.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json create mode 100644 js.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json delete mode 100755 js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll delete mode 100755 js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows delete mode 100755 js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build delete mode 100755 js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure delete mode 100644 js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json delete mode 100644 js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch delete mode 100644 js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh delete mode 100644 js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-meta.sh delete mode 100644 js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/package.json delete mode 100644 test.esy.lock/opam/angstrom.0.14.1/opam delete mode 100644 test.esy.lock/opam/base64.3.4.0/opam delete mode 100644 test.esy.lock/opam/bigarray-compat.1.0.0/opam delete mode 100644 test.esy.lock/opam/bigstringaf.0.6.1/opam delete mode 100644 test.esy.lock/opam/conf-autoconf.0.1/opam delete mode 100644 test.esy.lock/opam/dune-build-info.2.6.2/opam create mode 100644 test.esy.lock/opam/dune-build-info.2.7.0/opam delete mode 100644 test.esy.lock/opam/dune-configurator.2.6.2/opam create mode 100644 test.esy.lock/opam/dune-configurator.2.7.0/opam delete mode 100644 test.esy.lock/opam/dune-private-libs.2.6.2/opam delete mode 100644 test.esy.lock/opam/dune.2.6.2/opam create mode 100644 test.esy.lock/opam/dune.2.7.0/opam delete mode 100644 test.esy.lock/opam/faraday-lwt-unix.0.7.1/opam delete mode 100644 test.esy.lock/opam/faraday-lwt.0.7.1/opam delete mode 100644 test.esy.lock/opam/faraday.0.7.1/opam delete mode 100644 test.esy.lock/opam/hpack.0.2.0/opam delete mode 100644 test.esy.lock/opam/magic-mime.1.1.2/opam delete mode 100644 test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch delete mode 100644 test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch delete mode 100644 test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch delete mode 100644 test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam delete mode 100644 test.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam delete mode 100644 test.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in delete mode 100644 test.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in delete mode 100644 test.esy.lock/opam/ocamlfind-secondary.1.8.1/opam delete mode 100644 test.esy.lock/opam/stringext.1.6.0/opam delete mode 100644 test.esy.lock/opam/uri.3.1.0/opam delete mode 100644 test.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json delete mode 100644 test.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json create mode 100644 test.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json delete mode 100755 test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll delete mode 100755 test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows delete mode 100755 test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build delete mode 100755 test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure delete mode 100644 test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json delete mode 100644 test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch delete mode 100644 test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh delete mode 100644 test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-meta.sh delete mode 100644 test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/package.json diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json index 197d1cf9b..b68b1209c 100644 --- a/bench.esy.lock/index.json +++ b/bench.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "0e96ed3895946187e4242107c3900a3b", + "checksum": "e7c18524128d2f65d226dccaa3bf0a59", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -32,7 +32,7 @@ "reperf@1.5.0@d41d8cd9", "rench@1.9.1@d41d8cd9", "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", - "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", + "flex@1.2.3@d41d8cd9", "esy-skia@github:revery-ui/esy-skia#a3785f9@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-freetype2@2.9.1008@d41d8cd9", "esy-angle-prebuilt@1.0.0@d41d8cd9", @@ -44,12 +44,12 @@ "@opam/markup@opam:0.8.2@87975241", "@opam/lwt_ppx@opam:2.0.1@e6a764a0", "@opam/lwt@opam:4.5.0@677655b4", "@opam/lru@github:bryphe/lru:lru.opam#2708c70@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/ctypes@opam:0.15.1@b0227b2f", - "@opam/charInfo_width@opam:1.1.0@b400bb29", + "@opam/charInfo_width@opam:1.1.0@4296bdfe", "@opam/bos@opam:0.2.0@df49e63f", "@glennsl/timber@1.2.0@d41d8cd9", - "@esy-ocaml/reason@3.6.0@d41d8cd9", + "@esy-ocaml/reason@3.6.2@d41d8cd9", "@brisk/brisk-reconciler@github:briskml/brisk-reconciler#10cab2d@d41d8cd9" ], "devDependencies": [ @@ -72,8 +72,8 @@ "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/printbox@opam:0.5@82f5d436", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/printbox@opam:0.5@82f5d436", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -93,8 +93,8 @@ "@reason-native/console@0.1.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", "@opam/lambda-term@opam:3.1.0@8adc2660", - "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -112,9 +112,9 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", "@reason-native/console@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/atdgen@opam:2.2.1@d73fda11", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -128,8 +128,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -145,8 +145,8 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, @@ -176,43 +176,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" - ], - "devDependencies": [] - }, - "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9": { - "id": "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "name": "fetch-native-lwt", - "version": "0.1.0-alpha.5", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/fetch-native-lwt/-/fetch-native-lwt-0.1.0-alpha.5.tgz#sha1:5a0a40149d5d10e233361bb40c42304f538090aa" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "fetch-core@0.1.0-alpha.5@d41d8cd9", - "@reason-native-web/piaf@1.4.0@d41d8cd9", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/reason@3.6.0@d41d8cd9" - ], - "devDependencies": [] - }, - "fetch-core@0.1.0-alpha.5@d41d8cd9": { - "id": "fetch-core@0.1.0-alpha.5@d41d8cd9", - "name": "fetch-core", - "version": "0.1.0-alpha.5", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/fetch-core/-/fetch-core-0.1.0-alpha.5.tgz#sha1:71a2420796743056f3efba8da19a540cc910db95" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -274,22 +239,6 @@ ], "devDependencies": [] }, - "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9": { - "id": - "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9", - "name": "esy-help2man", - "version": - "github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443", - "source": { - "type": "install", - "source": [ - "github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443" - ] - }, - "overrides": [], - "dependencies": [], - "devDependencies": [] - }, "esy-freetype2@2.9.1008@d41d8cd9": { "id": "esy-freetype2@2.9.1008@d41d8cd9", "name": "esy-freetype2", @@ -318,20 +267,6 @@ "dependencies": [], "devDependencies": [] }, - "esy-autoconf@github:esy-packages/esy-autoconf#fb93edf@d41d8cd9": { - "id": "esy-autoconf@github:esy-packages/esy-autoconf#fb93edf@d41d8cd9", - "name": "esy-autoconf", - "version": "github:esy-packages/esy-autoconf#fb93edf", - "source": { - "type": "install", - "source": [ "github:esy-packages/esy-autoconf#fb93edf" ] - }, - "overrides": [], - "dependencies": [ - "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9" - ], - "devDependencies": [] - }, "esy-astyle@github:zbaylin/esy-astyle#59bc21a@d41d8cd9": { "id": "esy-astyle@github:zbaylin/esy-astyle#59bc21a@d41d8cd9", "name": "esy-astyle", @@ -402,7 +337,7 @@ "@reason-native/file-context-printer@0.0.3@d41d8cd9", "@reason-native/cli@0.0.1-alpha@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.2@0b7bd730", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -418,8 +353,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -436,8 +371,8 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -453,8 +388,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -471,266 +406,8 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" - ], - "devDependencies": [] - }, - "@reason-native-web/ssl@0.5.9007@d41d8cd9": { - "id": "@reason-native-web/ssl@0.5.9007@d41d8cd9", - "name": "@reason-native-web/ssl", - "version": "0.5.9007", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/ssl/-/ssl-0.5.9007.tgz#sha1:2eceef610fb593f10605dbde0cbcec153bf7b744" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/esy-openssl@1.1.1006@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/conf-pkg-config@opam:1.2@d86c8f53", - "@opam/base-unix@opam:base@87d0b2eb" - ], - "devDependencies": [] - }, - "@reason-native-web/piaf@1.4.0@d41d8cd9": { - "id": "@reason-native-web/piaf@1.4.0@d41d8cd9", - "name": "@reason-native-web/piaf", - "version": "1.4.0", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/piaf/-/piaf-1.4.0.tgz#sha1:da2d1a07b553989e032f51986873c4bdff936ed5" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/lwt_ssl@1.1.3005@d41d8cd9", - "@reason-native-web/h2-lwt-unix@0.6.1002@d41d8cd9", - "@reason-native-web/h1-lwt-unix@1.2.2001@d41d8cd9", - "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/uri@opam:3.1.0@826aaae7", - "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", - "@opam/magic-mime@opam:1.1.2@980f82fb", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/logs@opam:0.7.0@1d03143e", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1" - ], - "devDependencies": [] - }, - "@reason-native-web/lwt_ssl@1.1.3005@d41d8cd9": { - "id": "@reason-native-web/lwt_ssl@1.1.3005@d41d8cd9", - "name": "@reason-native-web/lwt_ssl", - "version": "1.1.3005", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/lwt_ssl/-/lwt_ssl-1.1.3005.tgz#sha1:6ac76e006175e3b320b8a1c690f50cebb5699050" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/ssl@0.5.9007@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-unix@opam:base@87d0b2eb" - ], - "devDependencies": [] - }, - "@reason-native-web/h2-lwt-unix@0.6.1002@d41d8cd9": { - "id": "@reason-native-web/h2-lwt-unix@0.6.1002@d41d8cd9", - "name": "@reason-native-web/h2-lwt-unix", - "version": "0.6.1002", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h2-lwt-unix/-/h2-lwt-unix-0.6.1002.tgz#sha1:9bf1998a7a62ddfc712d22cf04a045cfc2017d8e" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/h2-lwt@0.6.1002@d41d8cd9", - "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", - "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/h2-lwt@0.6.1002@d41d8cd9": { - "id": "@reason-native-web/h2-lwt@0.6.1002@d41d8cd9", - "name": "@reason-native-web/h2-lwt", - "version": "0.6.1002", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h2-lwt/-/h2-lwt-0.6.1002.tgz#sha1:ab32c96ef1d5eabe0685b30c2edfc296cb63d5a8" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/h2@0.6.1002@d41d8cd9", - "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/h2@0.6.1002@d41d8cd9": { - "id": "@reason-native-web/h2@0.6.1002@d41d8cd9", - "name": "@reason-native-web/h2", - "version": "0.6.1002", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h2/-/h2-0.6.1002.tgz#sha1:6918f1df7d74b3880c78c5a94b9e644de8fa7ecc" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/h1@1.2.2001@d41d8cd9", - "@opam/psq@opam:0.2.0@247756d4", "@opam/hpack@opam:0.2.0@9f3eae78", - "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "@opam/base64@opam:3.4.0@f5b9ad9b", - "@opam/angstrom@opam:0.14.1@07e286b0" - ], - "devDependencies": [] - }, - "@reason-native-web/h1-lwt-unix@1.2.2001@d41d8cd9": { - "id": "@reason-native-web/h1-lwt-unix@1.2.2001@d41d8cd9", - "name": "@reason-native-web/h1-lwt-unix", - "version": "1.2.2001", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h1-lwt-unix/-/h1-lwt-unix-1.2.2001.tgz#sha1:29866964b38f357664ebf48af7ee2d4b32db0d4f" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/h1-lwt@1.2.2001@d41d8cd9", - "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", - "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/h1-lwt@1.2.2001@d41d8cd9": { - "id": "@reason-native-web/h1-lwt@1.2.2001@d41d8cd9", - "name": "@reason-native-web/h1-lwt", - "version": "1.2.2001", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h1-lwt/-/h1-lwt-1.2.2001.tgz#sha1:fae16630d9e002e5ba12cd67c88258a26171bca6" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/h1@1.2.2001@d41d8cd9", - "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/h1@1.2.2001@d41d8cd9": { - "id": "@reason-native-web/h1@1.2.2001@d41d8cd9", - "name": "@reason-native-web/h1", - "version": "1.2.2001", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h1/-/h1-1.2.2001.tgz#sha1:48ff58f10bbcc2931742b951dcbd6c821e2da0f5" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "@opam/angstrom@opam:0.14.1@07e286b0" - ], - "devDependencies": [] - }, - "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9": { - "id": "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "name": "@reason-native-web/gluten-lwt-unix", - "version": "0.2.1", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/gluten-lwt-unix/-/gluten-lwt-unix-0.2.1.tgz#sha1:e661685c6c72ef38b48318279ed16434824563f9" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/lwt_ssl@1.1.3005@d41d8cd9", - "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", - "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9": { - "id": "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9", - "name": "@reason-native-web/gluten-lwt", - "version": "0.2.1", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/gluten-lwt/-/gluten-lwt-0.2.1.tgz#sha1:0d35a7de4abd2b55e4afc57d902c9f36a4d6e3e4" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/gluten@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/gluten@0.2.1@d41d8cd9": { - "id": "@reason-native-web/gluten@0.2.1@d41d8cd9", - "name": "@reason-native-web/gluten", - "version": "0.2.1", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/gluten/-/gluten-0.2.1.tgz#sha1:cbc732d5d238f845c54d466bb5da7380feb66b72" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/h1@1.2.2001@d41d8cd9", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1" - ], - "devDependencies": [] - }, - "@reason-native-web/esy-openssl@1.1.1006@d41d8cd9": { - "id": "@reason-native-web/esy-openssl@1.1.1006@d41d8cd9", - "name": "@reason-native-web/esy-openssl", - "version": "1.1.1006", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/esy-openssl/-/esy-openssl-1.1.1006.tgz#sha1:4154a9b17d9ebdc1c983a3075513b5cd276873ac" - ] - }, - "overrides": [], - "dependencies": [ - "@opam/conf-pkg-config@opam:1.2@d86c8f53", - "@opam/conf-autoconf@opam:0.1@27b3f7cf" + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -753,16 +430,16 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/charInfo_width@opam:1.1.0@b400bb29", + "@opam/dune@opam:2.7.0@50e8f3e0", + "@opam/charInfo_width@opam:1.1.0@4296bdfe", "@opam/camomile@opam:1.0.2@40411a6b", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/charInfo_width@opam:1.1.0@b400bb29", + "@opam/dune@opam:2.7.0@50e8f3e0", + "@opam/charInfo_width@opam:1.1.0@4296bdfe", "@opam/camomile@opam:1.0.2@40411a6b", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -786,13 +463,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/biniou@opam:1.2.1@d7570399" + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -849,33 +526,6 @@ ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, - "@opam/uri@opam:3.1.0@826aaae7": { - "id": "@opam/uri@opam:3.1.0@826aaae7", - "name": "@opam/uri", - "version": "opam:3.1.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c4/c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43#sha256:c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43", - "archive:https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz#sha256:c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" - ], - "opam": { - "name": "uri", - "version": "3.1.0", - "path": "bench.esy.lock/opam/uri.3.1.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/stringext@opam:1.6.0@104bc94b", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/stringext@opam:1.6.0@104bc94b", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, "@opam/uchar@opam:0.0.2@c8218eea": { "id": "@opam/uchar@opam:0.0.2@c8218eea", "name": "@opam/uchar", @@ -919,12 +569,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/trie@opam:1.0.0@d2efc587": { @@ -945,11 +595,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/topkg@opam:1.0.2@3c5942ad": { @@ -978,33 +628,6 @@ "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, - "@opam/stringext@opam:1.6.0@104bc94b": { - "id": "@opam/stringext@opam:1.6.0@104bc94b", - "name": "@opam/stringext", - "version": "opam:1.6.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/db/db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea", - "archive:https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" - ], - "opam": { - "name": "stringext", - "version": "1.6.0", - "path": "bench.esy.lock/opam/stringext.1.6.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-bytes@opam:base@19d0c2ff", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-bytes@opam:base@19d0c2ff" - ] - }, "@opam/stdlib-shims@opam:0.1.0@8c116481": { "id": "@opam/stdlib-shims@opam:0.1.0@8c116481", "name": "@opam/stdlib-shims", @@ -1023,11 +646,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/stdio@opam:v0.14.0@a624e254": { @@ -1048,12 +671,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.14.0@b8817fc1", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.14.0@b8817fc1" ] }, @@ -1075,11 +698,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -1147,11 +770,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/react@opam:1.2.1@0e11855f": { @@ -1198,11 +821,11 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ptime@opam:0.8.5@0051d642": { @@ -1252,11 +875,11 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/printbox@opam:0.5@82f5d436": { @@ -1279,12 +902,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/tyxml@opam:4.4.0@1dca5713", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -1311,7 +934,7 @@ "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481", @@ -1319,7 +942,7 @@ "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppxfind@opam:1.4@d75848d2": { @@ -1342,12 +965,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": { @@ -1369,11 +992,11 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414": { @@ -1396,12 +1019,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_tools@opam:6.2@62a3aff2": { @@ -1422,11 +1045,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_optcomp@opam:v0.14.0@d77a04c2": { @@ -1449,13 +1072,13 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254", "@opam/ppxlib@opam:0.15.0@6a9d8126", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/base@opam:v0.14.0@b8817fc1", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.14.0@b8817fc1", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254", "@opam/ppxlib@opam:0.15.0@6a9d8126", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/base@opam:v0.14.0@b8817fc1" + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.14.0@b8817fc1" ] }, "@opam/ppx_deriving@opam:4.5@d89f2934": { @@ -1481,7 +1104,7 @@ "@opam/ppx_tools@opam:6.2@62a3aff2", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -1489,7 +1112,7 @@ "@opam/ppx_tools@opam:6.2@62a3aff2", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -1510,11 +1133,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/omd@github:ocaml/omd:omd.opam#1535e3c@d41d8cd9": { @@ -1527,7 +1150,7 @@ }, "overrides": [], "dependencies": [ - "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1556,49 +1179,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-bytes@opam:base@19d0c2ff" ] }, - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2": { - "id": "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "name": "@opam/ocamlfind-secondary", - "version": "opam:1.8.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/18/18ca650982c15536616dea0e422cbd8c#md5:18ca650982c15536616dea0e422cbd8c", - "archive:http://download2.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c", - "archive:http://download.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c" - ], - "opam": { - "name": "ocamlfind-secondary", - "version": "1.8.1", - "path": "bench.esy.lock/opam/ocamlfind-secondary.1.8.1" - } - }, - "overrides": [ - { - "opamoverride": - "bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override" - } - ], - "dependencies": [ - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f" - ] - }, "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { "id": "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "name": "@opam/ocamlfind", @@ -1655,58 +1245,6 @@ ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, - "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa": { - "id": "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", - "name": "@opam/ocaml-syntax-shims", - "version": "opam:1.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/89/89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8#sha256:89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8", - "archive:https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz#sha256:89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" - ], - "opam": { - "name": "ocaml-syntax-shims", - "version": "1.0.0", - "path": "bench.esy.lock/opam/ocaml-syntax-shims.1.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f": { - "id": "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", - "name": "@opam/ocaml-secondary-compiler", - "version": "opam:4.08.1-1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/72/723b6bfe8cf5abcbccc6911143f71055#md5:723b6bfe8cf5abcbccc6911143f71055", - "archive:https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz#md5:723b6bfe8cf5abcbccc6911143f71055" - ], - "opam": { - "name": "ocaml-secondary-compiler", - "version": "4.08.1-1", - "path": "bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1" - } - }, - "overrides": [ - { - "opamoverride": - "bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override" - } - ], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] - }, "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47": { "id": "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "name": "@opam/ocaml-migrate-parsetree", @@ -1727,12 +1265,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6@d41d8cd9": { @@ -1754,8 +1292,8 @@ "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/menhir@opam:20200624@8629ff13", - "@opam/dune-build-info@opam:2.6.2@03ffe168", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-build-info@opam:2.7.0@a5897ded", + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", @@ -1763,8 +1301,8 @@ "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/menhir@opam:20200624@8629ff13", - "@opam/dune-build-info@opam:2.6.2@03ffe168", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune-build-info@opam:2.7.0@a5897ded", + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d": { @@ -1785,11 +1323,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/mmap@opam:1.1.0@b85334ff": { @@ -1810,11 +1348,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/mew_vi@opam:0.5.0@cf66c299": { @@ -1836,12 +1374,12 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/mew@opam:0.1.0@a74f69d6": { @@ -1863,12 +1401,12 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/trie@opam:1.0.0@d2efc587", - "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/trie@opam:1.0.0@d2efc587", - "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/merlin-extend@opam:0.6@404f814c": { @@ -1889,11 +1427,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/menhirSdk@opam:20200624@2a05b5a7": { @@ -1914,11 +1452,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/menhirLib@opam:20200624@8bdd2b0e": { @@ -1939,11 +1477,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/menhir@opam:20200624@8629ff13": { @@ -1966,12 +1504,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", "@opam/menhirLib@opam:20200624@8bdd2b0e", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", "@opam/menhirLib@opam:20200624@8bdd2b0e", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/markup@opam:0.8.2@87975241": { @@ -1993,37 +1531,12 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/magic-mime@opam:1.1.2@980f82fb": { - "id": "@opam/magic-mime@opam:1.1.2@980f82fb", - "name": "@opam/magic-mime", - "version": "opam:1.1.2", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/0c/0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb#sha256:0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb", - "archive:https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz#sha256:0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" - ], - "opam": { - "name": "magic-mime", - "version": "1.1.2", - "path": "bench.esy.lock/opam/magic-mime.1.1.2" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lwt_react@opam:1.1.3@72987fcf": { @@ -2045,12 +1558,12 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lwt_ppx@opam:2.0.1@e6a764a0": { @@ -2074,14 +1587,14 @@ "ocaml@4.10.0@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lwt_log@opam:1.1.1@2d7a797f": { @@ -2102,11 +1615,11 @@ }, "overrides": [], "dependencies": [ - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lwt@opam:4.5.0@677655b4": { @@ -2131,8 +1644,8 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -2142,8 +1655,8 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lru@github:bryphe/lru:lru.opam#2708c70@d41d8cd9": { @@ -2157,7 +1670,7 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4" @@ -2213,7 +1726,7 @@ "@opam/mew_vi@opam:0.5.0@cf66c299", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/camomile@opam:1.0.2@40411a6b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -2223,7 +1736,7 @@ "@opam/mew_vi@opam:0.5.0@cf66c299", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/camomile@opam:1.0.2@40411a6b" ] }, @@ -2246,11 +1759,11 @@ "overrides": [], "dependencies": [ "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/integers@opam:0.4.0@f7acfaeb": { @@ -2271,40 +1784,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/hpack@opam:0.2.0@9f3eae78": { - "id": "@opam/hpack@opam:0.2.0@9f3eae78", - "name": "@opam/hpack", - "version": "opam:0.2.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/c8/c883927ce8a9f3f7159ef7b20988f051#md5:c883927ce8a9f3f7159ef7b20988f051", - "archive:https://github.com/anmonteiro/ocaml-h2/releases/download/0.2.0/h2-0.2.0.tbz#md5:c883927ce8a9f3f7159ef7b20988f051" - ], - "opam": { - "name": "hpack", - "version": "0.2.0", - "path": "bench.esy.lock/opam/hpack.0.2.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/angstrom@opam:0.14.1@07e286b0", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/angstrom@opam:0.14.1@07e286b0" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/fpath@opam:0.7.2@45477b93": { @@ -2386,96 +1870,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/faraday-lwt-unix@opam:0.7.1@4854f547": { - "id": "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", - "name": "@opam/faraday-lwt-unix", - "version": "opam:0.7.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", - "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" - ], - "opam": { - "name": "faraday-lwt-unix", - "version": "0.7.1", - "path": "bench.esy.lock/opam/faraday-lwt-unix.0.7.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt@opam:0.7.1@e28c97d1", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt@opam:0.7.1@e28c97d1", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-unix@opam:base@87d0b2eb" - ] - }, - "@opam/faraday-lwt@opam:0.7.1@e28c97d1": { - "id": "@opam/faraday-lwt@opam:0.7.1@e28c97d1", - "name": "@opam/faraday-lwt", - "version": "opam:0.7.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", - "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" - ], - "opam": { - "name": "faraday-lwt", - "version": "0.7.1", - "path": "bench.esy.lock/opam/faraday-lwt.0.7.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday@opam:0.7.1@19546ee5", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/faraday@opam:0.7.1@19546ee5": { - "id": "@opam/faraday@opam:0.7.1@19546ee5", - "name": "@opam/faraday", - "version": "opam:0.7.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", - "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" - ], - "opam": { - "name": "faraday", - "version": "0.7.1", - "path": "bench.esy.lock/opam/faraday.0.7.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -2496,119 +1895,89 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f": { - "id": "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f", - "name": "@opam/dune-private-libs", - "version": "opam:2.6.2", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - ], - "opam": { - "name": "dune-private-libs", - "version": "2.6.2", - "path": "bench.esy.lock/opam/dune-private-libs.2.6.2" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, - "@opam/dune-configurator@opam:2.6.2@a8db4839": { - "id": "@opam/dune-configurator@opam:2.6.2@a8db4839", + "@opam/dune-configurator@opam:2.7.0@bd860a0f": { + "id": "@opam/dune-configurator@opam:2.7.0@bd860a0f", "name": "@opam/dune-configurator", - "version": "opam:2.6.2", + "version": "opam:2.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" + "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15", + "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" ], "opam": { "name": "dune-configurator", - "version": "2.6.2", - "path": "bench.esy.lock/opam/dune-configurator.2.6.2" + "version": "2.7.0", + "path": "bench.esy.lock/opam/dune-configurator.2.7.0" } }, "overrides": [], "dependencies": [ - "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f", - "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, - "@opam/dune-build-info@opam:2.6.2@03ffe168": { - "id": "@opam/dune-build-info@opam:2.6.2@03ffe168", + "@opam/dune-build-info@opam:2.7.0@a5897ded": { + "id": "@opam/dune-build-info@opam:2.7.0@a5897ded", "name": "@opam/dune-build-info", - "version": "opam:2.6.2", + "version": "opam:2.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" + "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15", + "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" ], "opam": { "name": "dune-build-info", - "version": "2.6.2", - "path": "bench.esy.lock/opam/dune-build-info.2.6.2" + "version": "2.7.0", + "path": "bench.esy.lock/opam/dune-build-info.2.7.0" } }, "overrides": [], "dependencies": [ - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:2.6.2@20433b4f" ] + "devDependencies": [ "@opam/dune@opam:2.7.0@50e8f3e0" ] }, - "@opam/dune@opam:2.6.2@20433b4f": { - "id": "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0": { + "id": "@opam/dune@opam:2.7.0@50e8f3e0", "name": "@opam/dune", - "version": "opam:2.6.2", + "version": "opam:2.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" + "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15", + "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" ], "opam": { "name": "dune", - "version": "2.6.2", - "path": "bench.esy.lock/opam/dune.2.6.2" + "version": "2.7.0", + "path": "bench.esy.lock/opam/dune.2.7.0" } }, "overrides": [ { "opamoverride": - "bench.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override" + "bench.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override" } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, @@ -2664,12 +2033,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -2715,40 +2084,15 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/conf-autoconf@opam:0.1@27b3f7cf": { - "id": "@opam/conf-autoconf@opam:0.1@27b3f7cf", - "name": "@opam/conf-autoconf", - "version": "opam:0.1", - "source": { - "type": "install", - "source": [ "no-source:" ], - "opam": { - "name": "conf-autoconf", - "version": "0.1", - "path": "bench.esy.lock/opam/conf-autoconf.0.1" - } - }, - "overrides": [ - { - "opamoverride": - "bench.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override" - } - ], - "dependencies": [ - "esy-autoconf@github:esy-packages/esy-autoconf#fb93edf@d41d8cd9", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [] - }, - "@opam/charInfo_width@opam:1.1.0@b400bb29": { - "id": "@opam/charInfo_width@opam:1.1.0@b400bb29", + "@opam/charInfo_width@opam:1.1.0@4296bdfe": { + "id": "@opam/charInfo_width@opam:1.1.0@4296bdfe", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c4/c4ab038e06f06a29692c05fdd7c268c5#md5:c4ab038e06f06a29692c05fdd7c268c5", - "archive:https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz#md5:c4ab038e06f06a29692c05fdd7c268c5" + "archive:https://opam.ocaml.org/cache/md5/a5/a539436d1da4aeb93711303f107bec7e#md5:a539436d1da4aeb93711303f107bec7e", + "archive:https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz#md5:a539436d1da4aeb93711303f107bec7e" ], "opam": { "name": "charInfo_width", @@ -2759,13 +2103,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/camomile@opam:1.0.2@40411a6b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/camomile@opam:1.0.2@40411a6b" ] }, @@ -2787,11 +2131,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/bos@opam:0.2.0@df49e63f": { @@ -2849,94 +2193,11 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/bigstringaf@opam:0.6.1@35f5e6d1": { - "id": "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "name": "@opam/bigstringaf", - "version": "opam:0.6.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/dc/dccf639273b1eec0e0f142f21319268d#md5:dccf639273b1eec0e0f142f21319268d", - "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz#md5:dccf639273b1eec0e0f142f21319268d" - ], - "opam": { - "name": "bigstringaf", - "version": "0.6.1", - "path": "bench.esy.lock/opam/bigstringaf.0.6.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigarray-compat@opam:1.0.0@1faefa97", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigarray-compat@opam:1.0.0@1faefa97" - ] - }, - "@opam/bigarray-compat@opam:1.0.0@1faefa97": { - "id": "@opam/bigarray-compat@opam:1.0.0@1faefa97", - "name": "@opam/bigarray-compat", - "version": "opam:1.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/1c/1cc7c25382a8900bada34aadfd66632e#md5:1cc7c25382a8900bada34aadfd66632e", - "archive:https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz#md5:1cc7c25382a8900bada34aadfd66632e" - ], - "opam": { - "name": "bigarray-compat", - "version": "1.0.0", - "path": "bench.esy.lock/opam/bigarray-compat.1.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/base64@opam:3.4.0@f5b9ad9b": { - "id": "@opam/base64@opam:3.4.0@f5b9ad9b", - "name": "@opam/base64", - "version": "opam:3.4.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/1c/1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634#sha256:1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634", - "archive:https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz#sha256:1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" - ], - "opam": { - "name": "base64", - "version": "3.4.0", - "path": "bench.esy.lock/opam/base64.3.4.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-bytes@opam:base@19d0c2ff", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-bytes@opam:base@19d0c2ff" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -3031,13 +2292,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/atdgen-runtime@opam:2.2.1@6a3a6395": { @@ -3059,13 +2320,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399" ] }, @@ -3088,13 +2349,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/biniou@opam:1.2.1@d7570399", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "@opam/atd@opam:2.2.1@071ab6bd", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/biniou@opam:1.2.1@d7570399", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "@opam/atd@opam:2.2.1@071ab6bd" ] @@ -3120,13 +2381,13 @@ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/astring@opam:0.8.5@1300cee8": { @@ -3154,35 +2415,6 @@ ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, - "@opam/angstrom@opam:0.14.1@07e286b0": { - "id": "@opam/angstrom@opam:0.14.1@07e286b0", - "name": "@opam/angstrom", - "version": "opam:0.14.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/91/915bbcc1adbd0debc1b0a54531c7601a#md5:915bbcc1adbd0debc1b0a54531c7601a", - "archive:https://github.com/inhabitedtype/angstrom/archive/0.14.1.tar.gz#md5:915bbcc1adbd0debc1b0a54531c7601a" - ], - "opam": { - "name": "angstrom", - "version": "0.14.1", - "path": "bench.esy.lock/opam/angstrom.0.14.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1" - ] - }, "@glennsl/timber@1.2.0@d41d8cd9": { "id": "@glennsl/timber@1.2.0@d41d8cd9", "name": "@glennsl/timber", @@ -3197,7 +2429,7 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/logs@opam:0.7.0@1d03143e", "@opam/fmt@opam:0.8.8@01c3a23c", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -3215,24 +2447,24 @@ "dependencies": [], "devDependencies": [] }, - "@esy-ocaml/reason@3.6.0@d41d8cd9": { - "id": "@esy-ocaml/reason@3.6.0@d41d8cd9", + "@esy-ocaml/reason@3.6.2@d41d8cd9": { + "id": "@esy-ocaml/reason@3.6.2@d41d8cd9", "name": "@esy-ocaml/reason", - "version": "3.6.0", + "version": "3.6.2", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#sha1:ae98f3335e9e03ff0e01376830a14cd1246b5278" + "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#sha1:49bd53c75dd241eb14f46277a85af353908f7e81" ] }, "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.6@404f814c", "@opam/menhir@opam:20200624@8629ff13", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.7.0@50e8f3e0" ], "devDependencies": [] }, @@ -3262,7 +2494,7 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] } diff --git a/bench.esy.lock/opam/angstrom.0.14.1/opam b/bench.esy.lock/opam/angstrom.0.14.1/opam deleted file mode 100644 index 8ccc7d997..000000000 --- a/bench.esy.lock/opam/angstrom.0.14.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/angstrom" -bug-reports: "https://github.com/inhabitedtype/angstrom/issues" -dev-repo: "git+https://github.com/inhabitedtype/angstrom.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.8.1"} - "bigstringaf" - "result" -] -synopsis: "Parser combinators built for speed and memory-efficiency" -description: """ -Angstrom is a parser-combinator library that makes it easy to write efficient, -expressive, and reusable parsers suitable for high-performance applications. It -exposes monadic and applicative interfaces for composition, and supports -incremental input through buffered and unbuffered interfaces. Both interfaces -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.14.1.tar.gz" - checksum: "md5=915bbcc1adbd0debc1b0a54531c7601a" -} diff --git a/bench.esy.lock/opam/base64.3.4.0/opam b/bench.esy.lock/opam/base64.3.4.0/opam deleted file mode 100644 index b4869cdfa..000000000 --- a/bench.esy.lock/opam/base64.3.4.0/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "mirageos-devel@lists.xenproject.org" -authors: [ "Thomas Gazagnaire" - "Anil Madhavapeddy" "Calascibetta Romain" - "Peter Zotov" ] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-base64" -doc: "http://mirage.github.io/ocaml-base64/" -bug-reports: "https://github.com/mirage/ocaml-base64/issues" -dev-repo: "git+https://github.com/mirage/ocaml-base64.git" -synopsis: "Base64 encoding for OCaml" -description: """ -Base64 is a group of similar binary-to-text encoding schemes that represent -binary data in an ASCII string format by translating it into a radix-64 -representation. It is specified in RFC 4648. -""" -depends: [ - "ocaml" {>="4.03.0"} - "base-bytes" - "dune-configurator" - "dune" {>= "2.0"} - "bos" {with-test} - "rresult" {with-test} - "alcotest" {with-test} -] -build: [ - ["dune" "subst"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz" - checksum: [ - "sha256=1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" - "sha512=e66a67302a9eb136044bebf66a89a1d6e38a96c70622bb6cd27916fec36dcaf4b5b7e7d00c25608f0a2363f2ca4264a5fe765fe7747590958325dbce06311db9" - ] -} diff --git a/bench.esy.lock/opam/bigarray-compat.1.0.0/opam b/bench.esy.lock/opam/bigarray-compat.1.0.0/opam deleted file mode 100644 index 93751514d..000000000 --- a/bench.esy.lock/opam/bigarray-compat.1.0.0/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -synopsis: "Compatibility library to use Stdlib.Bigarray when possible" -maintainer: "Lucas Pluvinage " -authors: "Lucas Pluvinage " -license: "ISC" -homepage: "https://github.com/mirage/bigarray-compat" -bug-reports: "https://github.com/mirage/bigarray-compat/issues" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" {>= "1.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -dev-repo: "git+https://github.com/mirage/bigarray-compat.git" -url { - src: "https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz" - checksum: [ - "md5=1cc7c25382a8900bada34aadfd66632e" - "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f" - ] -} \ No newline at end of file diff --git a/bench.esy.lock/opam/bigstringaf.0.6.1/opam b/bench.esy.lock/opam/bigstringaf.0.6.1/opam deleted file mode 100644 index b821673a0..000000000 --- a/bench.esy.lock/opam/bigstringaf.0.6.1/opam +++ /dev/null @@ -1,43 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/bigstringaf" -bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues" -dev-repo: "git+https://github.com/inhabitedtype/bigstringaf.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "dune" {>= "1.0"} - "alcotest" {with-test} - "bigarray-compat" - "ocaml" {>= "4.03.0"} -] -depopts: [ - "mirage-xen-posix" - "ocaml-freestanding" -] -conflicts: [ - "mirage-xen-posix" {< "3.1.0"} - "ocaml-freestanding" {< "0.4.1"} - "js_of_ocaml" {< "3.5.0"} -] -synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove" -description: """ -Bigstring intrinsics and fast blits based on memcpy/memmove - -The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not -widely-known, sometimes misused, and so programs that use Bigstrings are slower -than they have to be. And even if a library got that part right and exposed the -intrinsics properly, the compiler doesn't have any fast blits between -Bigstrings and other string-like types. - -So here they are. Go crazy. -""" -url { - src: "https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz" - checksum: "md5=dccf639273b1eec0e0f142f21319268d" -} diff --git a/bench.esy.lock/opam/charInfo_width.1.1.0/opam b/bench.esy.lock/opam/charInfo_width.1.1.0/opam index dee626092..c88c2c9d4 100644 --- a/bench.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/bench.esy.lock/opam/charInfo_width.1.1.0/opam @@ -1,10 +1,10 @@ opam-version: "2.0" maintainer: "zandoye@gmail.com" authors: [ "ZAN DoYe" ] -homepage: "https://bitbucket.org/zandoye/charinfo_width/" -bug-reports: "https://bitbucket.org/zandoye/charinfo_width/issues" +homepage: "https://github.com/kandu/charinfo_width/" +bug-reports: "https://github.com/kandu/charinfo_width/issues" license: "MIT" -dev-repo: "hg+https://bitbucket.org/zandoye/charinfo_width" +dev-repo: "git://github.com/kandu/charinfo_width.git" build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test & (ocaml:version >= "4.04.0")} @@ -22,6 +22,6 @@ description: """ This module is implemented purely in OCaml and the width function follows the prototype of POSIX's wcwidth.""" url { - src:"https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz" - checksum: "md5=c4ab038e06f06a29692c05fdd7c268c5" + src:"https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz" + checksum: "md5=a539436d1da4aeb93711303f107bec7e" } diff --git a/bench.esy.lock/opam/conf-autoconf.0.1/opam b/bench.esy.lock/opam/conf-autoconf.0.1/opam deleted file mode 100644 index a538223d0..000000000 --- a/bench.esy.lock/opam/conf-autoconf.0.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "unixjunkie@sdf.org" -homepage: "http://www.gnu.org/software/autoconf" -authors: "https://www.gnu.org/software/autoconf/autoconf.html#maintainer" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -license: "GPL-3.0" -build: [ - ["which" "autoconf"] -] -depends: ["conf-which" {build}] -depexts: [ - ["autoconf"] {os-family = "debian"} - ["autoconf"] {os-distribution = "centos"} - ["autoconf"] {os-distribution = "fedora"} - ["autoconf"] {os-distribution = "arch"} - ["sys-devel/autoconf"] {os-distribution = "gentoo"} - ["autoconf"] {os-distribution = "nixos"} - ["autoconf"] {os = "macos" & os-distribution = "homebrew"} - ["devel/autoconf"] {os = "openbsd"} - ["autoconf"] {os = "freebsd"} - ["autoconf"] {os = "netbsd"} - ["autoconf"] {os-distribution = "alpine"} - ["autoconf"] {os-distribution = "ol"} - ["autoconf"] {os-distribution = "rhel"} -] -synopsis: "Virtual package relying on autoconf installation" -description: """ -This package can only install if the autoconf command -is available on the system.""" -flags: conf diff --git a/esy.lock/opam/dune-build-info.2.6.2/opam b/bench.esy.lock/opam/dune-build-info.2.7.0/opam similarity index 71% rename from esy.lock/opam/dune-build-info.2.6.2/opam rename to bench.esy.lock/opam/dune-build-info.2.7.0/opam index a0dfa6442..ea2f6aa11 100644 --- a/esy.lock/opam/dune-build-info.2.6.2/opam +++ b/bench.esy.lock/opam/dune-build-info.2.7.0/opam @@ -15,11 +15,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.5"} + "dune" {>= "2.7"} + "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -32,9 +33,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/doc.esy.lock/opam/dune-configurator.2.6.2/opam b/bench.esy.lock/opam/dune-configurator.2.7.0/opam similarity index 69% rename from doc.esy.lock/opam/dune-configurator.2.6.2/opam rename to bench.esy.lock/opam/dune-configurator.2.7.0/opam index 9ae7729b7..a247cb8d8 100644 --- a/doc.esy.lock/opam/dune-configurator.2.6.2/opam +++ b/bench.esy.lock/opam/dune-configurator.2.7.0/opam @@ -17,12 +17,13 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.6"} - "dune-private-libs" {= version} + "ocaml" {>= "4.03.0"} + "dune" {>= "2.7" & >= "2.6.0"} + "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -35,9 +36,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/bench.esy.lock/opam/dune-private-libs.2.6.2/opam b/bench.esy.lock/opam/dune-private-libs.2.6.2/opam deleted file mode 100644 index f62a0a2fe..000000000 --- a/bench.esy.lock/opam/dune-private-libs.2.6.2/opam +++ /dev/null @@ -1,42 +0,0 @@ -opam-version: "2.0" -synopsis: "Private libraries of Dune" -description: """ -!!!!!!!!!!!!!!!!!!!!!! -!!!!! DO NOT USE !!!!! -!!!!!!!!!!!!!!!!!!!!!! - -This package contains code that is shared between various dune-xxx -packages. However, it is not meant for public consumption and provides -no stability guarantee. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.5"} - "ocaml" {>= "4.07"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/esy.lock/opam/dune.2.6.2/opam b/bench.esy.lock/opam/dune.2.7.0/opam similarity index 83% rename from esy.lock/opam/dune.2.6.2/opam rename to bench.esy.lock/opam/dune.2.7.0/opam index 655fb0111..c4b160031 100644 --- a/esy.lock/opam/dune.2.6.2/opam +++ b/bench.esy.lock/opam/dune.2.7.0/opam @@ -42,14 +42,14 @@ build: [ depends: [ # Please keep the lower bound in sync with .travis.yml, dune-project # and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/bench.esy.lock/opam/faraday-lwt-unix.0.7.1/opam b/bench.esy.lock/opam/faraday-lwt-unix.0.7.1/opam deleted file mode 100644 index 3cc8377eb..000000000 --- a/bench.esy.lock/opam/faraday-lwt-unix.0.7.1/opam +++ /dev/null @@ -1,24 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday-lwt" - "lwt" {>= "2.7.0"} - "base-unix" -] -synopsis: "Lwt_unix support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/bench.esy.lock/opam/faraday-lwt.0.7.1/opam b/bench.esy.lock/opam/faraday-lwt.0.7.1/opam deleted file mode 100644 index 4e68d3097..000000000 --- a/bench.esy.lock/opam/faraday-lwt.0.7.1/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday" {>= "0.5.0"} - "lwt" -] -synopsis: "Lwt support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/bench.esy.lock/opam/faraday.0.7.1/opam b/bench.esy.lock/opam/faraday.0.7.1/opam deleted file mode 100644 index a20e6942e..000000000 --- a/bench.esy.lock/opam/faraday.0.7.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.4.1"} - "bigstringaf" -] -synopsis: "A library for writing fast and memory-efficient serializers." -description: """ -Faraday is a library for writing fast and memory-efficient serializers. Its -core type and related operation gives the user fine-grained control over -copying and allocation behavior while serializing user-defined types, and -presents the output in a form that makes it possible to use vectorized write -operations, such as the writev system call, or any other platform or -application-specific output APIs.""" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/bench.esy.lock/opam/hpack.0.2.0/opam b/bench.esy.lock/opam/hpack.0.2.0/opam deleted file mode 100644 index b09cf7cbe..000000000 --- a/bench.esy.lock/opam/hpack.0.2.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "Antonio Nuno Monteiro " -authors: [ "Pieter Goetschalckx <3.14.e.ter@gmail.com>" - "Antonio Nuno Monteiro " ] -license: "BSD-3-Clause" -homepage: "https://github.com/anmonteiro/ocaml-h2" -bug-reports: "https://github.com/anmonteiro/ocaml-h2/issues" -dev-repo: "git+https://github.com/anmonteiro/ocaml-h2.git" -doc: "https://anmonteiro.github.io/ocaml-h2/" -depends: [ - "ocaml" {>= "4.04"} - "dune" - "yojson" {with-test} - "hex" {with-test} - "angstrom" - "faraday" -] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -synopsis: - "An HPACK (Header Compression for HTTP/2) implementation in OCaml" -description: """ -hpack is an implementation of the HPACK: Header Compression for HTTP/2 -specification (RFC7541) written in OCaml. It uses Angstrom and Faraday for -parsing and serialization, respectively. -""" -url { - src: - "https://github.com/anmonteiro/ocaml-h2/releases/download/0.2.0/h2-0.2.0.tbz" - checksum: "md5=c883927ce8a9f3f7159ef7b20988f051" -} diff --git a/bench.esy.lock/opam/magic-mime.1.1.2/opam b/bench.esy.lock/opam/magic-mime.1.1.2/opam deleted file mode 100644 index 8e398fb3e..000000000 --- a/bench.esy.lock/opam/magic-mime.1.1.2/opam +++ /dev/null @@ -1,41 +0,0 @@ -opam-version: "2.0" -name: "magic-mime" -synopsis: "Map filenames to common MIME types" -description: """ -This library contains a database of MIME types that maps filename extensions -into MIME types suitable for use in many Internet protocols such as HTTP or -e-mail. It is generated from the `mime.types` file found in Unix systems, but -has no dependency on a filesystem since it includes the contents of the -database as an ML datastructure. - -For example, here's how to lookup MIME types in the [utop] REPL: - - #require "magic-mime";; - Magic_mime.lookup "/foo/bar.txt";; - - : bytes = "text/plain" - Magic_mime.lookup "bar.css";; - - : bytes = "text/css" -""" -maintainer: "Anil Madhavapeddy " -authors: ["Anil Madhavapeddy" "Maxence Guesdon"] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-magic-mime" -doc: "https://mirage.github.io/ocaml-magic-mime/" -bug-reports: "https://github.com/mirage/ocaml-magic-mime/issues" -dev-repo: "git+https://github.com/mirage/ocaml-magic-mime.git" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: - "https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz" - checksum: [ - "sha256=0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" - "sha512=8264db78adc2c75b8adabc23c26ad34eab98383bd3a8f2068f2236ff3425d653c0238fbd7361e55a3d70d843413ef8671b6e97293074b4d3a1e300628d5292ab" - ] -} diff --git a/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch deleted file mode 100644 index cda19dd2d..000000000 --- a/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Fri, 26 Jul 2019 12:12:19 +0100 -Subject: [PATCH] Don't build manpages for stdlib docs ---- - ocamldoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index b109815071..e31e441f61 100644 ---- a/ocamldoc/Makefile -+++ b/ocamldoc/Makefile -@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) - - - .PHONY: all --all: lib exe generators manpages -+all: lib exe generators - - manpages: generators - --- -2.20.1 - diff --git a/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch deleted file mode 100644 index 41f5f7704..000000000 --- a/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Tue, 6 Aug 2019 09:23:06 +0100 -Subject: [PATCH] Fix failure to install tools links - -In --disable-installing-bytecode-programs mode, the .opt version of the -tools is installed, but the symlink for the tool itself is not created. ---- - tools/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/Makefile b/tools/Makefile -index 530dd37f34..1b3014a3ab 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -197,6 +197,7 @@ else - do \ - if test -f "$$i".opt; then \ - $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ -+ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ - fi; \ - done - endif --- -2.20.1 - diff --git a/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch deleted file mode 100644 index e37b5e883..000000000 --- a/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3f10a16153308f967149917585d2bc0b9c06492c -Author: Anil Madhavapeddy -Date: Sun Jun 21 18:40:27 2020 +0100 - - Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build - - Signed-off-by: Anil Madhavapeddy - -diff --git a/configure b/configure -index 9a78a4554..0c54b560b 100755 ---- a/configure -+++ b/configure -@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( - gcc-*) : -- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings" ;; #( - msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" -diff --git a/configure.ac b/configure.ac -index f5d8a2687..775e0e2db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -540,7 +540,7 @@ AS_CASE([$host], - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings"], - [gcc-*], -- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings"], - [msvc-*], - [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam deleted file mode 100644 index 905f9b3dd..000000000 --- a/bench.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam +++ /dev/null @@ -1,51 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml 4.08.1 Secondary Switch Compiler" -maintainer: "platform@lists.ocaml.org" -authors: "Xavier Leroy and many contributors" -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml/ocaml/issues" -dev-repo: "git://github.com/ocaml/ocaml" -depends: "ocaml" {< "4.08.0" | >= "4.09~"} -build: [ - [ - "./configure" - "--prefix=%{_:share}%" - "--libdir=%{_:share}%/lib" - "--disable-debugger" - "--disable-installing-bytecode-programs" - "--disable-debug-runtime" - "--disable-instrumented-runtime" - "--disable-graph-lib" - "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} - "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} - ] - [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] -] -install: [make "install"] -url { - src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" - checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" -} -extra-files: [ - ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] - ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] - ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] -] -patches: [ - "0001-Don-t-build-manpages-for-stdlib-docs.patch" - "0001-Fix-failure-to-install-tools-links.patch" - "fix-gcc10.patch" -] - -post-messages: [ - "A failure in the middle of the build may be caused by build parallelism - (enabled by default). - Please file a bug report at https://github.com/ocaml/ocaml/issues" - {failure & jobs > 1 & os != "cygwin"} - "You can try installing again including --jobs=1 - to force a sequential build instead." - {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} -] -description: "Installs an additional compiler to the opam switch in -%{_:share}%/ocaml-secondary-compiler which can be accessed using -`ocamlfind -toolchain secondary`." diff --git a/bench.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam b/bench.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam deleted file mode 100644 index a814e1d2d..000000000 --- a/bench.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "Backport new syntax to older OCaml versions" -description: """ -This packages backports new features of the language to older -compilers, such as let+. -""" -maintainer: ["jeremie@dimino.org"] -authors: ["Jérémie Dimino "] -license: "MIT" -homepage: "https://github.com/ocaml-ppx/ocaml-syntax-shims" -doc: "https://ocaml-ppx.github.io/ocaml-syntax-shims/" -bug-reports: "https://github.com/ocaml-ppx/ocaml-syntax-shims/issues" -depends: [ - "dune" {>= "2.0"} - "ocaml" {>= "4.02.3"} -] -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-syntax-shims.git" -url { - src: - "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz" - checksum: [ - "sha256=89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" - "sha512=75c4c6b0bfa1267a8a49a82ba494d08cf0823fc8350863d6d3d4971528cb09e5a2a29e2981d04c75e76ad0f49360b05a432c9efeff9a4fbc1ec6b28960399852" - ] -} diff --git a/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in deleted file mode 100644 index 12e3ee661..000000000 --- a/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in +++ /dev/null @@ -1,3 +0,0 @@ -description = "OCaml Secondary Compiler" -version = "%{ocaml-secondary-compiler:version}%" -directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in deleted file mode 100644 index d13023c9f..000000000 --- a/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" -ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" -ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" -ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" -ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" -ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" -ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/opam deleted file mode 100644 index acdb57645..000000000 --- a/bench.esy.lock/opam/ocamlfind-secondary.1.8.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "David Allsopp " -homepage: "https://github.com/ocaml/opam-repository" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] -install: [ - [make "install-meta"] - ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] - ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] - ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] - ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] -] -depends: [ - "ocaml-secondary-compiler" - "ocamlfind" {= "1.8.1"} -] -synopsis: "ocamlfind support for ocaml-secondary-compiler" -description: """ -Exposes the compiler built by the ocaml-secondary-compielr package via --toolchain secondary. A virtual package called ocaml is also installed to -locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" -authors: ["Gerd Stolpmann " "David Allsopp "] -substs: ["META" "ocaml-secondary-compiler.conf"] -extra-files: [ - ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] - ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] -] -url { - src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" - checksum: "md5=18ca650982c15536616dea0e422cbd8c" - mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" -} diff --git a/bench.esy.lock/opam/stringext.1.6.0/opam b/bench.esy.lock/opam/stringext.1.6.0/opam deleted file mode 100644 index 5242fe31a..000000000 --- a/bench.esy.lock/opam/stringext.1.6.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "rudi.grinberg@gmail.com" -authors: "Rudi Grinberg" -license: "MIT" -homepage: "https://github.com/rgrinberg/stringext" -bug-reports: "https://github.com/rgrinberg/stringext/issues" -depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "1.0"} - "ounit" {with-test} - "qtest" {with-test & >= "2.2"} - "base-bytes" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -dev-repo: "git+https://github.com/rgrinberg/stringext.git" -synopsis: "Extra string functions for OCaml" -description: """ -Extra string functions for OCaml. Mainly splitting. All functions are in the -Stringext module. -""" -url { - src: - "https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz" - checksum: [ - "sha256=db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" - "sha512=d8ebe40f42b598a9bd99f1ef4b00ba93458385a4accd121af66a0bf3b3f8d7135f576740adf1a43081dd409977c2219fd4bdbb5b3d1308890d301d553ed49900" - ] -} diff --git a/bench.esy.lock/opam/uri.3.1.0/opam b/bench.esy.lock/opam/uri.3.1.0/opam deleted file mode 100644 index 45406b00a..000000000 --- a/bench.esy.lock/opam/uri.3.1.0/opam +++ /dev/null @@ -1,35 +0,0 @@ -opam-version: "2.0" -maintainer: "anil@recoil.org" -authors: ["Anil Madhavapeddy" "David Sheets" "Rudi Grinberg"] -license: "ISC" -tags: ["url" "uri" "org:mirage" "org:xapi-project"] -homepage: "https://github.com/mirage/ocaml-uri" -bug-reports: "https://github.com/mirage/ocaml-uri/issues" -dev-repo: "git+https://github.com/mirage/ocaml-uri.git" -doc: "https://mirage.github.io/ocaml-uri/" -synopsis: "An RFC3986 URI/URL parsing library" -description: """ -This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification -for parsing URI or URLs. -""" -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.2.0"} - "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} - "re" {>= "1.9.0"} - "stringext" {>= "1.4.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz" - checksum: [ - "sha256=c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" - "sha512=c015576bb077fd243022bcd8804e628d23a253dcd8bbdda8dc2a57e86cfeb9fd629087ec7d7e23dc71dd7cd137450ca2c5ecf8fb7d184ec9d1d4e41f6f83ee38" - ] -} diff --git a/bench.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json b/bench.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json deleted file mode 100644 index 312f6e01c..000000000 --- a/bench.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build": [ "true" ], - "dependencies": { - "esy-autoconf": "esy-packages/esy-autoconf#fb93edf" - } -} diff --git a/doc.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json b/bench.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json similarity index 94% rename from doc.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json rename to bench.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json index f2b2e9f48..affde1bc3 100644 --- a/doc.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json +++ b/bench.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json @@ -27,8 +27,5 @@ "buildEnv": { "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" - }, - "dependencies": { - "ocaml": "*" } } diff --git a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll deleted file mode 100755 index 26301ddd3..000000000 --- a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -# clone-flexdll -# -# Brings in flexdll, if necessary - -if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then - echo "[Flexdll] Already present, no need to clone." -else - echo "[Flexdll] Cloning..." - git clone https://github.com/esy-ocaml/flexdll.git - cd flexdll - git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff - cd .. - echo "[Flexdll] Clone successful!" -fi \ No newline at end of file diff --git a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows deleted file mode 100755 index 4040b49ea..000000000 --- a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -# configure-windows -# -# Creates a native Windows MingW build, based on: -# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc - - -export prefix=C:/ocamlmgw64 -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - esac - shift -done - -echo "[configure-windows] Setting up flexdll" -./clone-flexdll -./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix -make flexdll diff --git a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build deleted file mode 100755 index b95356a53..000000000 --- a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build +++ /dev/null @@ -1,24 +0,0 @@ -#! /usr/bin/env bash - -# esy-build -# -# Wrapper to execute appropriate build strategy, based on platform - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-build] Detected windows environment..." - make -j4 world.opt - make flexlink.opt - ;; - *) - echo "[esy-build] Detected OSX / Linux environment" - make -j4 world.opt - ;; -esac - -# Common build steps -make install \ No newline at end of file diff --git a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure deleted file mode 100755 index fd196c517..000000000 --- a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure +++ /dev/null @@ -1,29 +0,0 @@ -#! /usr/bin/env bash - -# esy-configure -# -# Wrapper to delegate to configuration to the -# appropriate `configure` strategy based on the active platform. -# -# Today, OCaml has separate build strategies: -# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc -# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc -# -# We want `esy` to work cross-platform, so this is a shim script that will delegate to the -# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` -# that the `mingw` (native executable) strategy is desired. - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-configure] Detected windows environment..." - ./configure-windows "$@" - ;; - *) - echo "[esy-configure] Detected OSX / Linux environment" - ./configure "$@" - ;; -esac \ No newline at end of file diff --git a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json deleted file mode 100644 index 948455caf..000000000 --- a/bench.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "buildEnv": { - "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - }, - "build": [ - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-configure", - "--disable-cfi", - "--prefix", "$cur__install/share/ocaml-secondary-compiler", - "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", - "--disable-debugger", - "--disable-installing-bytecode-programs", - "--disable-debug-runtime", - "--disable-instrumented-runtime", - "--disable-graph-lib" - ], - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-build" - ] - ], - "buildsInSource": true -} diff --git a/bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch deleted file mode 100644 index 3e3ee5a24..000000000 --- a/bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml diff --git a/bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh deleted file mode 100644 index c923ef49e..000000000 --- a/bench.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh +++ /dev/null @@ -1,14 +0,0 @@ -OCAML_SECONDARY_COMPILER=$1 - -cat >ocaml-secondary-compiler.conf <META <" -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/angstrom" -bug-reports: "https://github.com/inhabitedtype/angstrom/issues" -dev-repo: "git+https://github.com/inhabitedtype/angstrom.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.8.1"} - "bigstringaf" - "result" -] -synopsis: "Parser combinators built for speed and memory-efficiency" -description: """ -Angstrom is a parser-combinator library that makes it easy to write efficient, -expressive, and reusable parsers suitable for high-performance applications. It -exposes monadic and applicative interfaces for composition, and supports -incremental input through buffered and unbuffered interfaces. Both interfaces -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.14.1.tar.gz" - checksum: "md5=915bbcc1adbd0debc1b0a54531c7601a" -} diff --git a/doc.esy.lock/opam/base64.3.4.0/opam b/doc.esy.lock/opam/base64.3.4.0/opam deleted file mode 100644 index b4869cdfa..000000000 --- a/doc.esy.lock/opam/base64.3.4.0/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "mirageos-devel@lists.xenproject.org" -authors: [ "Thomas Gazagnaire" - "Anil Madhavapeddy" "Calascibetta Romain" - "Peter Zotov" ] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-base64" -doc: "http://mirage.github.io/ocaml-base64/" -bug-reports: "https://github.com/mirage/ocaml-base64/issues" -dev-repo: "git+https://github.com/mirage/ocaml-base64.git" -synopsis: "Base64 encoding for OCaml" -description: """ -Base64 is a group of similar binary-to-text encoding schemes that represent -binary data in an ASCII string format by translating it into a radix-64 -representation. It is specified in RFC 4648. -""" -depends: [ - "ocaml" {>="4.03.0"} - "base-bytes" - "dune-configurator" - "dune" {>= "2.0"} - "bos" {with-test} - "rresult" {with-test} - "alcotest" {with-test} -] -build: [ - ["dune" "subst"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz" - checksum: [ - "sha256=1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" - "sha512=e66a67302a9eb136044bebf66a89a1d6e38a96c70622bb6cd27916fec36dcaf4b5b7e7d00c25608f0a2363f2ca4264a5fe765fe7747590958325dbce06311db9" - ] -} diff --git a/doc.esy.lock/opam/bigarray-compat.1.0.0/opam b/doc.esy.lock/opam/bigarray-compat.1.0.0/opam deleted file mode 100644 index 93751514d..000000000 --- a/doc.esy.lock/opam/bigarray-compat.1.0.0/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -synopsis: "Compatibility library to use Stdlib.Bigarray when possible" -maintainer: "Lucas Pluvinage " -authors: "Lucas Pluvinage " -license: "ISC" -homepage: "https://github.com/mirage/bigarray-compat" -bug-reports: "https://github.com/mirage/bigarray-compat/issues" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" {>= "1.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -dev-repo: "git+https://github.com/mirage/bigarray-compat.git" -url { - src: "https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz" - checksum: [ - "md5=1cc7c25382a8900bada34aadfd66632e" - "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f" - ] -} \ No newline at end of file diff --git a/doc.esy.lock/opam/bigstringaf.0.6.1/opam b/doc.esy.lock/opam/bigstringaf.0.6.1/opam deleted file mode 100644 index b821673a0..000000000 --- a/doc.esy.lock/opam/bigstringaf.0.6.1/opam +++ /dev/null @@ -1,43 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/bigstringaf" -bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues" -dev-repo: "git+https://github.com/inhabitedtype/bigstringaf.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "dune" {>= "1.0"} - "alcotest" {with-test} - "bigarray-compat" - "ocaml" {>= "4.03.0"} -] -depopts: [ - "mirage-xen-posix" - "ocaml-freestanding" -] -conflicts: [ - "mirage-xen-posix" {< "3.1.0"} - "ocaml-freestanding" {< "0.4.1"} - "js_of_ocaml" {< "3.5.0"} -] -synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove" -description: """ -Bigstring intrinsics and fast blits based on memcpy/memmove - -The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not -widely-known, sometimes misused, and so programs that use Bigstrings are slower -than they have to be. And even if a library got that part right and exposed the -intrinsics properly, the compiler doesn't have any fast blits between -Bigstrings and other string-like types. - -So here they are. Go crazy. -""" -url { - src: "https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz" - checksum: "md5=dccf639273b1eec0e0f142f21319268d" -} diff --git a/doc.esy.lock/opam/charInfo_width.1.1.0/opam b/doc.esy.lock/opam/charInfo_width.1.1.0/opam index dee626092..c88c2c9d4 100644 --- a/doc.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/doc.esy.lock/opam/charInfo_width.1.1.0/opam @@ -1,10 +1,10 @@ opam-version: "2.0" maintainer: "zandoye@gmail.com" authors: [ "ZAN DoYe" ] -homepage: "https://bitbucket.org/zandoye/charinfo_width/" -bug-reports: "https://bitbucket.org/zandoye/charinfo_width/issues" +homepage: "https://github.com/kandu/charinfo_width/" +bug-reports: "https://github.com/kandu/charinfo_width/issues" license: "MIT" -dev-repo: "hg+https://bitbucket.org/zandoye/charinfo_width" +dev-repo: "git://github.com/kandu/charinfo_width.git" build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test & (ocaml:version >= "4.04.0")} @@ -22,6 +22,6 @@ description: """ This module is implemented purely in OCaml and the width function follows the prototype of POSIX's wcwidth.""" url { - src:"https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz" - checksum: "md5=c4ab038e06f06a29692c05fdd7c268c5" + src:"https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz" + checksum: "md5=a539436d1da4aeb93711303f107bec7e" } diff --git a/doc.esy.lock/opam/conf-autoconf.0.1/opam b/doc.esy.lock/opam/conf-autoconf.0.1/opam deleted file mode 100644 index a538223d0..000000000 --- a/doc.esy.lock/opam/conf-autoconf.0.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "unixjunkie@sdf.org" -homepage: "http://www.gnu.org/software/autoconf" -authors: "https://www.gnu.org/software/autoconf/autoconf.html#maintainer" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -license: "GPL-3.0" -build: [ - ["which" "autoconf"] -] -depends: ["conf-which" {build}] -depexts: [ - ["autoconf"] {os-family = "debian"} - ["autoconf"] {os-distribution = "centos"} - ["autoconf"] {os-distribution = "fedora"} - ["autoconf"] {os-distribution = "arch"} - ["sys-devel/autoconf"] {os-distribution = "gentoo"} - ["autoconf"] {os-distribution = "nixos"} - ["autoconf"] {os = "macos" & os-distribution = "homebrew"} - ["devel/autoconf"] {os = "openbsd"} - ["autoconf"] {os = "freebsd"} - ["autoconf"] {os = "netbsd"} - ["autoconf"] {os-distribution = "alpine"} - ["autoconf"] {os-distribution = "ol"} - ["autoconf"] {os-distribution = "rhel"} -] -synopsis: "Virtual package relying on autoconf installation" -description: """ -This package can only install if the autoconf command -is available on the system.""" -flags: conf diff --git a/doc.esy.lock/opam/dune-build-info.2.6.2/opam b/doc.esy.lock/opam/dune-build-info.2.7.0/opam similarity index 71% rename from doc.esy.lock/opam/dune-build-info.2.6.2/opam rename to doc.esy.lock/opam/dune-build-info.2.7.0/opam index a0dfa6442..ea2f6aa11 100644 --- a/doc.esy.lock/opam/dune-build-info.2.6.2/opam +++ b/doc.esy.lock/opam/dune-build-info.2.7.0/opam @@ -15,11 +15,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.5"} + "dune" {>= "2.7"} + "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -32,9 +33,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/esy.lock/opam/dune-configurator.2.6.2/opam b/doc.esy.lock/opam/dune-configurator.2.7.0/opam similarity index 69% rename from esy.lock/opam/dune-configurator.2.6.2/opam rename to doc.esy.lock/opam/dune-configurator.2.7.0/opam index 9ae7729b7..a247cb8d8 100644 --- a/esy.lock/opam/dune-configurator.2.6.2/opam +++ b/doc.esy.lock/opam/dune-configurator.2.7.0/opam @@ -17,12 +17,13 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.6"} - "dune-private-libs" {= version} + "ocaml" {>= "4.03.0"} + "dune" {>= "2.7" & >= "2.6.0"} + "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -35,9 +36,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/doc.esy.lock/opam/dune-private-libs.2.6.2/opam b/doc.esy.lock/opam/dune-private-libs.2.6.2/opam deleted file mode 100644 index f62a0a2fe..000000000 --- a/doc.esy.lock/opam/dune-private-libs.2.6.2/opam +++ /dev/null @@ -1,42 +0,0 @@ -opam-version: "2.0" -synopsis: "Private libraries of Dune" -description: """ -!!!!!!!!!!!!!!!!!!!!!! -!!!!! DO NOT USE !!!!! -!!!!!!!!!!!!!!!!!!!!!! - -This package contains code that is shared between various dune-xxx -packages. However, it is not meant for public consumption and provides -no stability guarantee. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.5"} - "ocaml" {>= "4.07"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/examples.esy.lock/opam/dune.2.6.2/opam b/doc.esy.lock/opam/dune.2.7.0/opam similarity index 83% rename from examples.esy.lock/opam/dune.2.6.2/opam rename to doc.esy.lock/opam/dune.2.7.0/opam index 655fb0111..c4b160031 100644 --- a/examples.esy.lock/opam/dune.2.6.2/opam +++ b/doc.esy.lock/opam/dune.2.7.0/opam @@ -42,14 +42,14 @@ build: [ depends: [ # Please keep the lower bound in sync with .travis.yml, dune-project # and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/doc.esy.lock/opam/faraday-lwt-unix.0.7.1/opam b/doc.esy.lock/opam/faraday-lwt-unix.0.7.1/opam deleted file mode 100644 index 3cc8377eb..000000000 --- a/doc.esy.lock/opam/faraday-lwt-unix.0.7.1/opam +++ /dev/null @@ -1,24 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday-lwt" - "lwt" {>= "2.7.0"} - "base-unix" -] -synopsis: "Lwt_unix support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/doc.esy.lock/opam/faraday-lwt.0.7.1/opam b/doc.esy.lock/opam/faraday-lwt.0.7.1/opam deleted file mode 100644 index 4e68d3097..000000000 --- a/doc.esy.lock/opam/faraday-lwt.0.7.1/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday" {>= "0.5.0"} - "lwt" -] -synopsis: "Lwt support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/doc.esy.lock/opam/faraday.0.7.1/opam b/doc.esy.lock/opam/faraday.0.7.1/opam deleted file mode 100644 index a20e6942e..000000000 --- a/doc.esy.lock/opam/faraday.0.7.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.4.1"} - "bigstringaf" -] -synopsis: "A library for writing fast and memory-efficient serializers." -description: """ -Faraday is a library for writing fast and memory-efficient serializers. Its -core type and related operation gives the user fine-grained control over -copying and allocation behavior while serializing user-defined types, and -presents the output in a form that makes it possible to use vectorized write -operations, such as the writev system call, or any other platform or -application-specific output APIs.""" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/doc.esy.lock/opam/hpack.0.1.0/opam b/doc.esy.lock/opam/hpack.0.1.0/opam deleted file mode 100644 index 5eba5d099..000000000 --- a/doc.esy.lock/opam/hpack.0.1.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "Antonio Nuno Monteiro " -authors: [ "Pieter Goetschalckx <3.14.e.ter@gmail.com>" - "Antonio Nuno Monteiro " ] -license: "MIT" -homepage: "https://github.com/anmonteiro/ocaml-h2" -bug-reports: "https://github.com/anmonteiro/ocaml-h2/issues" -dev-repo: "git+https://github.com/anmonteiro/ocaml-h2.git" -doc: "https://anmonteiro.github.io/ocaml-h2/" -depends: [ - "ocaml" {>= "4.04"} - "dune" - "yojson" {with-test} - "hex" {with-test} - "angstrom" - "faraday" -] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -synopsis: - "An HPACK (Header Compression for HTTP/2) implementation in OCaml" -description: """ -hpack is an implementation of the HPACK: Header Compression for HTTP/2 -specification (RFC7541) written in OCaml. It uses Angstrom and Faraday for -parsing and serialization, respectively. -""" -url { - src: - "https://github.com/anmonteiro/ocaml-h2/releases/download/0.1.0/h2-0.1.0.tbz" - checksum: "md5=dc12db1ec40d820c4fdab029e77567d1" -} diff --git a/doc.esy.lock/opam/magic-mime.1.1.2/opam b/doc.esy.lock/opam/magic-mime.1.1.2/opam deleted file mode 100644 index 8e398fb3e..000000000 --- a/doc.esy.lock/opam/magic-mime.1.1.2/opam +++ /dev/null @@ -1,41 +0,0 @@ -opam-version: "2.0" -name: "magic-mime" -synopsis: "Map filenames to common MIME types" -description: """ -This library contains a database of MIME types that maps filename extensions -into MIME types suitable for use in many Internet protocols such as HTTP or -e-mail. It is generated from the `mime.types` file found in Unix systems, but -has no dependency on a filesystem since it includes the contents of the -database as an ML datastructure. - -For example, here's how to lookup MIME types in the [utop] REPL: - - #require "magic-mime";; - Magic_mime.lookup "/foo/bar.txt";; - - : bytes = "text/plain" - Magic_mime.lookup "bar.css";; - - : bytes = "text/css" -""" -maintainer: "Anil Madhavapeddy " -authors: ["Anil Madhavapeddy" "Maxence Guesdon"] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-magic-mime" -doc: "https://mirage.github.io/ocaml-magic-mime/" -bug-reports: "https://github.com/mirage/ocaml-magic-mime/issues" -dev-repo: "git+https://github.com/mirage/ocaml-magic-mime.git" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: - "https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz" - checksum: [ - "sha256=0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" - "sha512=8264db78adc2c75b8adabc23c26ad34eab98383bd3a8f2068f2236ff3425d653c0238fbd7361e55a3d70d843413ef8671b6e97293074b4d3a1e300628d5292ab" - ] -} diff --git a/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch deleted file mode 100644 index cda19dd2d..000000000 --- a/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Fri, 26 Jul 2019 12:12:19 +0100 -Subject: [PATCH] Don't build manpages for stdlib docs ---- - ocamldoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index b109815071..e31e441f61 100644 ---- a/ocamldoc/Makefile -+++ b/ocamldoc/Makefile -@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) - - - .PHONY: all --all: lib exe generators manpages -+all: lib exe generators - - manpages: generators - --- -2.20.1 - diff --git a/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch deleted file mode 100644 index 41f5f7704..000000000 --- a/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Tue, 6 Aug 2019 09:23:06 +0100 -Subject: [PATCH] Fix failure to install tools links - -In --disable-installing-bytecode-programs mode, the .opt version of the -tools is installed, but the symlink for the tool itself is not created. ---- - tools/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/Makefile b/tools/Makefile -index 530dd37f34..1b3014a3ab 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -197,6 +197,7 @@ else - do \ - if test -f "$$i".opt; then \ - $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ -+ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ - fi; \ - done - endif --- -2.20.1 - diff --git a/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch deleted file mode 100644 index e37b5e883..000000000 --- a/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3f10a16153308f967149917585d2bc0b9c06492c -Author: Anil Madhavapeddy -Date: Sun Jun 21 18:40:27 2020 +0100 - - Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build - - Signed-off-by: Anil Madhavapeddy - -diff --git a/configure b/configure -index 9a78a4554..0c54b560b 100755 ---- a/configure -+++ b/configure -@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( - gcc-*) : -- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings" ;; #( - msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" -diff --git a/configure.ac b/configure.ac -index f5d8a2687..775e0e2db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -540,7 +540,7 @@ AS_CASE([$host], - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings"], - [gcc-*], -- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings"], - [msvc-*], - [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam deleted file mode 100644 index 905f9b3dd..000000000 --- a/doc.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam +++ /dev/null @@ -1,51 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml 4.08.1 Secondary Switch Compiler" -maintainer: "platform@lists.ocaml.org" -authors: "Xavier Leroy and many contributors" -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml/ocaml/issues" -dev-repo: "git://github.com/ocaml/ocaml" -depends: "ocaml" {< "4.08.0" | >= "4.09~"} -build: [ - [ - "./configure" - "--prefix=%{_:share}%" - "--libdir=%{_:share}%/lib" - "--disable-debugger" - "--disable-installing-bytecode-programs" - "--disable-debug-runtime" - "--disable-instrumented-runtime" - "--disable-graph-lib" - "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} - "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} - ] - [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] -] -install: [make "install"] -url { - src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" - checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" -} -extra-files: [ - ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] - ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] - ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] -] -patches: [ - "0001-Don-t-build-manpages-for-stdlib-docs.patch" - "0001-Fix-failure-to-install-tools-links.patch" - "fix-gcc10.patch" -] - -post-messages: [ - "A failure in the middle of the build may be caused by build parallelism - (enabled by default). - Please file a bug report at https://github.com/ocaml/ocaml/issues" - {failure & jobs > 1 & os != "cygwin"} - "You can try installing again including --jobs=1 - to force a sequential build instead." - {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} -] -description: "Installs an additional compiler to the opam switch in -%{_:share}%/ocaml-secondary-compiler which can be accessed using -`ocamlfind -toolchain secondary`." diff --git a/doc.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam b/doc.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam deleted file mode 100644 index a814e1d2d..000000000 --- a/doc.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "Backport new syntax to older OCaml versions" -description: """ -This packages backports new features of the language to older -compilers, such as let+. -""" -maintainer: ["jeremie@dimino.org"] -authors: ["Jérémie Dimino "] -license: "MIT" -homepage: "https://github.com/ocaml-ppx/ocaml-syntax-shims" -doc: "https://ocaml-ppx.github.io/ocaml-syntax-shims/" -bug-reports: "https://github.com/ocaml-ppx/ocaml-syntax-shims/issues" -depends: [ - "dune" {>= "2.0"} - "ocaml" {>= "4.02.3"} -] -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-syntax-shims.git" -url { - src: - "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz" - checksum: [ - "sha256=89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" - "sha512=75c4c6b0bfa1267a8a49a82ba494d08cf0823fc8350863d6d3d4971528cb09e5a2a29e2981d04c75e76ad0f49360b05a432c9efeff9a4fbc1ec6b28960399852" - ] -} diff --git a/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in deleted file mode 100644 index 12e3ee661..000000000 --- a/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in +++ /dev/null @@ -1,3 +0,0 @@ -description = "OCaml Secondary Compiler" -version = "%{ocaml-secondary-compiler:version}%" -directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in deleted file mode 100644 index d13023c9f..000000000 --- a/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" -ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" -ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" -ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" -ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" -ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" -ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/opam deleted file mode 100644 index acdb57645..000000000 --- a/doc.esy.lock/opam/ocamlfind-secondary.1.8.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "David Allsopp " -homepage: "https://github.com/ocaml/opam-repository" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] -install: [ - [make "install-meta"] - ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] - ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] - ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] - ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] -] -depends: [ - "ocaml-secondary-compiler" - "ocamlfind" {= "1.8.1"} -] -synopsis: "ocamlfind support for ocaml-secondary-compiler" -description: """ -Exposes the compiler built by the ocaml-secondary-compielr package via --toolchain secondary. A virtual package called ocaml is also installed to -locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" -authors: ["Gerd Stolpmann " "David Allsopp "] -substs: ["META" "ocaml-secondary-compiler.conf"] -extra-files: [ - ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] - ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] -] -url { - src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" - checksum: "md5=18ca650982c15536616dea0e422cbd8c" - mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" -} diff --git a/doc.esy.lock/opam/stringext.1.6.0/opam b/doc.esy.lock/opam/stringext.1.6.0/opam deleted file mode 100644 index 5242fe31a..000000000 --- a/doc.esy.lock/opam/stringext.1.6.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "rudi.grinberg@gmail.com" -authors: "Rudi Grinberg" -license: "MIT" -homepage: "https://github.com/rgrinberg/stringext" -bug-reports: "https://github.com/rgrinberg/stringext/issues" -depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "1.0"} - "ounit" {with-test} - "qtest" {with-test & >= "2.2"} - "base-bytes" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -dev-repo: "git+https://github.com/rgrinberg/stringext.git" -synopsis: "Extra string functions for OCaml" -description: """ -Extra string functions for OCaml. Mainly splitting. All functions are in the -Stringext module. -""" -url { - src: - "https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz" - checksum: [ - "sha256=db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" - "sha512=d8ebe40f42b598a9bd99f1ef4b00ba93458385a4accd121af66a0bf3b3f8d7135f576740adf1a43081dd409977c2219fd4bdbb5b3d1308890d301d553ed49900" - ] -} diff --git a/doc.esy.lock/opam/uri.3.1.0/opam b/doc.esy.lock/opam/uri.3.1.0/opam deleted file mode 100644 index 45406b00a..000000000 --- a/doc.esy.lock/opam/uri.3.1.0/opam +++ /dev/null @@ -1,35 +0,0 @@ -opam-version: "2.0" -maintainer: "anil@recoil.org" -authors: ["Anil Madhavapeddy" "David Sheets" "Rudi Grinberg"] -license: "ISC" -tags: ["url" "uri" "org:mirage" "org:xapi-project"] -homepage: "https://github.com/mirage/ocaml-uri" -bug-reports: "https://github.com/mirage/ocaml-uri/issues" -dev-repo: "git+https://github.com/mirage/ocaml-uri.git" -doc: "https://mirage.github.io/ocaml-uri/" -synopsis: "An RFC3986 URI/URL parsing library" -description: """ -This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification -for parsing URI or URLs. -""" -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.2.0"} - "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} - "re" {>= "1.9.0"} - "stringext" {>= "1.4.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz" - checksum: [ - "sha256=c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" - "sha512=c015576bb077fd243022bcd8804e628d23a253dcd8bbdda8dc2a57e86cfeb9fd629087ec7d7e23dc71dd7cd137450ca2c5ecf8fb7d184ec9d1d4e41f6f83ee38" - ] -} diff --git a/doc.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json b/doc.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json deleted file mode 100644 index 312f6e01c..000000000 --- a/doc.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build": [ "true" ], - "dependencies": { - "esy-autoconf": "esy-packages/esy-autoconf#fb93edf" - } -} diff --git a/bench.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json b/doc.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json similarity index 94% rename from bench.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json rename to doc.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json index f2b2e9f48..affde1bc3 100644 --- a/bench.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json +++ b/doc.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json @@ -27,8 +27,5 @@ "buildEnv": { "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" - }, - "dependencies": { - "ocaml": "*" } } diff --git a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll deleted file mode 100755 index 26301ddd3..000000000 --- a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -# clone-flexdll -# -# Brings in flexdll, if necessary - -if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then - echo "[Flexdll] Already present, no need to clone." -else - echo "[Flexdll] Cloning..." - git clone https://github.com/esy-ocaml/flexdll.git - cd flexdll - git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff - cd .. - echo "[Flexdll] Clone successful!" -fi \ No newline at end of file diff --git a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows deleted file mode 100755 index 4040b49ea..000000000 --- a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -# configure-windows -# -# Creates a native Windows MingW build, based on: -# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc - - -export prefix=C:/ocamlmgw64 -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - esac - shift -done - -echo "[configure-windows] Setting up flexdll" -./clone-flexdll -./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix -make flexdll diff --git a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build deleted file mode 100755 index b95356a53..000000000 --- a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build +++ /dev/null @@ -1,24 +0,0 @@ -#! /usr/bin/env bash - -# esy-build -# -# Wrapper to execute appropriate build strategy, based on platform - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-build] Detected windows environment..." - make -j4 world.opt - make flexlink.opt - ;; - *) - echo "[esy-build] Detected OSX / Linux environment" - make -j4 world.opt - ;; -esac - -# Common build steps -make install \ No newline at end of file diff --git a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure deleted file mode 100755 index fd196c517..000000000 --- a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure +++ /dev/null @@ -1,29 +0,0 @@ -#! /usr/bin/env bash - -# esy-configure -# -# Wrapper to delegate to configuration to the -# appropriate `configure` strategy based on the active platform. -# -# Today, OCaml has separate build strategies: -# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc -# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc -# -# We want `esy` to work cross-platform, so this is a shim script that will delegate to the -# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` -# that the `mingw` (native executable) strategy is desired. - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-configure] Detected windows environment..." - ./configure-windows "$@" - ;; - *) - echo "[esy-configure] Detected OSX / Linux environment" - ./configure "$@" - ;; -esac \ No newline at end of file diff --git a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json deleted file mode 100644 index 948455caf..000000000 --- a/doc.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "buildEnv": { - "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - }, - "build": [ - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-configure", - "--disable-cfi", - "--prefix", "$cur__install/share/ocaml-secondary-compiler", - "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", - "--disable-debugger", - "--disable-installing-bytecode-programs", - "--disable-debug-runtime", - "--disable-instrumented-runtime", - "--disable-graph-lib" - ], - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-build" - ] - ], - "buildsInSource": true -} diff --git a/doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch deleted file mode 100644 index 3e3ee5a24..000000000 --- a/doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml diff --git a/doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh deleted file mode 100644 index c923ef49e..000000000 --- a/doc.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh +++ /dev/null @@ -1,14 +0,0 @@ -OCAML_SECONDARY_COMPILER=$1 - -cat >ocaml-secondary-compiler.conf <META <" -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/angstrom" -bug-reports: "https://github.com/inhabitedtype/angstrom/issues" -dev-repo: "git+https://github.com/inhabitedtype/angstrom.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.8.1"} - "bigstringaf" - "result" -] -synopsis: "Parser combinators built for speed and memory-efficiency" -description: """ -Angstrom is a parser-combinator library that makes it easy to write efficient, -expressive, and reusable parsers suitable for high-performance applications. It -exposes monadic and applicative interfaces for composition, and supports -incremental input through buffered and unbuffered interfaces. Both interfaces -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.14.1.tar.gz" - checksum: "md5=915bbcc1adbd0debc1b0a54531c7601a" -} diff --git a/esy.lock/opam/base64.3.4.0/opam b/esy.lock/opam/base64.3.4.0/opam deleted file mode 100644 index b4869cdfa..000000000 --- a/esy.lock/opam/base64.3.4.0/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "mirageos-devel@lists.xenproject.org" -authors: [ "Thomas Gazagnaire" - "Anil Madhavapeddy" "Calascibetta Romain" - "Peter Zotov" ] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-base64" -doc: "http://mirage.github.io/ocaml-base64/" -bug-reports: "https://github.com/mirage/ocaml-base64/issues" -dev-repo: "git+https://github.com/mirage/ocaml-base64.git" -synopsis: "Base64 encoding for OCaml" -description: """ -Base64 is a group of similar binary-to-text encoding schemes that represent -binary data in an ASCII string format by translating it into a radix-64 -representation. It is specified in RFC 4648. -""" -depends: [ - "ocaml" {>="4.03.0"} - "base-bytes" - "dune-configurator" - "dune" {>= "2.0"} - "bos" {with-test} - "rresult" {with-test} - "alcotest" {with-test} -] -build: [ - ["dune" "subst"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz" - checksum: [ - "sha256=1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" - "sha512=e66a67302a9eb136044bebf66a89a1d6e38a96c70622bb6cd27916fec36dcaf4b5b7e7d00c25608f0a2363f2ca4264a5fe765fe7747590958325dbce06311db9" - ] -} diff --git a/esy.lock/opam/bigarray-compat.1.0.0/opam b/esy.lock/opam/bigarray-compat.1.0.0/opam deleted file mode 100644 index 93751514d..000000000 --- a/esy.lock/opam/bigarray-compat.1.0.0/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -synopsis: "Compatibility library to use Stdlib.Bigarray when possible" -maintainer: "Lucas Pluvinage " -authors: "Lucas Pluvinage " -license: "ISC" -homepage: "https://github.com/mirage/bigarray-compat" -bug-reports: "https://github.com/mirage/bigarray-compat/issues" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" {>= "1.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -dev-repo: "git+https://github.com/mirage/bigarray-compat.git" -url { - src: "https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz" - checksum: [ - "md5=1cc7c25382a8900bada34aadfd66632e" - "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f" - ] -} \ No newline at end of file diff --git a/esy.lock/opam/bigstringaf.0.6.1/opam b/esy.lock/opam/bigstringaf.0.6.1/opam deleted file mode 100644 index b821673a0..000000000 --- a/esy.lock/opam/bigstringaf.0.6.1/opam +++ /dev/null @@ -1,43 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/bigstringaf" -bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues" -dev-repo: "git+https://github.com/inhabitedtype/bigstringaf.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "dune" {>= "1.0"} - "alcotest" {with-test} - "bigarray-compat" - "ocaml" {>= "4.03.0"} -] -depopts: [ - "mirage-xen-posix" - "ocaml-freestanding" -] -conflicts: [ - "mirage-xen-posix" {< "3.1.0"} - "ocaml-freestanding" {< "0.4.1"} - "js_of_ocaml" {< "3.5.0"} -] -synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove" -description: """ -Bigstring intrinsics and fast blits based on memcpy/memmove - -The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not -widely-known, sometimes misused, and so programs that use Bigstrings are slower -than they have to be. And even if a library got that part right and exposed the -intrinsics properly, the compiler doesn't have any fast blits between -Bigstrings and other string-like types. - -So here they are. Go crazy. -""" -url { - src: "https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz" - checksum: "md5=dccf639273b1eec0e0f142f21319268d" -} diff --git a/esy.lock/opam/charInfo_width.1.1.0/opam b/esy.lock/opam/charInfo_width.1.1.0/opam index dee626092..c88c2c9d4 100644 --- a/esy.lock/opam/charInfo_width.1.1.0/opam +++ b/esy.lock/opam/charInfo_width.1.1.0/opam @@ -1,10 +1,10 @@ opam-version: "2.0" maintainer: "zandoye@gmail.com" authors: [ "ZAN DoYe" ] -homepage: "https://bitbucket.org/zandoye/charinfo_width/" -bug-reports: "https://bitbucket.org/zandoye/charinfo_width/issues" +homepage: "https://github.com/kandu/charinfo_width/" +bug-reports: "https://github.com/kandu/charinfo_width/issues" license: "MIT" -dev-repo: "hg+https://bitbucket.org/zandoye/charinfo_width" +dev-repo: "git://github.com/kandu/charinfo_width.git" build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test & (ocaml:version >= "4.04.0")} @@ -22,6 +22,6 @@ description: """ This module is implemented purely in OCaml and the width function follows the prototype of POSIX's wcwidth.""" url { - src:"https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz" - checksum: "md5=c4ab038e06f06a29692c05fdd7c268c5" + src:"https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz" + checksum: "md5=a539436d1da4aeb93711303f107bec7e" } diff --git a/esy.lock/opam/conf-autoconf.0.1/opam b/esy.lock/opam/conf-autoconf.0.1/opam deleted file mode 100644 index a538223d0..000000000 --- a/esy.lock/opam/conf-autoconf.0.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "unixjunkie@sdf.org" -homepage: "http://www.gnu.org/software/autoconf" -authors: "https://www.gnu.org/software/autoconf/autoconf.html#maintainer" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -license: "GPL-3.0" -build: [ - ["which" "autoconf"] -] -depends: ["conf-which" {build}] -depexts: [ - ["autoconf"] {os-family = "debian"} - ["autoconf"] {os-distribution = "centos"} - ["autoconf"] {os-distribution = "fedora"} - ["autoconf"] {os-distribution = "arch"} - ["sys-devel/autoconf"] {os-distribution = "gentoo"} - ["autoconf"] {os-distribution = "nixos"} - ["autoconf"] {os = "macos" & os-distribution = "homebrew"} - ["devel/autoconf"] {os = "openbsd"} - ["autoconf"] {os = "freebsd"} - ["autoconf"] {os = "netbsd"} - ["autoconf"] {os-distribution = "alpine"} - ["autoconf"] {os-distribution = "ol"} - ["autoconf"] {os-distribution = "rhel"} -] -synopsis: "Virtual package relying on autoconf installation" -description: """ -This package can only install if the autoconf command -is available on the system.""" -flags: conf diff --git a/examples.esy.lock/opam/dune-build-info.2.6.2/opam b/esy.lock/opam/dune-build-info.2.7.0/opam similarity index 71% rename from examples.esy.lock/opam/dune-build-info.2.6.2/opam rename to esy.lock/opam/dune-build-info.2.7.0/opam index a0dfa6442..ea2f6aa11 100644 --- a/examples.esy.lock/opam/dune-build-info.2.6.2/opam +++ b/esy.lock/opam/dune-build-info.2.7.0/opam @@ -15,11 +15,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.5"} + "dune" {>= "2.7"} + "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -32,9 +33,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/examples.esy.lock/opam/dune-configurator.2.6.2/opam b/esy.lock/opam/dune-configurator.2.7.0/opam similarity index 69% rename from examples.esy.lock/opam/dune-configurator.2.6.2/opam rename to esy.lock/opam/dune-configurator.2.7.0/opam index 9ae7729b7..a247cb8d8 100644 --- a/examples.esy.lock/opam/dune-configurator.2.6.2/opam +++ b/esy.lock/opam/dune-configurator.2.7.0/opam @@ -17,12 +17,13 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.6"} - "dune-private-libs" {= version} + "ocaml" {>= "4.03.0"} + "dune" {>= "2.7" & >= "2.6.0"} + "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -35,9 +36,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/esy.lock/opam/dune-private-libs.2.6.2/opam b/esy.lock/opam/dune-private-libs.2.6.2/opam deleted file mode 100644 index f62a0a2fe..000000000 --- a/esy.lock/opam/dune-private-libs.2.6.2/opam +++ /dev/null @@ -1,42 +0,0 @@ -opam-version: "2.0" -synopsis: "Private libraries of Dune" -description: """ -!!!!!!!!!!!!!!!!!!!!!! -!!!!! DO NOT USE !!!!! -!!!!!!!!!!!!!!!!!!!!!! - -This package contains code that is shared between various dune-xxx -packages. However, it is not meant for public consumption and provides -no stability guarantee. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.5"} - "ocaml" {>= "4.07"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/doc.esy.lock/opam/dune.2.6.2/opam b/esy.lock/opam/dune.2.7.0/opam similarity index 83% rename from doc.esy.lock/opam/dune.2.6.2/opam rename to esy.lock/opam/dune.2.7.0/opam index 655fb0111..c4b160031 100644 --- a/doc.esy.lock/opam/dune.2.6.2/opam +++ b/esy.lock/opam/dune.2.7.0/opam @@ -42,14 +42,14 @@ build: [ depends: [ # Please keep the lower bound in sync with .travis.yml, dune-project # and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/esy.lock/opam/faraday-lwt-unix.0.7.1/opam b/esy.lock/opam/faraday-lwt-unix.0.7.1/opam deleted file mode 100644 index 3cc8377eb..000000000 --- a/esy.lock/opam/faraday-lwt-unix.0.7.1/opam +++ /dev/null @@ -1,24 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday-lwt" - "lwt" {>= "2.7.0"} - "base-unix" -] -synopsis: "Lwt_unix support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/esy.lock/opam/faraday-lwt.0.7.1/opam b/esy.lock/opam/faraday-lwt.0.7.1/opam deleted file mode 100644 index 4e68d3097..000000000 --- a/esy.lock/opam/faraday-lwt.0.7.1/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday" {>= "0.5.0"} - "lwt" -] -synopsis: "Lwt support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/esy.lock/opam/faraday.0.7.1/opam b/esy.lock/opam/faraday.0.7.1/opam deleted file mode 100644 index a20e6942e..000000000 --- a/esy.lock/opam/faraday.0.7.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.4.1"} - "bigstringaf" -] -synopsis: "A library for writing fast and memory-efficient serializers." -description: """ -Faraday is a library for writing fast and memory-efficient serializers. Its -core type and related operation gives the user fine-grained control over -copying and allocation behavior while serializing user-defined types, and -presents the output in a form that makes it possible to use vectorized write -operations, such as the writev system call, or any other platform or -application-specific output APIs.""" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/esy.lock/opam/hpack.0.2.0/opam b/esy.lock/opam/hpack.0.2.0/opam deleted file mode 100644 index b09cf7cbe..000000000 --- a/esy.lock/opam/hpack.0.2.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "Antonio Nuno Monteiro " -authors: [ "Pieter Goetschalckx <3.14.e.ter@gmail.com>" - "Antonio Nuno Monteiro " ] -license: "BSD-3-Clause" -homepage: "https://github.com/anmonteiro/ocaml-h2" -bug-reports: "https://github.com/anmonteiro/ocaml-h2/issues" -dev-repo: "git+https://github.com/anmonteiro/ocaml-h2.git" -doc: "https://anmonteiro.github.io/ocaml-h2/" -depends: [ - "ocaml" {>= "4.04"} - "dune" - "yojson" {with-test} - "hex" {with-test} - "angstrom" - "faraday" -] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -synopsis: - "An HPACK (Header Compression for HTTP/2) implementation in OCaml" -description: """ -hpack is an implementation of the HPACK: Header Compression for HTTP/2 -specification (RFC7541) written in OCaml. It uses Angstrom and Faraday for -parsing and serialization, respectively. -""" -url { - src: - "https://github.com/anmonteiro/ocaml-h2/releases/download/0.2.0/h2-0.2.0.tbz" - checksum: "md5=c883927ce8a9f3f7159ef7b20988f051" -} diff --git a/esy.lock/opam/magic-mime.1.1.2/opam b/esy.lock/opam/magic-mime.1.1.2/opam deleted file mode 100644 index 8e398fb3e..000000000 --- a/esy.lock/opam/magic-mime.1.1.2/opam +++ /dev/null @@ -1,41 +0,0 @@ -opam-version: "2.0" -name: "magic-mime" -synopsis: "Map filenames to common MIME types" -description: """ -This library contains a database of MIME types that maps filename extensions -into MIME types suitable for use in many Internet protocols such as HTTP or -e-mail. It is generated from the `mime.types` file found in Unix systems, but -has no dependency on a filesystem since it includes the contents of the -database as an ML datastructure. - -For example, here's how to lookup MIME types in the [utop] REPL: - - #require "magic-mime";; - Magic_mime.lookup "/foo/bar.txt";; - - : bytes = "text/plain" - Magic_mime.lookup "bar.css";; - - : bytes = "text/css" -""" -maintainer: "Anil Madhavapeddy " -authors: ["Anil Madhavapeddy" "Maxence Guesdon"] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-magic-mime" -doc: "https://mirage.github.io/ocaml-magic-mime/" -bug-reports: "https://github.com/mirage/ocaml-magic-mime/issues" -dev-repo: "git+https://github.com/mirage/ocaml-magic-mime.git" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: - "https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz" - checksum: [ - "sha256=0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" - "sha512=8264db78adc2c75b8adabc23c26ad34eab98383bd3a8f2068f2236ff3425d653c0238fbd7361e55a3d70d843413ef8671b6e97293074b4d3a1e300628d5292ab" - ] -} diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch deleted file mode 100644 index cda19dd2d..000000000 --- a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Fri, 26 Jul 2019 12:12:19 +0100 -Subject: [PATCH] Don't build manpages for stdlib docs ---- - ocamldoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index b109815071..e31e441f61 100644 ---- a/ocamldoc/Makefile -+++ b/ocamldoc/Makefile -@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) - - - .PHONY: all --all: lib exe generators manpages -+all: lib exe generators - - manpages: generators - --- -2.20.1 - diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch deleted file mode 100644 index 41f5f7704..000000000 --- a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Tue, 6 Aug 2019 09:23:06 +0100 -Subject: [PATCH] Fix failure to install tools links - -In --disable-installing-bytecode-programs mode, the .opt version of the -tools is installed, but the symlink for the tool itself is not created. ---- - tools/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/Makefile b/tools/Makefile -index 530dd37f34..1b3014a3ab 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -197,6 +197,7 @@ else - do \ - if test -f "$$i".opt; then \ - $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ -+ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ - fi; \ - done - endif --- -2.20.1 - diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch deleted file mode 100644 index e37b5e883..000000000 --- a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3f10a16153308f967149917585d2bc0b9c06492c -Author: Anil Madhavapeddy -Date: Sun Jun 21 18:40:27 2020 +0100 - - Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build - - Signed-off-by: Anil Madhavapeddy - -diff --git a/configure b/configure -index 9a78a4554..0c54b560b 100755 ---- a/configure -+++ b/configure -@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( - gcc-*) : -- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings" ;; #( - msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" -diff --git a/configure.ac b/configure.ac -index f5d8a2687..775e0e2db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -540,7 +540,7 @@ AS_CASE([$host], - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings"], - [gcc-*], -- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings"], - [msvc-*], - [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam deleted file mode 100644 index 905f9b3dd..000000000 --- a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam +++ /dev/null @@ -1,51 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml 4.08.1 Secondary Switch Compiler" -maintainer: "platform@lists.ocaml.org" -authors: "Xavier Leroy and many contributors" -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml/ocaml/issues" -dev-repo: "git://github.com/ocaml/ocaml" -depends: "ocaml" {< "4.08.0" | >= "4.09~"} -build: [ - [ - "./configure" - "--prefix=%{_:share}%" - "--libdir=%{_:share}%/lib" - "--disable-debugger" - "--disable-installing-bytecode-programs" - "--disable-debug-runtime" - "--disable-instrumented-runtime" - "--disable-graph-lib" - "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} - "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} - ] - [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] -] -install: [make "install"] -url { - src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" - checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" -} -extra-files: [ - ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] - ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] - ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] -] -patches: [ - "0001-Don-t-build-manpages-for-stdlib-docs.patch" - "0001-Fix-failure-to-install-tools-links.patch" - "fix-gcc10.patch" -] - -post-messages: [ - "A failure in the middle of the build may be caused by build parallelism - (enabled by default). - Please file a bug report at https://github.com/ocaml/ocaml/issues" - {failure & jobs > 1 & os != "cygwin"} - "You can try installing again including --jobs=1 - to force a sequential build instead." - {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} -] -description: "Installs an additional compiler to the opam switch in -%{_:share}%/ocaml-secondary-compiler which can be accessed using -`ocamlfind -toolchain secondary`." diff --git a/esy.lock/opam/ocaml-syntax-shims.1.0.0/opam b/esy.lock/opam/ocaml-syntax-shims.1.0.0/opam deleted file mode 100644 index a814e1d2d..000000000 --- a/esy.lock/opam/ocaml-syntax-shims.1.0.0/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "Backport new syntax to older OCaml versions" -description: """ -This packages backports new features of the language to older -compilers, such as let+. -""" -maintainer: ["jeremie@dimino.org"] -authors: ["Jérémie Dimino "] -license: "MIT" -homepage: "https://github.com/ocaml-ppx/ocaml-syntax-shims" -doc: "https://ocaml-ppx.github.io/ocaml-syntax-shims/" -bug-reports: "https://github.com/ocaml-ppx/ocaml-syntax-shims/issues" -depends: [ - "dune" {>= "2.0"} - "ocaml" {>= "4.02.3"} -] -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-syntax-shims.git" -url { - src: - "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz" - checksum: [ - "sha256=89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" - "sha512=75c4c6b0bfa1267a8a49a82ba494d08cf0823fc8350863d6d3d4971528cb09e5a2a29e2981d04c75e76ad0f49360b05a432c9efeff9a4fbc1ec6b28960399852" - ] -} diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in deleted file mode 100644 index 12e3ee661..000000000 --- a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in +++ /dev/null @@ -1,3 +0,0 @@ -description = "OCaml Secondary Compiler" -version = "%{ocaml-secondary-compiler:version}%" -directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in deleted file mode 100644 index d13023c9f..000000000 --- a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" -ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" -ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" -ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" -ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" -ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" -ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/esy.lock/opam/ocamlfind-secondary.1.8.1/opam deleted file mode 100644 index acdb57645..000000000 --- a/esy.lock/opam/ocamlfind-secondary.1.8.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "David Allsopp " -homepage: "https://github.com/ocaml/opam-repository" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] -install: [ - [make "install-meta"] - ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] - ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] - ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] - ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] -] -depends: [ - "ocaml-secondary-compiler" - "ocamlfind" {= "1.8.1"} -] -synopsis: "ocamlfind support for ocaml-secondary-compiler" -description: """ -Exposes the compiler built by the ocaml-secondary-compielr package via --toolchain secondary. A virtual package called ocaml is also installed to -locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" -authors: ["Gerd Stolpmann " "David Allsopp "] -substs: ["META" "ocaml-secondary-compiler.conf"] -extra-files: [ - ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] - ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] -] -url { - src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" - checksum: "md5=18ca650982c15536616dea0e422cbd8c" - mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" -} diff --git a/esy.lock/opam/stringext.1.6.0/opam b/esy.lock/opam/stringext.1.6.0/opam deleted file mode 100644 index 5242fe31a..000000000 --- a/esy.lock/opam/stringext.1.6.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "rudi.grinberg@gmail.com" -authors: "Rudi Grinberg" -license: "MIT" -homepage: "https://github.com/rgrinberg/stringext" -bug-reports: "https://github.com/rgrinberg/stringext/issues" -depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "1.0"} - "ounit" {with-test} - "qtest" {with-test & >= "2.2"} - "base-bytes" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -dev-repo: "git+https://github.com/rgrinberg/stringext.git" -synopsis: "Extra string functions for OCaml" -description: """ -Extra string functions for OCaml. Mainly splitting. All functions are in the -Stringext module. -""" -url { - src: - "https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz" - checksum: [ - "sha256=db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" - "sha512=d8ebe40f42b598a9bd99f1ef4b00ba93458385a4accd121af66a0bf3b3f8d7135f576740adf1a43081dd409977c2219fd4bdbb5b3d1308890d301d553ed49900" - ] -} diff --git a/esy.lock/opam/uri.3.1.0/opam b/esy.lock/opam/uri.3.1.0/opam deleted file mode 100644 index 45406b00a..000000000 --- a/esy.lock/opam/uri.3.1.0/opam +++ /dev/null @@ -1,35 +0,0 @@ -opam-version: "2.0" -maintainer: "anil@recoil.org" -authors: ["Anil Madhavapeddy" "David Sheets" "Rudi Grinberg"] -license: "ISC" -tags: ["url" "uri" "org:mirage" "org:xapi-project"] -homepage: "https://github.com/mirage/ocaml-uri" -bug-reports: "https://github.com/mirage/ocaml-uri/issues" -dev-repo: "git+https://github.com/mirage/ocaml-uri.git" -doc: "https://mirage.github.io/ocaml-uri/" -synopsis: "An RFC3986 URI/URL parsing library" -description: """ -This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification -for parsing URI or URLs. -""" -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.2.0"} - "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} - "re" {>= "1.9.0"} - "stringext" {>= "1.4.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz" - checksum: [ - "sha256=c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" - "sha512=c015576bb077fd243022bcd8804e628d23a253dcd8bbdda8dc2a57e86cfeb9fd629087ec7d7e23dc71dd7cd137450ca2c5ecf8fb7d184ec9d1d4e41f6f83ee38" - ] -} diff --git a/esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json b/esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json deleted file mode 100644 index 312f6e01c..000000000 --- a/esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build": [ "true" ], - "dependencies": { - "esy-autoconf": "esy-packages/esy-autoconf#fb93edf" - } -} diff --git a/esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json similarity index 94% rename from esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json rename to esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json index f2b2e9f48..affde1bc3 100644 --- a/esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json +++ b/esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json @@ -27,8 +27,5 @@ "buildEnv": { "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" - }, - "dependencies": { - "ocaml": "*" } } diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll deleted file mode 100755 index 26301ddd3..000000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -# clone-flexdll -# -# Brings in flexdll, if necessary - -if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then - echo "[Flexdll] Already present, no need to clone." -else - echo "[Flexdll] Cloning..." - git clone https://github.com/esy-ocaml/flexdll.git - cd flexdll - git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff - cd .. - echo "[Flexdll] Clone successful!" -fi \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows deleted file mode 100755 index 4040b49ea..000000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -# configure-windows -# -# Creates a native Windows MingW build, based on: -# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc - - -export prefix=C:/ocamlmgw64 -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - esac - shift -done - -echo "[configure-windows] Setting up flexdll" -./clone-flexdll -./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix -make flexdll diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build deleted file mode 100755 index b95356a53..000000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build +++ /dev/null @@ -1,24 +0,0 @@ -#! /usr/bin/env bash - -# esy-build -# -# Wrapper to execute appropriate build strategy, based on platform - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-build] Detected windows environment..." - make -j4 world.opt - make flexlink.opt - ;; - *) - echo "[esy-build] Detected OSX / Linux environment" - make -j4 world.opt - ;; -esac - -# Common build steps -make install \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure deleted file mode 100755 index fd196c517..000000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure +++ /dev/null @@ -1,29 +0,0 @@ -#! /usr/bin/env bash - -# esy-configure -# -# Wrapper to delegate to configuration to the -# appropriate `configure` strategy based on the active platform. -# -# Today, OCaml has separate build strategies: -# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc -# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc -# -# We want `esy` to work cross-platform, so this is a shim script that will delegate to the -# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` -# that the `mingw` (native executable) strategy is desired. - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-configure] Detected windows environment..." - ./configure-windows "$@" - ;; - *) - echo "[esy-configure] Detected OSX / Linux environment" - ./configure "$@" - ;; -esac \ No newline at end of file diff --git a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json deleted file mode 100644 index 948455caf..000000000 --- a/esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "buildEnv": { - "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - }, - "build": [ - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-configure", - "--disable-cfi", - "--prefix", "$cur__install/share/ocaml-secondary-compiler", - "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", - "--disable-debugger", - "--disable-installing-bytecode-programs", - "--disable-debug-runtime", - "--disable-instrumented-runtime", - "--disable-graph-lib" - ], - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-build" - ] - ], - "buildsInSource": true -} diff --git a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch deleted file mode 100644 index 3e3ee5a24..000000000 --- a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml diff --git a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh deleted file mode 100644 index c923ef49e..000000000 --- a/esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh +++ /dev/null @@ -1,14 +0,0 @@ -OCAML_SECONDARY_COMPILER=$1 - -cat >ocaml-secondary-compiler.conf <META <" -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/angstrom" -bug-reports: "https://github.com/inhabitedtype/angstrom/issues" -dev-repo: "git+https://github.com/inhabitedtype/angstrom.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.8.1"} - "bigstringaf" - "result" -] -synopsis: "Parser combinators built for speed and memory-efficiency" -description: """ -Angstrom is a parser-combinator library that makes it easy to write efficient, -expressive, and reusable parsers suitable for high-performance applications. It -exposes monadic and applicative interfaces for composition, and supports -incremental input through buffered and unbuffered interfaces. Both interfaces -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.14.1.tar.gz" - checksum: "md5=915bbcc1adbd0debc1b0a54531c7601a" -} diff --git a/examples.esy.lock/opam/base64.3.4.0/opam b/examples.esy.lock/opam/base64.3.4.0/opam deleted file mode 100644 index b4869cdfa..000000000 --- a/examples.esy.lock/opam/base64.3.4.0/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "mirageos-devel@lists.xenproject.org" -authors: [ "Thomas Gazagnaire" - "Anil Madhavapeddy" "Calascibetta Romain" - "Peter Zotov" ] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-base64" -doc: "http://mirage.github.io/ocaml-base64/" -bug-reports: "https://github.com/mirage/ocaml-base64/issues" -dev-repo: "git+https://github.com/mirage/ocaml-base64.git" -synopsis: "Base64 encoding for OCaml" -description: """ -Base64 is a group of similar binary-to-text encoding schemes that represent -binary data in an ASCII string format by translating it into a radix-64 -representation. It is specified in RFC 4648. -""" -depends: [ - "ocaml" {>="4.03.0"} - "base-bytes" - "dune-configurator" - "dune" {>= "2.0"} - "bos" {with-test} - "rresult" {with-test} - "alcotest" {with-test} -] -build: [ - ["dune" "subst"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz" - checksum: [ - "sha256=1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" - "sha512=e66a67302a9eb136044bebf66a89a1d6e38a96c70622bb6cd27916fec36dcaf4b5b7e7d00c25608f0a2363f2ca4264a5fe765fe7747590958325dbce06311db9" - ] -} diff --git a/examples.esy.lock/opam/bigarray-compat.1.0.0/opam b/examples.esy.lock/opam/bigarray-compat.1.0.0/opam deleted file mode 100644 index 93751514d..000000000 --- a/examples.esy.lock/opam/bigarray-compat.1.0.0/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -synopsis: "Compatibility library to use Stdlib.Bigarray when possible" -maintainer: "Lucas Pluvinage " -authors: "Lucas Pluvinage " -license: "ISC" -homepage: "https://github.com/mirage/bigarray-compat" -bug-reports: "https://github.com/mirage/bigarray-compat/issues" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" {>= "1.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -dev-repo: "git+https://github.com/mirage/bigarray-compat.git" -url { - src: "https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz" - checksum: [ - "md5=1cc7c25382a8900bada34aadfd66632e" - "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f" - ] -} \ No newline at end of file diff --git a/examples.esy.lock/opam/bigstringaf.0.6.1/opam b/examples.esy.lock/opam/bigstringaf.0.6.1/opam deleted file mode 100644 index b821673a0..000000000 --- a/examples.esy.lock/opam/bigstringaf.0.6.1/opam +++ /dev/null @@ -1,43 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/bigstringaf" -bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues" -dev-repo: "git+https://github.com/inhabitedtype/bigstringaf.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "dune" {>= "1.0"} - "alcotest" {with-test} - "bigarray-compat" - "ocaml" {>= "4.03.0"} -] -depopts: [ - "mirage-xen-posix" - "ocaml-freestanding" -] -conflicts: [ - "mirage-xen-posix" {< "3.1.0"} - "ocaml-freestanding" {< "0.4.1"} - "js_of_ocaml" {< "3.5.0"} -] -synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove" -description: """ -Bigstring intrinsics and fast blits based on memcpy/memmove - -The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not -widely-known, sometimes misused, and so programs that use Bigstrings are slower -than they have to be. And even if a library got that part right and exposed the -intrinsics properly, the compiler doesn't have any fast blits between -Bigstrings and other string-like types. - -So here they are. Go crazy. -""" -url { - src: "https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz" - checksum: "md5=dccf639273b1eec0e0f142f21319268d" -} diff --git a/examples.esy.lock/opam/charInfo_width.1.1.0/opam b/examples.esy.lock/opam/charInfo_width.1.1.0/opam index dee626092..c88c2c9d4 100644 --- a/examples.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/examples.esy.lock/opam/charInfo_width.1.1.0/opam @@ -1,10 +1,10 @@ opam-version: "2.0" maintainer: "zandoye@gmail.com" authors: [ "ZAN DoYe" ] -homepage: "https://bitbucket.org/zandoye/charinfo_width/" -bug-reports: "https://bitbucket.org/zandoye/charinfo_width/issues" +homepage: "https://github.com/kandu/charinfo_width/" +bug-reports: "https://github.com/kandu/charinfo_width/issues" license: "MIT" -dev-repo: "hg+https://bitbucket.org/zandoye/charinfo_width" +dev-repo: "git://github.com/kandu/charinfo_width.git" build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test & (ocaml:version >= "4.04.0")} @@ -22,6 +22,6 @@ description: """ This module is implemented purely in OCaml and the width function follows the prototype of POSIX's wcwidth.""" url { - src:"https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz" - checksum: "md5=c4ab038e06f06a29692c05fdd7c268c5" + src:"https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz" + checksum: "md5=a539436d1da4aeb93711303f107bec7e" } diff --git a/examples.esy.lock/opam/conf-autoconf.0.1/opam b/examples.esy.lock/opam/conf-autoconf.0.1/opam deleted file mode 100644 index a538223d0..000000000 --- a/examples.esy.lock/opam/conf-autoconf.0.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "unixjunkie@sdf.org" -homepage: "http://www.gnu.org/software/autoconf" -authors: "https://www.gnu.org/software/autoconf/autoconf.html#maintainer" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -license: "GPL-3.0" -build: [ - ["which" "autoconf"] -] -depends: ["conf-which" {build}] -depexts: [ - ["autoconf"] {os-family = "debian"} - ["autoconf"] {os-distribution = "centos"} - ["autoconf"] {os-distribution = "fedora"} - ["autoconf"] {os-distribution = "arch"} - ["sys-devel/autoconf"] {os-distribution = "gentoo"} - ["autoconf"] {os-distribution = "nixos"} - ["autoconf"] {os = "macos" & os-distribution = "homebrew"} - ["devel/autoconf"] {os = "openbsd"} - ["autoconf"] {os = "freebsd"} - ["autoconf"] {os = "netbsd"} - ["autoconf"] {os-distribution = "alpine"} - ["autoconf"] {os-distribution = "ol"} - ["autoconf"] {os-distribution = "rhel"} -] -synopsis: "Virtual package relying on autoconf installation" -description: """ -This package can only install if the autoconf command -is available on the system.""" -flags: conf diff --git a/bench.esy.lock/opam/dune-build-info.2.6.2/opam b/examples.esy.lock/opam/dune-build-info.2.7.0/opam similarity index 71% rename from bench.esy.lock/opam/dune-build-info.2.6.2/opam rename to examples.esy.lock/opam/dune-build-info.2.7.0/opam index a0dfa6442..ea2f6aa11 100644 --- a/bench.esy.lock/opam/dune-build-info.2.6.2/opam +++ b/examples.esy.lock/opam/dune-build-info.2.7.0/opam @@ -15,11 +15,12 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.5"} + "dune" {>= "2.7"} + "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -32,9 +33,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/bench.esy.lock/opam/dune-configurator.2.6.2/opam b/examples.esy.lock/opam/dune-configurator.2.7.0/opam similarity index 69% rename from bench.esy.lock/opam/dune-configurator.2.6.2/opam rename to examples.esy.lock/opam/dune-configurator.2.7.0/opam index 9ae7729b7..a247cb8d8 100644 --- a/bench.esy.lock/opam/dune-configurator.2.6.2/opam +++ b/examples.esy.lock/opam/dune-configurator.2.7.0/opam @@ -17,12 +17,13 @@ homepage: "https://github.com/ocaml/dune" doc: "https://dune.readthedocs.io/" bug-reports: "https://github.com/ocaml/dune/issues" depends: [ - "dune" {>= "2.6"} - "dune-private-libs" {= version} + "ocaml" {>= "4.03.0"} + "dune" {>= "2.7" & >= "2.6.0"} + "odoc" {with-doc} ] dev-repo: "git+https://github.com/ocaml/dune.git" build: [ - ["dune" "subst"] {pinned} + ["dune" "subst"] {dev} [ "dune" "build" @@ -35,9 +36,9 @@ build: [ ] ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/examples.esy.lock/opam/dune-private-libs.2.6.2/opam b/examples.esy.lock/opam/dune-private-libs.2.6.2/opam deleted file mode 100644 index f62a0a2fe..000000000 --- a/examples.esy.lock/opam/dune-private-libs.2.6.2/opam +++ /dev/null @@ -1,42 +0,0 @@ -opam-version: "2.0" -synopsis: "Private libraries of Dune" -description: """ -!!!!!!!!!!!!!!!!!!!!!! -!!!!! DO NOT USE !!!!! -!!!!!!!!!!!!!!!!!!!!!! - -This package contains code that is shared between various dune-xxx -packages. However, it is not meant for public consumption and provides -no stability guarantee. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.5"} - "ocaml" {>= "4.07"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/bench.esy.lock/opam/dune.2.6.2/opam b/examples.esy.lock/opam/dune.2.7.0/opam similarity index 83% rename from bench.esy.lock/opam/dune.2.6.2/opam rename to examples.esy.lock/opam/dune.2.7.0/opam index 655fb0111..c4b160031 100644 --- a/bench.esy.lock/opam/dune.2.6.2/opam +++ b/examples.esy.lock/opam/dune.2.7.0/opam @@ -42,14 +42,14 @@ build: [ depends: [ # Please keep the lower bound in sync with .travis.yml, dune-project # and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" ] } diff --git a/examples.esy.lock/opam/faraday-lwt-unix.0.7.1/opam b/examples.esy.lock/opam/faraday-lwt-unix.0.7.1/opam deleted file mode 100644 index 3cc8377eb..000000000 --- a/examples.esy.lock/opam/faraday-lwt-unix.0.7.1/opam +++ /dev/null @@ -1,24 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday-lwt" - "lwt" {>= "2.7.0"} - "base-unix" -] -synopsis: "Lwt_unix support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/examples.esy.lock/opam/faraday-lwt.0.7.1/opam b/examples.esy.lock/opam/faraday-lwt.0.7.1/opam deleted file mode 100644 index 4e68d3097..000000000 --- a/examples.esy.lock/opam/faraday-lwt.0.7.1/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday" {>= "0.5.0"} - "lwt" -] -synopsis: "Lwt support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/examples.esy.lock/opam/faraday.0.7.1/opam b/examples.esy.lock/opam/faraday.0.7.1/opam deleted file mode 100644 index a20e6942e..000000000 --- a/examples.esy.lock/opam/faraday.0.7.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.4.1"} - "bigstringaf" -] -synopsis: "A library for writing fast and memory-efficient serializers." -description: """ -Faraday is a library for writing fast and memory-efficient serializers. Its -core type and related operation gives the user fine-grained control over -copying and allocation behavior while serializing user-defined types, and -presents the output in a form that makes it possible to use vectorized write -operations, such as the writev system call, or any other platform or -application-specific output APIs.""" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/examples.esy.lock/opam/hpack.0.2.0/opam b/examples.esy.lock/opam/hpack.0.2.0/opam deleted file mode 100644 index b09cf7cbe..000000000 --- a/examples.esy.lock/opam/hpack.0.2.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "Antonio Nuno Monteiro " -authors: [ "Pieter Goetschalckx <3.14.e.ter@gmail.com>" - "Antonio Nuno Monteiro " ] -license: "BSD-3-Clause" -homepage: "https://github.com/anmonteiro/ocaml-h2" -bug-reports: "https://github.com/anmonteiro/ocaml-h2/issues" -dev-repo: "git+https://github.com/anmonteiro/ocaml-h2.git" -doc: "https://anmonteiro.github.io/ocaml-h2/" -depends: [ - "ocaml" {>= "4.04"} - "dune" - "yojson" {with-test} - "hex" {with-test} - "angstrom" - "faraday" -] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -synopsis: - "An HPACK (Header Compression for HTTP/2) implementation in OCaml" -description: """ -hpack is an implementation of the HPACK: Header Compression for HTTP/2 -specification (RFC7541) written in OCaml. It uses Angstrom and Faraday for -parsing and serialization, respectively. -""" -url { - src: - "https://github.com/anmonteiro/ocaml-h2/releases/download/0.2.0/h2-0.2.0.tbz" - checksum: "md5=c883927ce8a9f3f7159ef7b20988f051" -} diff --git a/examples.esy.lock/opam/magic-mime.1.1.2/opam b/examples.esy.lock/opam/magic-mime.1.1.2/opam deleted file mode 100644 index 8e398fb3e..000000000 --- a/examples.esy.lock/opam/magic-mime.1.1.2/opam +++ /dev/null @@ -1,41 +0,0 @@ -opam-version: "2.0" -name: "magic-mime" -synopsis: "Map filenames to common MIME types" -description: """ -This library contains a database of MIME types that maps filename extensions -into MIME types suitable for use in many Internet protocols such as HTTP or -e-mail. It is generated from the `mime.types` file found in Unix systems, but -has no dependency on a filesystem since it includes the contents of the -database as an ML datastructure. - -For example, here's how to lookup MIME types in the [utop] REPL: - - #require "magic-mime";; - Magic_mime.lookup "/foo/bar.txt";; - - : bytes = "text/plain" - Magic_mime.lookup "bar.css";; - - : bytes = "text/css" -""" -maintainer: "Anil Madhavapeddy " -authors: ["Anil Madhavapeddy" "Maxence Guesdon"] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-magic-mime" -doc: "https://mirage.github.io/ocaml-magic-mime/" -bug-reports: "https://github.com/mirage/ocaml-magic-mime/issues" -dev-repo: "git+https://github.com/mirage/ocaml-magic-mime.git" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: - "https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz" - checksum: [ - "sha256=0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" - "sha512=8264db78adc2c75b8adabc23c26ad34eab98383bd3a8f2068f2236ff3425d653c0238fbd7361e55a3d70d843413ef8671b6e97293074b4d3a1e300628d5292ab" - ] -} diff --git a/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch deleted file mode 100644 index cda19dd2d..000000000 --- a/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Fri, 26 Jul 2019 12:12:19 +0100 -Subject: [PATCH] Don't build manpages for stdlib docs ---- - ocamldoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index b109815071..e31e441f61 100644 ---- a/ocamldoc/Makefile -+++ b/ocamldoc/Makefile -@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) - - - .PHONY: all --all: lib exe generators manpages -+all: lib exe generators - - manpages: generators - --- -2.20.1 - diff --git a/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch deleted file mode 100644 index 41f5f7704..000000000 --- a/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Tue, 6 Aug 2019 09:23:06 +0100 -Subject: [PATCH] Fix failure to install tools links - -In --disable-installing-bytecode-programs mode, the .opt version of the -tools is installed, but the symlink for the tool itself is not created. ---- - tools/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/Makefile b/tools/Makefile -index 530dd37f34..1b3014a3ab 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -197,6 +197,7 @@ else - do \ - if test -f "$$i".opt; then \ - $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ -+ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ - fi; \ - done - endif --- -2.20.1 - diff --git a/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch deleted file mode 100644 index e37b5e883..000000000 --- a/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3f10a16153308f967149917585d2bc0b9c06492c -Author: Anil Madhavapeddy -Date: Sun Jun 21 18:40:27 2020 +0100 - - Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build - - Signed-off-by: Anil Madhavapeddy - -diff --git a/configure b/configure -index 9a78a4554..0c54b560b 100755 ---- a/configure -+++ b/configure -@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( - gcc-*) : -- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings" ;; #( - msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" -diff --git a/configure.ac b/configure.ac -index f5d8a2687..775e0e2db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -540,7 +540,7 @@ AS_CASE([$host], - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings"], - [gcc-*], -- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings"], - [msvc-*], - [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam deleted file mode 100644 index 905f9b3dd..000000000 --- a/examples.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam +++ /dev/null @@ -1,51 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml 4.08.1 Secondary Switch Compiler" -maintainer: "platform@lists.ocaml.org" -authors: "Xavier Leroy and many contributors" -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml/ocaml/issues" -dev-repo: "git://github.com/ocaml/ocaml" -depends: "ocaml" {< "4.08.0" | >= "4.09~"} -build: [ - [ - "./configure" - "--prefix=%{_:share}%" - "--libdir=%{_:share}%/lib" - "--disable-debugger" - "--disable-installing-bytecode-programs" - "--disable-debug-runtime" - "--disable-instrumented-runtime" - "--disable-graph-lib" - "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} - "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} - ] - [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] -] -install: [make "install"] -url { - src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" - checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" -} -extra-files: [ - ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] - ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] - ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] -] -patches: [ - "0001-Don-t-build-manpages-for-stdlib-docs.patch" - "0001-Fix-failure-to-install-tools-links.patch" - "fix-gcc10.patch" -] - -post-messages: [ - "A failure in the middle of the build may be caused by build parallelism - (enabled by default). - Please file a bug report at https://github.com/ocaml/ocaml/issues" - {failure & jobs > 1 & os != "cygwin"} - "You can try installing again including --jobs=1 - to force a sequential build instead." - {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} -] -description: "Installs an additional compiler to the opam switch in -%{_:share}%/ocaml-secondary-compiler which can be accessed using -`ocamlfind -toolchain secondary`." diff --git a/examples.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam b/examples.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam deleted file mode 100644 index a814e1d2d..000000000 --- a/examples.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "Backport new syntax to older OCaml versions" -description: """ -This packages backports new features of the language to older -compilers, such as let+. -""" -maintainer: ["jeremie@dimino.org"] -authors: ["Jérémie Dimino "] -license: "MIT" -homepage: "https://github.com/ocaml-ppx/ocaml-syntax-shims" -doc: "https://ocaml-ppx.github.io/ocaml-syntax-shims/" -bug-reports: "https://github.com/ocaml-ppx/ocaml-syntax-shims/issues" -depends: [ - "dune" {>= "2.0"} - "ocaml" {>= "4.02.3"} -] -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-syntax-shims.git" -url { - src: - "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz" - checksum: [ - "sha256=89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" - "sha512=75c4c6b0bfa1267a8a49a82ba494d08cf0823fc8350863d6d3d4971528cb09e5a2a29e2981d04c75e76ad0f49360b05a432c9efeff9a4fbc1ec6b28960399852" - ] -} diff --git a/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in deleted file mode 100644 index 12e3ee661..000000000 --- a/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in +++ /dev/null @@ -1,3 +0,0 @@ -description = "OCaml Secondary Compiler" -version = "%{ocaml-secondary-compiler:version}%" -directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in deleted file mode 100644 index d13023c9f..000000000 --- a/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" -ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" -ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" -ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" -ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" -ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" -ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/opam deleted file mode 100644 index acdb57645..000000000 --- a/examples.esy.lock/opam/ocamlfind-secondary.1.8.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "David Allsopp " -homepage: "https://github.com/ocaml/opam-repository" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] -install: [ - [make "install-meta"] - ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] - ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] - ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] - ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] -] -depends: [ - "ocaml-secondary-compiler" - "ocamlfind" {= "1.8.1"} -] -synopsis: "ocamlfind support for ocaml-secondary-compiler" -description: """ -Exposes the compiler built by the ocaml-secondary-compielr package via --toolchain secondary. A virtual package called ocaml is also installed to -locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" -authors: ["Gerd Stolpmann " "David Allsopp "] -substs: ["META" "ocaml-secondary-compiler.conf"] -extra-files: [ - ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] - ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] -] -url { - src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" - checksum: "md5=18ca650982c15536616dea0e422cbd8c" - mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" -} diff --git a/examples.esy.lock/opam/stringext.1.6.0/opam b/examples.esy.lock/opam/stringext.1.6.0/opam deleted file mode 100644 index 5242fe31a..000000000 --- a/examples.esy.lock/opam/stringext.1.6.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "rudi.grinberg@gmail.com" -authors: "Rudi Grinberg" -license: "MIT" -homepage: "https://github.com/rgrinberg/stringext" -bug-reports: "https://github.com/rgrinberg/stringext/issues" -depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "1.0"} - "ounit" {with-test} - "qtest" {with-test & >= "2.2"} - "base-bytes" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -dev-repo: "git+https://github.com/rgrinberg/stringext.git" -synopsis: "Extra string functions for OCaml" -description: """ -Extra string functions for OCaml. Mainly splitting. All functions are in the -Stringext module. -""" -url { - src: - "https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz" - checksum: [ - "sha256=db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" - "sha512=d8ebe40f42b598a9bd99f1ef4b00ba93458385a4accd121af66a0bf3b3f8d7135f576740adf1a43081dd409977c2219fd4bdbb5b3d1308890d301d553ed49900" - ] -} diff --git a/examples.esy.lock/opam/uri.3.1.0/opam b/examples.esy.lock/opam/uri.3.1.0/opam deleted file mode 100644 index 45406b00a..000000000 --- a/examples.esy.lock/opam/uri.3.1.0/opam +++ /dev/null @@ -1,35 +0,0 @@ -opam-version: "2.0" -maintainer: "anil@recoil.org" -authors: ["Anil Madhavapeddy" "David Sheets" "Rudi Grinberg"] -license: "ISC" -tags: ["url" "uri" "org:mirage" "org:xapi-project"] -homepage: "https://github.com/mirage/ocaml-uri" -bug-reports: "https://github.com/mirage/ocaml-uri/issues" -dev-repo: "git+https://github.com/mirage/ocaml-uri.git" -doc: "https://mirage.github.io/ocaml-uri/" -synopsis: "An RFC3986 URI/URL parsing library" -description: """ -This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification -for parsing URI or URLs. -""" -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.2.0"} - "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} - "re" {>= "1.9.0"} - "stringext" {>= "1.4.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz" - checksum: [ - "sha256=c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" - "sha512=c015576bb077fd243022bcd8804e628d23a253dcd8bbdda8dc2a57e86cfeb9fd629087ec7d7e23dc71dd7cd137450ca2c5ecf8fb7d184ec9d1d4e41f6f83ee38" - ] -} diff --git a/examples.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json b/examples.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json deleted file mode 100644 index 312f6e01c..000000000 --- a/examples.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build": [ "true" ], - "dependencies": { - "esy-autoconf": "esy-packages/esy-autoconf#fb93edf" - } -} diff --git a/examples.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json b/examples.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json similarity index 94% rename from examples.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json rename to examples.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json index f2b2e9f48..affde1bc3 100644 --- a/examples.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json +++ b/examples.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json @@ -27,8 +27,5 @@ "buildEnv": { "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" - }, - "dependencies": { - "ocaml": "*" } } diff --git a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll deleted file mode 100755 index 26301ddd3..000000000 --- a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -# clone-flexdll -# -# Brings in flexdll, if necessary - -if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then - echo "[Flexdll] Already present, no need to clone." -else - echo "[Flexdll] Cloning..." - git clone https://github.com/esy-ocaml/flexdll.git - cd flexdll - git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff - cd .. - echo "[Flexdll] Clone successful!" -fi \ No newline at end of file diff --git a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows deleted file mode 100755 index 4040b49ea..000000000 --- a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -# configure-windows -# -# Creates a native Windows MingW build, based on: -# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc - - -export prefix=C:/ocamlmgw64 -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - esac - shift -done - -echo "[configure-windows] Setting up flexdll" -./clone-flexdll -./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix -make flexdll diff --git a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build deleted file mode 100755 index b95356a53..000000000 --- a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build +++ /dev/null @@ -1,24 +0,0 @@ -#! /usr/bin/env bash - -# esy-build -# -# Wrapper to execute appropriate build strategy, based on platform - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-build] Detected windows environment..." - make -j4 world.opt - make flexlink.opt - ;; - *) - echo "[esy-build] Detected OSX / Linux environment" - make -j4 world.opt - ;; -esac - -# Common build steps -make install \ No newline at end of file diff --git a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure deleted file mode 100755 index fd196c517..000000000 --- a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure +++ /dev/null @@ -1,29 +0,0 @@ -#! /usr/bin/env bash - -# esy-configure -# -# Wrapper to delegate to configuration to the -# appropriate `configure` strategy based on the active platform. -# -# Today, OCaml has separate build strategies: -# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc -# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc -# -# We want `esy` to work cross-platform, so this is a shim script that will delegate to the -# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` -# that the `mingw` (native executable) strategy is desired. - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-configure] Detected windows environment..." - ./configure-windows "$@" - ;; - *) - echo "[esy-configure] Detected OSX / Linux environment" - ./configure "$@" - ;; -esac \ No newline at end of file diff --git a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json deleted file mode 100644 index 948455caf..000000000 --- a/examples.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "buildEnv": { - "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - }, - "build": [ - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-configure", - "--disable-cfi", - "--prefix", "$cur__install/share/ocaml-secondary-compiler", - "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", - "--disable-debugger", - "--disable-installing-bytecode-programs", - "--disable-debug-runtime", - "--disable-instrumented-runtime", - "--disable-graph-lib" - ], - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-build" - ] - ], - "buildsInSource": true -} diff --git a/examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch deleted file mode 100644 index 3e3ee5a24..000000000 --- a/examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml diff --git a/examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh deleted file mode 100644 index c923ef49e..000000000 --- a/examples.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh +++ /dev/null @@ -1,14 +0,0 @@ -OCAML_SECONDARY_COMPILER=$1 - -cat >ocaml-secondary-compiler.conf <META <" -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/angstrom" -bug-reports: "https://github.com/inhabitedtype/angstrom/issues" -dev-repo: "git+https://github.com/inhabitedtype/angstrom.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.8.1"} - "bigstringaf" - "result" -] -synopsis: "Parser combinators built for speed and memory-efficiency" -description: """ -Angstrom is a parser-combinator library that makes it easy to write efficient, -expressive, and reusable parsers suitable for high-performance applications. It -exposes monadic and applicative interfaces for composition, and supports -incremental input through buffered and unbuffered interfaces. Both interfaces -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.14.1.tar.gz" - checksum: "md5=915bbcc1adbd0debc1b0a54531c7601a" -} diff --git a/js.esy.lock/opam/base64.3.4.0/opam b/js.esy.lock/opam/base64.3.4.0/opam deleted file mode 100644 index b4869cdfa..000000000 --- a/js.esy.lock/opam/base64.3.4.0/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "mirageos-devel@lists.xenproject.org" -authors: [ "Thomas Gazagnaire" - "Anil Madhavapeddy" "Calascibetta Romain" - "Peter Zotov" ] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-base64" -doc: "http://mirage.github.io/ocaml-base64/" -bug-reports: "https://github.com/mirage/ocaml-base64/issues" -dev-repo: "git+https://github.com/mirage/ocaml-base64.git" -synopsis: "Base64 encoding for OCaml" -description: """ -Base64 is a group of similar binary-to-text encoding schemes that represent -binary data in an ASCII string format by translating it into a radix-64 -representation. It is specified in RFC 4648. -""" -depends: [ - "ocaml" {>="4.03.0"} - "base-bytes" - "dune-configurator" - "dune" {>= "2.0"} - "bos" {with-test} - "rresult" {with-test} - "alcotest" {with-test} -] -build: [ - ["dune" "subst"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz" - checksum: [ - "sha256=1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" - "sha512=e66a67302a9eb136044bebf66a89a1d6e38a96c70622bb6cd27916fec36dcaf4b5b7e7d00c25608f0a2363f2ca4264a5fe765fe7747590958325dbce06311db9" - ] -} diff --git a/js.esy.lock/opam/bigarray-compat.1.0.0/opam b/js.esy.lock/opam/bigarray-compat.1.0.0/opam deleted file mode 100644 index 93751514d..000000000 --- a/js.esy.lock/opam/bigarray-compat.1.0.0/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -synopsis: "Compatibility library to use Stdlib.Bigarray when possible" -maintainer: "Lucas Pluvinage " -authors: "Lucas Pluvinage " -license: "ISC" -homepage: "https://github.com/mirage/bigarray-compat" -bug-reports: "https://github.com/mirage/bigarray-compat/issues" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" {>= "1.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -dev-repo: "git+https://github.com/mirage/bigarray-compat.git" -url { - src: "https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz" - checksum: [ - "md5=1cc7c25382a8900bada34aadfd66632e" - "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f" - ] -} \ No newline at end of file diff --git a/js.esy.lock/opam/bigstringaf.0.6.1/opam b/js.esy.lock/opam/bigstringaf.0.6.1/opam deleted file mode 100644 index b821673a0..000000000 --- a/js.esy.lock/opam/bigstringaf.0.6.1/opam +++ /dev/null @@ -1,43 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/bigstringaf" -bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues" -dev-repo: "git+https://github.com/inhabitedtype/bigstringaf.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "dune" {>= "1.0"} - "alcotest" {with-test} - "bigarray-compat" - "ocaml" {>= "4.03.0"} -] -depopts: [ - "mirage-xen-posix" - "ocaml-freestanding" -] -conflicts: [ - "mirage-xen-posix" {< "3.1.0"} - "ocaml-freestanding" {< "0.4.1"} - "js_of_ocaml" {< "3.5.0"} -] -synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove" -description: """ -Bigstring intrinsics and fast blits based on memcpy/memmove - -The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not -widely-known, sometimes misused, and so programs that use Bigstrings are slower -than they have to be. And even if a library got that part right and exposed the -intrinsics properly, the compiler doesn't have any fast blits between -Bigstrings and other string-like types. - -So here they are. Go crazy. -""" -url { - src: "https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz" - checksum: "md5=dccf639273b1eec0e0f142f21319268d" -} diff --git a/js.esy.lock/opam/charInfo_width.1.1.0/opam b/js.esy.lock/opam/charInfo_width.1.1.0/opam index dee626092..c88c2c9d4 100644 --- a/js.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/js.esy.lock/opam/charInfo_width.1.1.0/opam @@ -1,10 +1,10 @@ opam-version: "2.0" maintainer: "zandoye@gmail.com" authors: [ "ZAN DoYe" ] -homepage: "https://bitbucket.org/zandoye/charinfo_width/" -bug-reports: "https://bitbucket.org/zandoye/charinfo_width/issues" +homepage: "https://github.com/kandu/charinfo_width/" +bug-reports: "https://github.com/kandu/charinfo_width/issues" license: "MIT" -dev-repo: "hg+https://bitbucket.org/zandoye/charinfo_width" +dev-repo: "git://github.com/kandu/charinfo_width.git" build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test & (ocaml:version >= "4.04.0")} @@ -22,6 +22,6 @@ description: """ This module is implemented purely in OCaml and the width function follows the prototype of POSIX's wcwidth.""" url { - src:"https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz" - checksum: "md5=c4ab038e06f06a29692c05fdd7c268c5" + src:"https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz" + checksum: "md5=a539436d1da4aeb93711303f107bec7e" } diff --git a/js.esy.lock/opam/conf-autoconf.0.1/opam b/js.esy.lock/opam/conf-autoconf.0.1/opam deleted file mode 100644 index a538223d0..000000000 --- a/js.esy.lock/opam/conf-autoconf.0.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "unixjunkie@sdf.org" -homepage: "http://www.gnu.org/software/autoconf" -authors: "https://www.gnu.org/software/autoconf/autoconf.html#maintainer" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -license: "GPL-3.0" -build: [ - ["which" "autoconf"] -] -depends: ["conf-which" {build}] -depexts: [ - ["autoconf"] {os-family = "debian"} - ["autoconf"] {os-distribution = "centos"} - ["autoconf"] {os-distribution = "fedora"} - ["autoconf"] {os-distribution = "arch"} - ["sys-devel/autoconf"] {os-distribution = "gentoo"} - ["autoconf"] {os-distribution = "nixos"} - ["autoconf"] {os = "macos" & os-distribution = "homebrew"} - ["devel/autoconf"] {os = "openbsd"} - ["autoconf"] {os = "freebsd"} - ["autoconf"] {os = "netbsd"} - ["autoconf"] {os-distribution = "alpine"} - ["autoconf"] {os-distribution = "ol"} - ["autoconf"] {os-distribution = "rhel"} -] -synopsis: "Virtual package relying on autoconf installation" -description: """ -This package can only install if the autoconf command -is available on the system.""" -flags: conf diff --git a/js.esy.lock/opam/dune-build-info.2.6.2/opam b/js.esy.lock/opam/dune-build-info.2.6.2/opam deleted file mode 100644 index a0dfa6442..000000000 --- a/js.esy.lock/opam/dune-build-info.2.6.2/opam +++ /dev/null @@ -1,40 +0,0 @@ -opam-version: "2.0" -synopsis: "Embed build informations inside executable" -description: """ -The build-info library allows to access information about how the -executable was built, such as the version of the project at which it -was built or the list of statically linked libraries with their -versions. It supports reporting the version from the version control -system during development to get an precise reference of when the -executable was built. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.5"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/js.esy.lock/opam/dune-build-info.2.7.0/opam b/js.esy.lock/opam/dune-build-info.2.7.0/opam new file mode 100644 index 000000000..ea2f6aa11 --- /dev/null +++ b/js.esy.lock/opam/dune-build-info.2.7.0/opam @@ -0,0 +1,41 @@ +opam-version: "2.0" +synopsis: "Embed build informations inside executable" +description: """ +The build-info library allows to access information about how the +executable was built, such as the version of the project at which it +was built or the list of statically linked libraries with their +versions. It supports reporting the version from the version control +system during development to get an precise reference of when the +executable was built. +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +depends: [ + "dune" {>= "2.7"} + "odoc" {with-doc} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" + checksum: [ + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" + ] +} diff --git a/js.esy.lock/opam/dune-configurator.2.6.2/opam b/js.esy.lock/opam/dune-configurator.2.6.2/opam deleted file mode 100644 index 9ae7729b7..000000000 --- a/js.esy.lock/opam/dune-configurator.2.6.2/opam +++ /dev/null @@ -1,43 +0,0 @@ -opam-version: "2.0" -synopsis: "Helper library for gathering system configuration" -description: """ -dune-configurator is a small library that helps writing OCaml scripts that -test features available on the system, in order to generate config.h -files for instance. -Among other things, dune-configurator allows one to: -- test if a C program compiles -- query pkg-config -- import #define from OCaml header files -- generate config.h file -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.6"} - "dune-private-libs" {= version} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/js.esy.lock/opam/dune-configurator.2.7.0/opam b/js.esy.lock/opam/dune-configurator.2.7.0/opam new file mode 100644 index 000000000..a247cb8d8 --- /dev/null +++ b/js.esy.lock/opam/dune-configurator.2.7.0/opam @@ -0,0 +1,44 @@ +opam-version: "2.0" +synopsis: "Helper library for gathering system configuration" +description: """ +dune-configurator is a small library that helps writing OCaml scripts that +test features available on the system, in order to generate config.h +files for instance. +Among other things, dune-configurator allows one to: +- test if a C program compiles +- query pkg-config +- import #define from OCaml header files +- generate config.h file +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +depends: [ + "ocaml" {>= "4.03.0"} + "dune" {>= "2.7" & >= "2.6.0"} + "odoc" {with-doc} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" + checksum: [ + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" + ] +} diff --git a/js.esy.lock/opam/dune-private-libs.2.6.2/opam b/js.esy.lock/opam/dune-private-libs.2.6.2/opam deleted file mode 100644 index f62a0a2fe..000000000 --- a/js.esy.lock/opam/dune-private-libs.2.6.2/opam +++ /dev/null @@ -1,42 +0,0 @@ -opam-version: "2.0" -synopsis: "Private libraries of Dune" -description: """ -!!!!!!!!!!!!!!!!!!!!!! -!!!!! DO NOT USE !!!!! -!!!!!!!!!!!!!!!!!!!!!! - -This package contains code that is shared between various dune-xxx -packages. However, it is not meant for public consumption and provides -no stability guarantee. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.5"} - "ocaml" {>= "4.07"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/js.esy.lock/opam/dune.2.6.2/opam b/js.esy.lock/opam/dune.2.6.2/opam deleted file mode 100644 index 655fb0111..000000000 --- a/js.esy.lock/opam/dune.2.6.2/opam +++ /dev/null @@ -1,55 +0,0 @@ -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 -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 -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. - -It also supports multi-context builds, such as building against -several opam roots/switches simultaneously. This helps maintaining -packages across several versions of OCaml and gives cross-compilation -for free. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -conflicts: [ - "dune-configurator" {< "2.3.0"} - "odoc" {< "1.3.0"} - "dune-release" {< "1.3.0"} - "js_of_ocaml-compiler" {< "3.6.0"} - "jbuilder" {= "transition"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path - ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} - ["ocaml" "bootstrap.ml" "-j" jobs] - ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] -] -depends: [ - # Please keep the lower bound in sync with .travis.yml, dune-project - # and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) - "base-unix" - "base-threads" -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/js.esy.lock/opam/dune.2.7.0/opam b/js.esy.lock/opam/dune.2.7.0/opam new file mode 100644 index 000000000..c4b160031 --- /dev/null +++ b/js.esy.lock/opam/dune.2.7.0/opam @@ -0,0 +1,55 @@ +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 +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 +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. + +It also supports multi-context builds, such as building against +several opam roots/switches simultaneously. This helps maintaining +packages across several versions of OCaml and gives cross-compilation +for free. +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +conflicts: [ + "dune-configurator" {< "2.3.0"} + "odoc" {< "1.3.0"} + "dune-release" {< "1.3.0"} + "js_of_ocaml-compiler" {< "3.6.0"} + "jbuilder" {= "transition"} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path + ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} + ["ocaml" "bootstrap.ml" "-j" jobs] + ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] +] +depends: [ + # Please keep the lower bound in sync with .travis.yml, dune-project + # and min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) + "base-unix" + "base-threads" +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" + checksum: [ + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" + ] +} diff --git a/js.esy.lock/opam/faraday-lwt-unix.0.7.1/opam b/js.esy.lock/opam/faraday-lwt-unix.0.7.1/opam deleted file mode 100644 index 3cc8377eb..000000000 --- a/js.esy.lock/opam/faraday-lwt-unix.0.7.1/opam +++ /dev/null @@ -1,24 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday-lwt" - "lwt" {>= "2.7.0"} - "base-unix" -] -synopsis: "Lwt_unix support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/js.esy.lock/opam/faraday-lwt.0.7.1/opam b/js.esy.lock/opam/faraday-lwt.0.7.1/opam deleted file mode 100644 index 4e68d3097..000000000 --- a/js.esy.lock/opam/faraday-lwt.0.7.1/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday" {>= "0.5.0"} - "lwt" -] -synopsis: "Lwt support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/js.esy.lock/opam/faraday.0.7.1/opam b/js.esy.lock/opam/faraday.0.7.1/opam deleted file mode 100644 index a20e6942e..000000000 --- a/js.esy.lock/opam/faraday.0.7.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.4.1"} - "bigstringaf" -] -synopsis: "A library for writing fast and memory-efficient serializers." -description: """ -Faraday is a library for writing fast and memory-efficient serializers. Its -core type and related operation gives the user fine-grained control over -copying and allocation behavior while serializing user-defined types, and -presents the output in a form that makes it possible to use vectorized write -operations, such as the writev system call, or any other platform or -application-specific output APIs.""" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/js.esy.lock/opam/hpack.0.2.0/opam b/js.esy.lock/opam/hpack.0.2.0/opam deleted file mode 100644 index b09cf7cbe..000000000 --- a/js.esy.lock/opam/hpack.0.2.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "Antonio Nuno Monteiro " -authors: [ "Pieter Goetschalckx <3.14.e.ter@gmail.com>" - "Antonio Nuno Monteiro " ] -license: "BSD-3-Clause" -homepage: "https://github.com/anmonteiro/ocaml-h2" -bug-reports: "https://github.com/anmonteiro/ocaml-h2/issues" -dev-repo: "git+https://github.com/anmonteiro/ocaml-h2.git" -doc: "https://anmonteiro.github.io/ocaml-h2/" -depends: [ - "ocaml" {>= "4.04"} - "dune" - "yojson" {with-test} - "hex" {with-test} - "angstrom" - "faraday" -] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -synopsis: - "An HPACK (Header Compression for HTTP/2) implementation in OCaml" -description: """ -hpack is an implementation of the HPACK: Header Compression for HTTP/2 -specification (RFC7541) written in OCaml. It uses Angstrom and Faraday for -parsing and serialization, respectively. -""" -url { - src: - "https://github.com/anmonteiro/ocaml-h2/releases/download/0.2.0/h2-0.2.0.tbz" - checksum: "md5=c883927ce8a9f3f7159ef7b20988f051" -} diff --git a/js.esy.lock/opam/magic-mime.1.1.2/opam b/js.esy.lock/opam/magic-mime.1.1.2/opam deleted file mode 100644 index 8e398fb3e..000000000 --- a/js.esy.lock/opam/magic-mime.1.1.2/opam +++ /dev/null @@ -1,41 +0,0 @@ -opam-version: "2.0" -name: "magic-mime" -synopsis: "Map filenames to common MIME types" -description: """ -This library contains a database of MIME types that maps filename extensions -into MIME types suitable for use in many Internet protocols such as HTTP or -e-mail. It is generated from the `mime.types` file found in Unix systems, but -has no dependency on a filesystem since it includes the contents of the -database as an ML datastructure. - -For example, here's how to lookup MIME types in the [utop] REPL: - - #require "magic-mime";; - Magic_mime.lookup "/foo/bar.txt";; - - : bytes = "text/plain" - Magic_mime.lookup "bar.css";; - - : bytes = "text/css" -""" -maintainer: "Anil Madhavapeddy " -authors: ["Anil Madhavapeddy" "Maxence Guesdon"] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-magic-mime" -doc: "https://mirage.github.io/ocaml-magic-mime/" -bug-reports: "https://github.com/mirage/ocaml-magic-mime/issues" -dev-repo: "git+https://github.com/mirage/ocaml-magic-mime.git" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: - "https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz" - checksum: [ - "sha256=0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" - "sha512=8264db78adc2c75b8adabc23c26ad34eab98383bd3a8f2068f2236ff3425d653c0238fbd7361e55a3d70d843413ef8671b6e97293074b4d3a1e300628d5292ab" - ] -} diff --git a/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch deleted file mode 100644 index cda19dd2d..000000000 --- a/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Fri, 26 Jul 2019 12:12:19 +0100 -Subject: [PATCH] Don't build manpages for stdlib docs ---- - ocamldoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index b109815071..e31e441f61 100644 ---- a/ocamldoc/Makefile -+++ b/ocamldoc/Makefile -@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) - - - .PHONY: all --all: lib exe generators manpages -+all: lib exe generators - - manpages: generators - --- -2.20.1 - diff --git a/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch deleted file mode 100644 index 41f5f7704..000000000 --- a/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Tue, 6 Aug 2019 09:23:06 +0100 -Subject: [PATCH] Fix failure to install tools links - -In --disable-installing-bytecode-programs mode, the .opt version of the -tools is installed, but the symlink for the tool itself is not created. ---- - tools/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/Makefile b/tools/Makefile -index 530dd37f34..1b3014a3ab 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -197,6 +197,7 @@ else - do \ - if test -f "$$i".opt; then \ - $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ -+ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ - fi; \ - done - endif --- -2.20.1 - diff --git a/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch deleted file mode 100644 index e37b5e883..000000000 --- a/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3f10a16153308f967149917585d2bc0b9c06492c -Author: Anil Madhavapeddy -Date: Sun Jun 21 18:40:27 2020 +0100 - - Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build - - Signed-off-by: Anil Madhavapeddy - -diff --git a/configure b/configure -index 9a78a4554..0c54b560b 100755 ---- a/configure -+++ b/configure -@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( - gcc-*) : -- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings" ;; #( - msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" -diff --git a/configure.ac b/configure.ac -index f5d8a2687..775e0e2db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -540,7 +540,7 @@ AS_CASE([$host], - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings"], - [gcc-*], -- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings"], - [msvc-*], - [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam deleted file mode 100644 index 905f9b3dd..000000000 --- a/js.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam +++ /dev/null @@ -1,51 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml 4.08.1 Secondary Switch Compiler" -maintainer: "platform@lists.ocaml.org" -authors: "Xavier Leroy and many contributors" -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml/ocaml/issues" -dev-repo: "git://github.com/ocaml/ocaml" -depends: "ocaml" {< "4.08.0" | >= "4.09~"} -build: [ - [ - "./configure" - "--prefix=%{_:share}%" - "--libdir=%{_:share}%/lib" - "--disable-debugger" - "--disable-installing-bytecode-programs" - "--disable-debug-runtime" - "--disable-instrumented-runtime" - "--disable-graph-lib" - "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} - "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} - ] - [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] -] -install: [make "install"] -url { - src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" - checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" -} -extra-files: [ - ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] - ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] - ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] -] -patches: [ - "0001-Don-t-build-manpages-for-stdlib-docs.patch" - "0001-Fix-failure-to-install-tools-links.patch" - "fix-gcc10.patch" -] - -post-messages: [ - "A failure in the middle of the build may be caused by build parallelism - (enabled by default). - Please file a bug report at https://github.com/ocaml/ocaml/issues" - {failure & jobs > 1 & os != "cygwin"} - "You can try installing again including --jobs=1 - to force a sequential build instead." - {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} -] -description: "Installs an additional compiler to the opam switch in -%{_:share}%/ocaml-secondary-compiler which can be accessed using -`ocamlfind -toolchain secondary`." diff --git a/js.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam b/js.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam deleted file mode 100644 index a814e1d2d..000000000 --- a/js.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "Backport new syntax to older OCaml versions" -description: """ -This packages backports new features of the language to older -compilers, such as let+. -""" -maintainer: ["jeremie@dimino.org"] -authors: ["Jérémie Dimino "] -license: "MIT" -homepage: "https://github.com/ocaml-ppx/ocaml-syntax-shims" -doc: "https://ocaml-ppx.github.io/ocaml-syntax-shims/" -bug-reports: "https://github.com/ocaml-ppx/ocaml-syntax-shims/issues" -depends: [ - "dune" {>= "2.0"} - "ocaml" {>= "4.02.3"} -] -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-syntax-shims.git" -url { - src: - "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz" - checksum: [ - "sha256=89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" - "sha512=75c4c6b0bfa1267a8a49a82ba494d08cf0823fc8350863d6d3d4971528cb09e5a2a29e2981d04c75e76ad0f49360b05a432c9efeff9a4fbc1ec6b28960399852" - ] -} diff --git a/js.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/js.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in deleted file mode 100644 index 12e3ee661..000000000 --- a/js.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in +++ /dev/null @@ -1,3 +0,0 @@ -description = "OCaml Secondary Compiler" -version = "%{ocaml-secondary-compiler:version}%" -directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/js.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/js.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in deleted file mode 100644 index d13023c9f..000000000 --- a/js.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" -ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" -ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" -ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" -ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" -ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" -ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/js.esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/js.esy.lock/opam/ocamlfind-secondary.1.8.1/opam deleted file mode 100644 index acdb57645..000000000 --- a/js.esy.lock/opam/ocamlfind-secondary.1.8.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "David Allsopp " -homepage: "https://github.com/ocaml/opam-repository" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] -install: [ - [make "install-meta"] - ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] - ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] - ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] - ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] -] -depends: [ - "ocaml-secondary-compiler" - "ocamlfind" {= "1.8.1"} -] -synopsis: "ocamlfind support for ocaml-secondary-compiler" -description: """ -Exposes the compiler built by the ocaml-secondary-compielr package via --toolchain secondary. A virtual package called ocaml is also installed to -locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" -authors: ["Gerd Stolpmann " "David Allsopp "] -substs: ["META" "ocaml-secondary-compiler.conf"] -extra-files: [ - ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] - ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] -] -url { - src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" - checksum: "md5=18ca650982c15536616dea0e422cbd8c" - mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" -} diff --git a/js.esy.lock/opam/stringext.1.6.0/opam b/js.esy.lock/opam/stringext.1.6.0/opam deleted file mode 100644 index 5242fe31a..000000000 --- a/js.esy.lock/opam/stringext.1.6.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "rudi.grinberg@gmail.com" -authors: "Rudi Grinberg" -license: "MIT" -homepage: "https://github.com/rgrinberg/stringext" -bug-reports: "https://github.com/rgrinberg/stringext/issues" -depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "1.0"} - "ounit" {with-test} - "qtest" {with-test & >= "2.2"} - "base-bytes" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -dev-repo: "git+https://github.com/rgrinberg/stringext.git" -synopsis: "Extra string functions for OCaml" -description: """ -Extra string functions for OCaml. Mainly splitting. All functions are in the -Stringext module. -""" -url { - src: - "https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz" - checksum: [ - "sha256=db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" - "sha512=d8ebe40f42b598a9bd99f1ef4b00ba93458385a4accd121af66a0bf3b3f8d7135f576740adf1a43081dd409977c2219fd4bdbb5b3d1308890d301d553ed49900" - ] -} diff --git a/js.esy.lock/opam/uri.3.1.0/opam b/js.esy.lock/opam/uri.3.1.0/opam deleted file mode 100644 index 45406b00a..000000000 --- a/js.esy.lock/opam/uri.3.1.0/opam +++ /dev/null @@ -1,35 +0,0 @@ -opam-version: "2.0" -maintainer: "anil@recoil.org" -authors: ["Anil Madhavapeddy" "David Sheets" "Rudi Grinberg"] -license: "ISC" -tags: ["url" "uri" "org:mirage" "org:xapi-project"] -homepage: "https://github.com/mirage/ocaml-uri" -bug-reports: "https://github.com/mirage/ocaml-uri/issues" -dev-repo: "git+https://github.com/mirage/ocaml-uri.git" -doc: "https://mirage.github.io/ocaml-uri/" -synopsis: "An RFC3986 URI/URL parsing library" -description: """ -This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification -for parsing URI or URLs. -""" -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.2.0"} - "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} - "re" {>= "1.9.0"} - "stringext" {>= "1.4.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz" - checksum: [ - "sha256=c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" - "sha512=c015576bb077fd243022bcd8804e628d23a253dcd8bbdda8dc2a57e86cfeb9fd629087ec7d7e23dc71dd7cd137450ca2c5ecf8fb7d184ec9d1d4e41f6f83ee38" - ] -} diff --git a/js.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json b/js.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json deleted file mode 100644 index 312f6e01c..000000000 --- a/js.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build": [ "true" ], - "dependencies": { - "esy-autoconf": "esy-packages/esy-autoconf#fb93edf" - } -} diff --git a/js.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json b/js.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json deleted file mode 100644 index f2b2e9f48..000000000 --- a/js.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "buildsInSource": true, - "build": [ - [ - "ocaml", - "configure.ml", - "--libdir", - "#{self.lib}" - ], - [ - "env", - "-u", - "OCAMLLIB", - "ocaml", - "bootstrap.ml" - ], - [ - "./dune.exe", - "build", - "-p", - "dune", - "--profile", - "dune-bootstrap" - ] - ], - "install": "esy-installer dune.install", - "buildEnv": { - "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", - "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" - }, - "dependencies": { - "ocaml": "*" - } -} diff --git a/js.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json b/js.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json new file mode 100644 index 000000000..affde1bc3 --- /dev/null +++ b/js.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json @@ -0,0 +1,31 @@ +{ + "buildsInSource": true, + "build": [ + [ + "ocaml", + "configure.ml", + "--libdir", + "#{self.lib}" + ], + [ + "env", + "-u", + "OCAMLLIB", + "ocaml", + "bootstrap.ml" + ], + [ + "./dune.exe", + "build", + "-p", + "dune", + "--profile", + "dune-bootstrap" + ] + ], + "install": "esy-installer dune.install", + "buildEnv": { + "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", + "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" + } +} diff --git a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll deleted file mode 100755 index 26301ddd3..000000000 --- a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -# clone-flexdll -# -# Brings in flexdll, if necessary - -if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then - echo "[Flexdll] Already present, no need to clone." -else - echo "[Flexdll] Cloning..." - git clone https://github.com/esy-ocaml/flexdll.git - cd flexdll - git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff - cd .. - echo "[Flexdll] Clone successful!" -fi \ No newline at end of file diff --git a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows deleted file mode 100755 index 4040b49ea..000000000 --- a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -# configure-windows -# -# Creates a native Windows MingW build, based on: -# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc - - -export prefix=C:/ocamlmgw64 -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - esac - shift -done - -echo "[configure-windows] Setting up flexdll" -./clone-flexdll -./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix -make flexdll diff --git a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build deleted file mode 100755 index b95356a53..000000000 --- a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build +++ /dev/null @@ -1,24 +0,0 @@ -#! /usr/bin/env bash - -# esy-build -# -# Wrapper to execute appropriate build strategy, based on platform - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-build] Detected windows environment..." - make -j4 world.opt - make flexlink.opt - ;; - *) - echo "[esy-build] Detected OSX / Linux environment" - make -j4 world.opt - ;; -esac - -# Common build steps -make install \ No newline at end of file diff --git a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure deleted file mode 100755 index fd196c517..000000000 --- a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure +++ /dev/null @@ -1,29 +0,0 @@ -#! /usr/bin/env bash - -# esy-configure -# -# Wrapper to delegate to configuration to the -# appropriate `configure` strategy based on the active platform. -# -# Today, OCaml has separate build strategies: -# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc -# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc -# -# We want `esy` to work cross-platform, so this is a shim script that will delegate to the -# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` -# that the `mingw` (native executable) strategy is desired. - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-configure] Detected windows environment..." - ./configure-windows "$@" - ;; - *) - echo "[esy-configure] Detected OSX / Linux environment" - ./configure "$@" - ;; -esac \ No newline at end of file diff --git a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json deleted file mode 100644 index 948455caf..000000000 --- a/js.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "buildEnv": { - "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - }, - "build": [ - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-configure", - "--disable-cfi", - "--prefix", "$cur__install/share/ocaml-secondary-compiler", - "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", - "--disable-debugger", - "--disable-installing-bytecode-programs", - "--disable-debug-runtime", - "--disable-instrumented-runtime", - "--disable-graph-lib" - ], - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-build" - ] - ], - "buildsInSource": true -} diff --git a/js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch deleted file mode 100644 index 3e3ee5a24..000000000 --- a/js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml diff --git a/js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh deleted file mode 100644 index c923ef49e..000000000 --- a/js.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh +++ /dev/null @@ -1,14 +0,0 @@ -OCAML_SECONDARY_COMPILER=$1 - -cat >ocaml-secondary-compiler.conf <META < ".apng" - | "image/bmp" => ".bmp" - | "image/gif" => ".gif" - | "image/x-icon" => ".ico" - | "image/jpeg" => ".jpg" - | "image/jpg" => ".jpg" - | "image/png" => ".png" - | "image/svg+xml" => ".svg" - | "image/tiff" => ".tif" - | "image/webp" => ".webp" - | _ => ".jpg"; - - let textToAlphaNumeric = text => - Str.(global_replace(regexp("[^a-zA-Z0-9_]"), "", text)); - - let createFilePath = (url, ~fileExtension) => { - let fileNameCleaned = - Fpath.( - append( - v(Environment.getTempDirectory()), - v(textToAlphaNumeric(url)), - ) - ); - - let filePath = Fpath.add_ext(fileExtension, fileNameCleaned); - - Fpath.to_string(filePath); - }; + // let mediaTypeToFileExtension = + // fun + // | "image/apng" => ".apng" + // | "image/bmp" => ".bmp" + // | "image/gif" => ".gif" + // | "image/x-icon" => ".ico" + // | "image/jpeg" => ".jpg" + // | "image/jpg" => ".jpg" + // | "image/png" => ".png" + // | "image/svg+xml" => ".svg" + // | "image/tiff" => ".tif" + // | "image/webp" => ".webp" + // | _ => ".jpg"; + // let textToAlphaNumeric = text => + // Str.(global_replace(regexp("[^a-zA-Z0-9_]"), "", text)); + // let createFilePath = (url, ~fileExtension) => { + // let fileNameCleaned = + // Fpath.( + // append( + // v(Environment.getTempDirectory()), + // v(textToAlphaNumeric(url)), + // ) + // ); + // + // let filePath = Fpath.add_ext(fileExtension, fileNameCleaned); + // + // Fpath.to_string(filePath); + // }; }; // NOTE: The reason for these different states is to hold up any // additional requests until we've actually got a response // from the first one -type urlCacheItem = - | Image(option(Skia.Image.t)) - | Pending; +//type urlCacheItem = +// | Image(option(Skia.Image.t)) +// | Pending; -type urlCache = Hashtbl.t(string, urlCacheItem); -let urlContextCache: urlCache = Hashtbl.create(100); +//type urlCache = Hashtbl.t(string, urlCacheItem); +//let urlContextCache: urlCache = Hashtbl.create(100); // NOTE: These could be moved elsewhere -let fromUrl = url => { - let cacheResult = Hashtbl.find_opt(urlContextCache, url); - - let.flatMap result = - switch (cacheResult) { - | Some(result) => - switch (result) { - | Image(maybeImage) => Lwt.return(Ok(maybeImage)) - | Pending => Lwt.return(Ok(None)) - } - | None => - Hashtbl.replace(urlContextCache, url, Pending); - open Fetch; - - let.flatMapOk {Response.body, headers, _} = get(url); - - let data = Body.toString(body); - let mediaType = - headers - |> List.find_opt(((k, _v)) => - String.lowercase_ascii(k) == "content-type" - ) - |> Option.map(((_k, v)) => v) - |> Option.value(~default=""); - - let fileExtension = Internal.mediaTypeToFileExtension(mediaType); - let fileName = Internal.createFilePath(url, ~fileExtension); - - let.flatMapOk _writeOk = File.write(~path=fileName, data); - let maybeData = Skia.Data.makeFromFileName(fileName); - let.flatMapOk _deleted = File.delete(fileName); - - let maybeSkiaImage = - Option.bind(maybeData, data => - Skia.Image.makeFromEncoded(data, None) - ); - - Hashtbl.replace(urlContextCache, url, Image(maybeSkiaImage)); - - Lwt.return(Ok(maybeSkiaImage)); - }; - - Lwt.return(Result.value(result, ~default=None)); -}; +//let fromUrl = url => { +// let cacheResult = Hashtbl.find_opt(urlContextCache, url); +// +// let.flatMap result = +// switch (cacheResult) { +// | Some(result) => +// switch (result) { +// | Image(maybeImage) => Lwt.return(Ok(maybeImage)) +// | Pending => Lwt.return(Ok(None)) +// } +// | None => +// Hashtbl.replace(urlContextCache, url, Pending); +// open Fetch; +// +// let.flatMapOk {Response.body, headers, _} = get(url); +// +// let data = Body.toString(body); +// let mediaType = +// headers +// |> List.find_opt(((k, _v)) => +// String.lowercase_ascii(k) == "content-type" +// ) +// |> Option.map(((_k, v)) => v) +// |> Option.value(~default=""); +// +// let fileExtension = Internal.mediaTypeToFileExtension(mediaType); +// let fileName = Internal.createFilePath(url, ~fileExtension); +// +// let.flatMapOk _writeOk = File.write(~path=fileName, data); +// let maybeData = Skia.Data.makeFromFileName(fileName); +// let.flatMapOk _deleted = File.delete(fileName); +// +// let maybeSkiaImage = +// Option.bind(maybeData, data => +// Skia.Image.makeFromEncoded(data, None) +// ); +// +// Hashtbl.replace(urlContextCache, url, Image(maybeSkiaImage)); +// +// Lwt.return(Ok(maybeSkiaImage)); +// }; +// +// Lwt.return(Result.value(result, ~default=None)); +//}; type cache = Hashtbl.t(string, option(Skia.Image.t)); let contextCache: cache = Hashtbl.create(100); diff --git a/src/IO/Image.rei b/src/IO/Image.rei index 5b2af34a7..2bba02d67 100644 --- a/src/IO/Image.rei +++ b/src/IO/Image.rei @@ -6,7 +6,7 @@ * Examples: * let maybeImage: Lwt.t(option(Skia.Image.t)) = Image.fromUrl("https://example.com/hello.png"); */ -let fromUrl: string => Lwt.t(option(Skia.Image.t)); +// let fromUrl: string => Lwt.t(option(Skia.Image.t)); /** * fromAssetPath diff --git a/src/IO/dune b/src/IO/dune index 0cd24f11e..6679b294f 100644 --- a/src/IO/dune +++ b/src/IO/dune @@ -2,4 +2,4 @@ (name Revery_IO) (public_name Revery.IO) (preprocess (pps lwt_ppx)) - (libraries bos lwt lwt.unix Revery_Core uri fetch-native-lwt)) + (libraries bos lwt lwt.unix Revery_Core)) diff --git a/src/SVG/Parser.re b/src/SVG/Parser.re index 4a49e721d..254b87442 100644 --- a/src/SVG/Parser.re +++ b/src/SVG/Parser.re @@ -49,7 +49,7 @@ let coordinates = str => { accept(); Buffer.add_char(buffer, ch); } - | ('0'..'9' | '.') as ch => Buffer.add_char(buffer, ch) + | ('0' .. '9' | '.') as ch => Buffer.add_char(buffer, ch) | '\t' | ' ' | '\n' @@ -120,7 +120,7 @@ let pathCommands = str => { let acc = accept(arg, acc); number_postDot(acc, i + 1); - | '0'..'9' => + | '0' .. '9' => push(i); number_preDot(acc, i + 1); @@ -146,7 +146,7 @@ let pathCommands = str => { push(i); number_postDot(acc, i + 1); - | '0'..'9' => + | '0' .. '9' => push(i); number_preDot(acc, i + 1); @@ -161,7 +161,7 @@ let pathCommands = str => { and number_postDot = (acc, i) => switch (str.[i]) { - | '0'..'9' => + | '0' .. '9' => push(i); number_postDot(acc, i + 1); @@ -188,7 +188,7 @@ let pathCommands = str => { and exponent = (acc, i) => switch (str.[i]) { - | '0'..'9' => + | '0' .. '9' => push(i); exponent(acc, i + 1); diff --git a/src/UI_Components/Markdown.re b/src/UI_Components/Markdown.re index 7a77fe07f..96067a210 100644 --- a/src/UI_Components/Markdown.re +++ b/src/UI_Components/Markdown.re @@ -423,7 +423,7 @@ and generateCodeBlock = // Otherwise, stop at the end of the string. let endIndex = switch (List.nth_opt(highlight, i + 1)) { - | Some((blk: SyntaxHighlight.highlight)) => blk.byteIndex + | Some(blk: SyntaxHighlight.highlight) => blk.byteIndex | None => String.length(line) }; let length = endIndex - block.byteIndex; diff --git a/src/UI_Primitives/Image.re b/src/UI_Primitives/Image.re index aac4b688d..8472ce745 100644 --- a/src/UI_Primitives/Image.re +++ b/src/UI_Primitives/Image.re @@ -1,6 +1,6 @@ open Revery_UI; open React; -open Revery_IO.LwtLetOperators; +//open Revery_IO.LwtLetOperators; let getStyles: (option(int), option(int), Style.t) => Style.t = (w, h, style) => { @@ -30,7 +30,7 @@ let%nativeComponent make = ~width=?, ~height=?, ~quality=`high, - ~src: [ | `File(string) | `Url(string)], + ~src: [ | `File(string)], ~style=Style.emptyImageStyle, ~children=React.empty, (), @@ -75,10 +75,10 @@ let%nativeComponent make = ignore( switch (src) { - | `Url(url) => - let.flatMap image = Revery_IO.Image.fromUrl(url); - imgNode#setData(image); - Lwt.return(); + // | `Url(url) => + // let.flatMap image = Revery_IO.Image.fromUrl(url); + // imgNode#setData(image); + // Lwt.return(); | `File(path) => let maybeSkiaImage = Revery_IO.Image.fromAssetPath(path); imgNode#setData(maybeSkiaImage); diff --git a/src/UI_Primitives/Image.rei b/src/UI_Primitives/Image.rei index ecd5dbc99..721700b43 100644 --- a/src/UI_Primitives/Image.rei +++ b/src/UI_Primitives/Image.rei @@ -20,7 +20,7 @@ let make: ~width: int=?, ~height: int=?, ~quality: [ | `none | `low | `medium | `high]=?, - ~src: [ | `File(string) | `Url(string)], + ~src: [ | `File(string)], ~style: list(Revery_UI.Style.imageStyleProps)=?, ~children: Revery_UI.React.React.element(Revery_UI.React.node)=?, unit diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json index 3d1ba5639..ced70020e 100644 --- a/test.esy.lock/index.json +++ b/test.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "87ce551486030403915cda9ace965ca8", + "checksum": "79e4474b970c21efa5bb4a2d29cb4d18", "root": "revery@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -32,7 +32,7 @@ "reperf@1.5.0@d41d8cd9", "rench@1.9.1@d41d8cd9", "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9", - "flex@1.2.3@d41d8cd9", "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", + "flex@1.2.3@d41d8cd9", "esy-skia@github:revery-ui/esy-skia#a3785f9@d41d8cd9", "esy-sdl2@2.0.10008@d41d8cd9", "esy-freetype2@2.9.1008@d41d8cd9", "esy-angle-prebuilt@1.0.0@d41d8cd9", @@ -45,12 +45,12 @@ "@opam/markup@opam:0.8.2@87975241", "@opam/lwt_ppx@opam:2.0.1@e6a764a0", "@opam/lwt@opam:4.5.0@677655b4", "@opam/lru@github:bryphe/lru:lru.opam#2708c70@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/ctypes@opam:0.15.1@b0227b2f", - "@opam/charInfo_width@opam:1.1.0@b400bb29", + "@opam/charInfo_width@opam:1.1.0@4296bdfe", "@opam/bos@opam:0.2.0@df49e63f", "@glennsl/timber@1.2.0@d41d8cd9", - "@esy-ocaml/reason@3.6.0@d41d8cd9", + "@esy-ocaml/reason@3.6.2@d41d8cd9", "@brisk/brisk-reconciler@github:briskml/brisk-reconciler#10cab2d@d41d8cd9" ], "devDependencies": [ @@ -73,8 +73,8 @@ "dependencies": [ "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/printbox@opam:0.5@82f5d436", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/printbox@opam:0.5@82f5d436", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -94,8 +94,8 @@ "@reason-native/console@0.1.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", "@opam/lambda-term@opam:3.1.0@8adc2660", - "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/fpath@opam:0.7.2@45477b93", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -113,9 +113,9 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", "@reason-native/console@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/atdgen@opam:2.2.1@d73fda11", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -129,8 +129,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -146,8 +146,8 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, @@ -177,43 +177,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" - ], - "devDependencies": [] - }, - "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9": { - "id": "fetch-native-lwt@0.1.0-alpha.5@d41d8cd9", - "name": "fetch-native-lwt", - "version": "0.1.0-alpha.5", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/fetch-native-lwt/-/fetch-native-lwt-0.1.0-alpha.5.tgz#sha1:5a0a40149d5d10e233361bb40c42304f538090aa" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "fetch-core@0.1.0-alpha.5@d41d8cd9", - "@reason-native-web/piaf@1.4.0@d41d8cd9", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/reason@3.6.0@d41d8cd9" - ], - "devDependencies": [] - }, - "fetch-core@0.1.0-alpha.5@d41d8cd9": { - "id": "fetch-core@0.1.0-alpha.5@d41d8cd9", - "name": "fetch-core", - "version": "0.1.0-alpha.5", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/fetch-core/-/fetch-core-0.1.0-alpha.5.tgz#sha1:71a2420796743056f3efba8da19a540cc910db95" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -275,22 +240,6 @@ ], "devDependencies": [] }, - "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9": { - "id": - "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9", - "name": "esy-help2man", - "version": - "github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443", - "source": { - "type": "install", - "source": [ - "github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443" - ] - }, - "overrides": [], - "dependencies": [], - "devDependencies": [] - }, "esy-freetype2@2.9.1008@d41d8cd9": { "id": "esy-freetype2@2.9.1008@d41d8cd9", "name": "esy-freetype2", @@ -319,20 +268,6 @@ "dependencies": [], "devDependencies": [] }, - "esy-autoconf@github:esy-packages/esy-autoconf#fb93edf@d41d8cd9": { - "id": "esy-autoconf@github:esy-packages/esy-autoconf#fb93edf@d41d8cd9", - "name": "esy-autoconf", - "version": "github:esy-packages/esy-autoconf#fb93edf", - "source": { - "type": "install", - "source": [ "github:esy-packages/esy-autoconf#fb93edf" ] - }, - "overrides": [], - "dependencies": [ - "esy-help2man@github:esy-packages/esy-help2man#c8e6931d1dcf58a81bd801145a777fd3b115c443@d41d8cd9" - ], - "devDependencies": [] - }, "esy-astyle@github:zbaylin/esy-astyle#59bc21a@d41d8cd9": { "id": "esy-astyle@github:zbaylin/esy-astyle#59bc21a@d41d8cd9", "name": "esy-astyle", @@ -403,7 +338,7 @@ "@reason-native/file-context-printer@0.0.3@d41d8cd9", "@reason-native/cli@0.0.1-alpha@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/junit@opam:2.0.2@0b7bd730", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -419,8 +354,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -437,8 +372,8 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -454,8 +389,8 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -472,266 +407,8 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@reason-native/pastel@0.1.0@d41d8cd9", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/reason@3.6.0@d41d8cd9" - ], - "devDependencies": [] - }, - "@reason-native-web/ssl@0.5.9007@d41d8cd9": { - "id": "@reason-native-web/ssl@0.5.9007@d41d8cd9", - "name": "@reason-native-web/ssl", - "version": "0.5.9007", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/ssl/-/ssl-0.5.9007.tgz#sha1:2eceef610fb593f10605dbde0cbcec153bf7b744" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/esy-openssl@1.1.1006@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/conf-pkg-config@opam:1.2@d86c8f53", - "@opam/base-unix@opam:base@87d0b2eb" - ], - "devDependencies": [] - }, - "@reason-native-web/piaf@1.4.0@d41d8cd9": { - "id": "@reason-native-web/piaf@1.4.0@d41d8cd9", - "name": "@reason-native-web/piaf", - "version": "1.4.0", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/piaf/-/piaf-1.4.0.tgz#sha1:da2d1a07b553989e032f51986873c4bdff936ed5" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/lwt_ssl@1.1.3005@d41d8cd9", - "@reason-native-web/h2-lwt-unix@0.6.1002@d41d8cd9", - "@reason-native-web/h1-lwt-unix@1.2.2001@d41d8cd9", - "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/uri@opam:3.1.0@826aaae7", - "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", - "@opam/magic-mime@opam:1.1.2@980f82fb", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/logs@opam:0.7.0@1d03143e", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1" - ], - "devDependencies": [] - }, - "@reason-native-web/lwt_ssl@1.1.3005@d41d8cd9": { - "id": "@reason-native-web/lwt_ssl@1.1.3005@d41d8cd9", - "name": "@reason-native-web/lwt_ssl", - "version": "1.1.3005", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/lwt_ssl/-/lwt_ssl-1.1.3005.tgz#sha1:6ac76e006175e3b320b8a1c690f50cebb5699050" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/ssl@0.5.9007@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-unix@opam:base@87d0b2eb" - ], - "devDependencies": [] - }, - "@reason-native-web/h2-lwt-unix@0.6.1002@d41d8cd9": { - "id": "@reason-native-web/h2-lwt-unix@0.6.1002@d41d8cd9", - "name": "@reason-native-web/h2-lwt-unix", - "version": "0.6.1002", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h2-lwt-unix/-/h2-lwt-unix-0.6.1002.tgz#sha1:9bf1998a7a62ddfc712d22cf04a045cfc2017d8e" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/h2-lwt@0.6.1002@d41d8cd9", - "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", - "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/h2-lwt@0.6.1002@d41d8cd9": { - "id": "@reason-native-web/h2-lwt@0.6.1002@d41d8cd9", - "name": "@reason-native-web/h2-lwt", - "version": "0.6.1002", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h2-lwt/-/h2-lwt-0.6.1002.tgz#sha1:ab32c96ef1d5eabe0685b30c2edfc296cb63d5a8" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/h2@0.6.1002@d41d8cd9", - "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/h2@0.6.1002@d41d8cd9": { - "id": "@reason-native-web/h2@0.6.1002@d41d8cd9", - "name": "@reason-native-web/h2", - "version": "0.6.1002", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h2/-/h2-0.6.1002.tgz#sha1:6918f1df7d74b3880c78c5a94b9e644de8fa7ecc" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/h1@1.2.2001@d41d8cd9", - "@opam/psq@opam:0.2.0@247756d4", "@opam/hpack@opam:0.2.0@9f3eae78", - "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "@opam/base64@opam:3.4.0@f5b9ad9b", - "@opam/angstrom@opam:0.14.1@07e286b0" - ], - "devDependencies": [] - }, - "@reason-native-web/h1-lwt-unix@1.2.2001@d41d8cd9": { - "id": "@reason-native-web/h1-lwt-unix@1.2.2001@d41d8cd9", - "name": "@reason-native-web/h1-lwt-unix", - "version": "1.2.2001", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h1-lwt-unix/-/h1-lwt-unix-1.2.2001.tgz#sha1:29866964b38f357664ebf48af7ee2d4b32db0d4f" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/h1-lwt@1.2.2001@d41d8cd9", - "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", - "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/h1-lwt@1.2.2001@d41d8cd9": { - "id": "@reason-native-web/h1-lwt@1.2.2001@d41d8cd9", - "name": "@reason-native-web/h1-lwt", - "version": "1.2.2001", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h1-lwt/-/h1-lwt-1.2.2001.tgz#sha1:fae16630d9e002e5ba12cd67c88258a26171bca6" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/h1@1.2.2001@d41d8cd9", - "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/h1@1.2.2001@d41d8cd9": { - "id": "@reason-native-web/h1@1.2.2001@d41d8cd9", - "name": "@reason-native-web/h1", - "version": "1.2.2001", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/h1/-/h1-1.2.2001.tgz#sha1:48ff58f10bbcc2931742b951dcbd6c821e2da0f5" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "@opam/angstrom@opam:0.14.1@07e286b0" - ], - "devDependencies": [] - }, - "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9": { - "id": "@reason-native-web/gluten-lwt-unix@0.2.1@d41d8cd9", - "name": "@reason-native-web/gluten-lwt-unix", - "version": "0.2.1", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/gluten-lwt-unix/-/gluten-lwt-unix-0.2.1.tgz#sha1:e661685c6c72ef38b48318279ed16434824563f9" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@reason-native-web/lwt_ssl@1.1.3005@d41d8cd9", - "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", - "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9": { - "id": "@reason-native-web/gluten-lwt@0.2.1@d41d8cd9", - "name": "@reason-native-web/gluten-lwt", - "version": "0.2.1", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/gluten-lwt/-/gluten-lwt-0.2.1.tgz#sha1:0d35a7de4abd2b55e4afc57d902c9f36a4d6e3e4" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/gluten@0.2.1@d41d8cd9", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" - ], - "devDependencies": [] - }, - "@reason-native-web/gluten@0.2.1@d41d8cd9": { - "id": "@reason-native-web/gluten@0.2.1@d41d8cd9", - "name": "@reason-native-web/gluten", - "version": "0.2.1", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/gluten/-/gluten-0.2.1.tgz#sha1:cbc732d5d238f845c54d466bb5da7380feb66b72" - ] - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@reason-native-web/h1@1.2.2001@d41d8cd9", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1" - ], - "devDependencies": [] - }, - "@reason-native-web/esy-openssl@1.1.1006@d41d8cd9": { - "id": "@reason-native-web/esy-openssl@1.1.1006@d41d8cd9", - "name": "@reason-native-web/esy-openssl", - "version": "1.1.1006", - "source": { - "type": "install", - "source": [ - "archive:https://registry.npmjs.org/@reason-native-web/esy-openssl/-/esy-openssl-1.1.1006.tgz#sha1:4154a9b17d9ebdc1c983a3075513b5cd276873ac" - ] - }, - "overrides": [], - "dependencies": [ - "@opam/conf-pkg-config@opam:1.2@d86c8f53", - "@opam/conf-autoconf@opam:0.1@27b3f7cf" + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -754,16 +431,16 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/charInfo_width@opam:1.1.0@b400bb29", + "@opam/dune@opam:2.7.0@50e8f3e0", + "@opam/charInfo_width@opam:1.1.0@4296bdfe", "@opam/camomile@opam:1.0.2@40411a6b", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/charInfo_width@opam:1.1.0@b400bb29", + "@opam/dune@opam:2.7.0@50e8f3e0", + "@opam/charInfo_width@opam:1.1.0@4296bdfe", "@opam/camomile@opam:1.0.2@40411a6b", "@opam/base-bytes@opam:base@19d0c2ff" ] @@ -787,13 +464,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/biniou@opam:1.2.1@d7570399" + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -850,33 +527,6 @@ ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, - "@opam/uri@opam:3.1.0@826aaae7": { - "id": "@opam/uri@opam:3.1.0@826aaae7", - "name": "@opam/uri", - "version": "opam:3.1.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c4/c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43#sha256:c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43", - "archive:https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz#sha256:c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" - ], - "opam": { - "name": "uri", - "version": "3.1.0", - "path": "test.esy.lock/opam/uri.3.1.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/stringext@opam:1.6.0@104bc94b", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/stringext@opam:1.6.0@104bc94b", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, "@opam/uchar@opam:0.0.2@c8218eea": { "id": "@opam/uchar@opam:0.0.2@c8218eea", "name": "@opam/uchar", @@ -920,12 +570,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:base@d8d7de1d", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/trie@opam:1.0.0@d2efc587": { @@ -946,11 +596,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/topkg@opam:1.0.2@3c5942ad": { @@ -979,33 +629,6 @@ "ocaml@4.10.0@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, - "@opam/stringext@opam:1.6.0@104bc94b": { - "id": "@opam/stringext@opam:1.6.0@104bc94b", - "name": "@opam/stringext", - "version": "opam:1.6.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/db/db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea", - "archive:https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz#sha256:db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" - ], - "opam": { - "name": "stringext", - "version": "1.6.0", - "path": "test.esy.lock/opam/stringext.1.6.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-bytes@opam:base@19d0c2ff", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-bytes@opam:base@19d0c2ff" - ] - }, "@opam/stdlib-shims@opam:0.1.0@8c116481": { "id": "@opam/stdlib-shims@opam:0.1.0@8c116481", "name": "@opam/stdlib-shims", @@ -1024,11 +647,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/stdio@opam:v0.14.0@a624e254": { @@ -1049,12 +672,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.14.0@b8817fc1", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.14.0@b8817fc1" ] }, @@ -1076,11 +699,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/seq@opam:base@d8d7de1d": { @@ -1148,11 +771,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/react@opam:1.2.1@0e11855f": { @@ -1199,11 +822,11 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ptime@opam:0.8.5@0051d642": { @@ -1253,11 +876,11 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/printbox@opam:0.5@82f5d436": { @@ -1280,12 +903,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0", "@opam/tyxml@opam:4.4.0@1dca5713", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -1312,7 +935,7 @@ "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481", @@ -1320,7 +943,7 @@ "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppxfind@opam:1.4@d75848d2": { @@ -1343,12 +966,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": { @@ -1370,11 +993,11 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414": { @@ -1397,12 +1020,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_tools@opam:6.2@62a3aff2": { @@ -1423,11 +1046,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_optcomp@opam:v0.14.0@d77a04c2": { @@ -1450,13 +1073,13 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254", "@opam/ppxlib@opam:0.15.0@6a9d8126", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/base@opam:v0.14.0@b8817fc1", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.14.0@b8817fc1", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254", "@opam/ppxlib@opam:0.15.0@6a9d8126", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/base@opam:v0.14.0@b8817fc1" + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base@opam:v0.14.0@b8817fc1" ] }, "@opam/ppx_deriving@opam:4.5@d89f2934": { @@ -1482,7 +1105,7 @@ "@opam/ppx_tools@opam:6.2@62a3aff2", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ @@ -1490,7 +1113,7 @@ "@opam/ppx_tools@opam:6.2@62a3aff2", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -1511,11 +1134,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/omd@github:ocaml/omd:omd.opam#1535e3c@d41d8cd9": { @@ -1528,7 +1151,7 @@ }, "overrides": [], "dependencies": [ - "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-bytes@opam:base@19d0c2ff", "@opam/base-bigarray@opam:base@b03491b0", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1557,49 +1180,16 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-bytes@opam:base@19d0c2ff" ] }, - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2": { - "id": "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "name": "@opam/ocamlfind-secondary", - "version": "opam:1.8.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/18/18ca650982c15536616dea0e422cbd8c#md5:18ca650982c15536616dea0e422cbd8c", - "archive:http://download2.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c", - "archive:http://download.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c" - ], - "opam": { - "name": "ocamlfind-secondary", - "version": "1.8.1", - "path": "test.esy.lock/opam/ocamlfind-secondary.1.8.1" - } - }, - "overrides": [ - { - "opamoverride": - "test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override" - } - ], - "dependencies": [ - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f" - ] - }, "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { "id": "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "name": "@opam/ocamlfind", @@ -1656,58 +1246,6 @@ ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, - "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa": { - "id": "@opam/ocaml-syntax-shims@opam:1.0.0@a9aa3bfa", - "name": "@opam/ocaml-syntax-shims", - "version": "opam:1.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/89/89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8#sha256:89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8", - "archive:https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz#sha256:89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" - ], - "opam": { - "name": "ocaml-syntax-shims", - "version": "1.0.0", - "path": "test.esy.lock/opam/ocaml-syntax-shims.1.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f": { - "id": "@opam/ocaml-secondary-compiler@opam:4.08.1-1@85df5d8f", - "name": "@opam/ocaml-secondary-compiler", - "version": "opam:4.08.1-1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/72/723b6bfe8cf5abcbccc6911143f71055#md5:723b6bfe8cf5abcbccc6911143f71055", - "archive:https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz#md5:723b6bfe8cf5abcbccc6911143f71055" - ], - "opam": { - "name": "ocaml-secondary-compiler", - "version": "4.08.1-1", - "path": "test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1" - } - }, - "overrides": [ - { - "opamoverride": - "test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override" - } - ], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] - }, "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47": { "id": "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "name": "@opam/ocaml-migrate-parsetree", @@ -1728,12 +1266,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#38bd51a15c98b4f6ff841e5c914a8cdacee15ea6@d41d8cd9": { @@ -1755,8 +1293,8 @@ "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/menhir@opam:20200624@8629ff13", - "@opam/dune-build-info@opam:2.6.2@03ffe168", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-build-info@opam:2.7.0@a5897ded", + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", @@ -1764,8 +1302,8 @@ "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/menhir@opam:20200624@8629ff13", - "@opam/dune-build-info@opam:2.6.2@03ffe168", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune-build-info@opam:2.7.0@a5897ded", + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/ocaml-compiler-libs@opam:v0.12.1@5c34eb0d": { @@ -1786,11 +1324,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/mmap@opam:1.1.0@b85334ff": { @@ -1811,11 +1349,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/mew_vi@opam:0.5.0@cf66c299": { @@ -1837,12 +1375,12 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/mew@opam:0.1.0@a74f69d6", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/mew@opam:0.1.0@a74f69d6": { @@ -1864,12 +1402,12 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/trie@opam:1.0.0@d2efc587", - "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/trie@opam:1.0.0@d2efc587", - "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/result@opam:1.5@6b753c82", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/merlin-extend@opam:0.6@404f814c": { @@ -1890,11 +1428,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/menhirSdk@opam:20200624@2a05b5a7": { @@ -1915,11 +1453,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/menhirLib@opam:20200624@8bdd2b0e": { @@ -1940,11 +1478,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/menhir@opam:20200624@8629ff13": { @@ -1967,12 +1505,12 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", "@opam/menhirLib@opam:20200624@8bdd2b0e", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7", "@opam/menhirLib@opam:20200624@8bdd2b0e", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/markup@opam:0.8.2@87975241": { @@ -1994,37 +1532,12 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", - "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/magic-mime@opam:1.1.2@980f82fb": { - "id": "@opam/magic-mime@opam:1.1.2@980f82fb", - "name": "@opam/magic-mime", - "version": "opam:1.1.2", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/0c/0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb#sha256:0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb", - "archive:https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz#sha256:0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" - ], - "opam": { - "name": "magic-mime", - "version": "1.1.2", - "path": "test.esy.lock/opam/magic-mime.1.1.2" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/uchar@opam:0.0.2@c8218eea", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lwt_react@opam:1.1.3@72987fcf": { @@ -2046,12 +1559,12 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/react@opam:1.2.1@0e11855f", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lwt_ppx@opam:2.0.1@e6a764a0": { @@ -2075,14 +1588,14 @@ "ocaml@4.10.0@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lwt_log@opam:1.1.1@2d7a797f": { @@ -2103,11 +1616,11 @@ }, "overrides": [], "dependencies": [ - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/lwt@opam:4.5.0@677655b4", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lwt@opam:4.5.0@677655b4": { @@ -2132,8 +1645,8 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/cppo@opam:1.6.6@f4f83858", + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -2143,8 +1656,8 @@ "@opam/result@opam:1.5@6b753c82", "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/lru@github:bryphe/lru:lru.opam#2708c70@d41d8cd9": { @@ -2158,7 +1671,7 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/psq@opam:0.2.0@247756d4" @@ -2214,7 +1727,7 @@ "@opam/mew_vi@opam:0.5.0@cf66c299", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/camomile@opam:1.0.2@40411a6b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -2224,7 +1737,7 @@ "@opam/mew_vi@opam:0.5.0@cf66c299", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/camomile@opam:1.0.2@40411a6b" ] }, @@ -2247,11 +1760,11 @@ "overrides": [], "dependencies": [ "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/tyxml@opam:4.4.0@1dca5713", "@opam/ptime@opam:0.8.5@0051d642", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/integers@opam:0.4.0@f7acfaeb": { @@ -2272,40 +1785,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/hpack@opam:0.2.0@9f3eae78": { - "id": "@opam/hpack@opam:0.2.0@9f3eae78", - "name": "@opam/hpack", - "version": "opam:0.2.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/c8/c883927ce8a9f3f7159ef7b20988f051#md5:c883927ce8a9f3f7159ef7b20988f051", - "archive:https://github.com/anmonteiro/ocaml-h2/releases/download/0.2.0/h2-0.2.0.tbz#md5:c883927ce8a9f3f7159ef7b20988f051" - ], - "opam": { - "name": "hpack", - "version": "0.2.0", - "path": "test.esy.lock/opam/hpack.0.2.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/angstrom@opam:0.14.1@07e286b0", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/angstrom@opam:0.14.1@07e286b0" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/fpath@opam:0.7.2@45477b93": { @@ -2387,96 +1871,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/faraday-lwt-unix@opam:0.7.1@4854f547": { - "id": "@opam/faraday-lwt-unix@opam:0.7.1@4854f547", - "name": "@opam/faraday-lwt-unix", - "version": "opam:0.7.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", - "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" - ], - "opam": { - "name": "faraday-lwt-unix", - "version": "0.7.1", - "path": "test.esy.lock/opam/faraday-lwt-unix.0.7.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt@opam:0.7.1@e28c97d1", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday-lwt@opam:0.7.1@e28c97d1", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-unix@opam:base@87d0b2eb" - ] - }, - "@opam/faraday-lwt@opam:0.7.1@e28c97d1": { - "id": "@opam/faraday-lwt@opam:0.7.1@e28c97d1", - "name": "@opam/faraday-lwt", - "version": "opam:0.7.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", - "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" - ], - "opam": { - "name": "faraday-lwt", - "version": "0.7.1", - "path": "test.esy.lock/opam/faraday-lwt.0.7.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday@opam:0.7.1@19546ee5", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/lwt@opam:4.5.0@677655b4", - "@opam/faraday@opam:0.7.1@19546ee5", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/faraday@opam:0.7.1@19546ee5": { - "id": "@opam/faraday@opam:0.7.1@19546ee5", - "name": "@opam/faraday", - "version": "opam:0.7.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/09/09396dbb4a08323194e092b6bff4aaf6#md5:09396dbb4a08323194e092b6bff4aaf6", - "archive:https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz#md5:09396dbb4a08323194e092b6bff4aaf6" - ], - "opam": { - "name": "faraday", - "version": "0.7.1", - "path": "test.esy.lock/opam/faraday.0.7.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -2497,119 +1896,89 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f": { - "id": "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f", - "name": "@opam/dune-private-libs", - "version": "opam:2.6.2", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - ], - "opam": { - "name": "dune-private-libs", - "version": "2.6.2", - "path": "test.esy.lock/opam/dune-private-libs.2.6.2" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, - "@opam/dune-configurator@opam:2.6.2@a8db4839": { - "id": "@opam/dune-configurator@opam:2.6.2@a8db4839", + "@opam/dune-configurator@opam:2.7.0@bd860a0f": { + "id": "@opam/dune-configurator@opam:2.7.0@bd860a0f", "name": "@opam/dune-configurator", - "version": "opam:2.6.2", + "version": "opam:2.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" + "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15", + "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" ], "opam": { "name": "dune-configurator", - "version": "2.6.2", - "path": "test.esy.lock/opam/dune-configurator.2.6.2" + "version": "2.7.0", + "path": "test.esy.lock/opam/dune-configurator.2.7.0" } }, "overrides": [], "dependencies": [ - "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "@opam/dune-private-libs@opam:2.6.2@b5d4ad0f", - "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, - "@opam/dune-build-info@opam:2.6.2@03ffe168": { - "id": "@opam/dune-build-info@opam:2.6.2@03ffe168", + "@opam/dune-build-info@opam:2.7.0@a5897ded": { + "id": "@opam/dune-build-info@opam:2.7.0@a5897ded", "name": "@opam/dune-build-info", - "version": "opam:2.6.2", + "version": "opam:2.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" + "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15", + "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" ], "opam": { "name": "dune-build-info", - "version": "2.6.2", - "path": "test.esy.lock/opam/dune-build-info.2.6.2" + "version": "2.7.0", + "path": "test.esy.lock/opam/dune-build-info.2.7.0" } }, "overrides": [], "dependencies": [ - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], - "devDependencies": [ "@opam/dune@opam:2.6.2@20433b4f" ] + "devDependencies": [ "@opam/dune@opam:2.7.0@50e8f3e0" ] }, - "@opam/dune@opam:2.6.2@20433b4f": { - "id": "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0": { + "id": "@opam/dune@opam:2.7.0@50e8f3e0", "name": "@opam/dune", - "version": "opam:2.6.2", + "version": "opam:2.7.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/4f/4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9", - "archive:https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz#sha256:4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" + "archive:https://opam.ocaml.org/cache/sha256/b4/b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15", + "archive:https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz#sha256:b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" ], "opam": { "name": "dune", - "version": "2.6.2", - "path": "test.esy.lock/opam/dune.2.6.2" + "version": "2.7.0", + "path": "test.esy.lock/opam/dune.2.7.0" } }, "overrides": [ { "opamoverride": - "test.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override" + "test.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override" } ], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "@opam/base-unix@opam:base@87d0b2eb", + "ocaml@4.10.0@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084" ] }, @@ -2665,12 +2034,12 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/base-unix@opam:base@87d0b2eb" ] }, @@ -2716,40 +2085,15 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/conf-autoconf@opam:0.1@27b3f7cf": { - "id": "@opam/conf-autoconf@opam:0.1@27b3f7cf", - "name": "@opam/conf-autoconf", - "version": "opam:0.1", - "source": { - "type": "install", - "source": [ "no-source:" ], - "opam": { - "name": "conf-autoconf", - "version": "0.1", - "path": "test.esy.lock/opam/conf-autoconf.0.1" - } - }, - "overrides": [ - { - "opamoverride": - "test.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override" - } - ], - "dependencies": [ - "esy-autoconf@github:esy-packages/esy-autoconf#fb93edf@d41d8cd9", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [] - }, - "@opam/charInfo_width@opam:1.1.0@b400bb29": { - "id": "@opam/charInfo_width@opam:1.1.0@b400bb29", + "@opam/charInfo_width@opam:1.1.0@4296bdfe": { + "id": "@opam/charInfo_width@opam:1.1.0@4296bdfe", "name": "@opam/charInfo_width", "version": "opam:1.1.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/c4/c4ab038e06f06a29692c05fdd7c268c5#md5:c4ab038e06f06a29692c05fdd7c268c5", - "archive:https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz#md5:c4ab038e06f06a29692c05fdd7c268c5" + "archive:https://opam.ocaml.org/cache/md5/a5/a539436d1da4aeb93711303f107bec7e#md5:a539436d1da4aeb93711303f107bec7e", + "archive:https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz#md5:a539436d1da4aeb93711303f107bec7e" ], "opam": { "name": "charInfo_width", @@ -2760,13 +2104,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/camomile@opam:1.0.2@40411a6b", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.6.2@20433b4f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/camomile@opam:1.0.2@40411a6b" ] }, @@ -2788,11 +2132,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" + "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/bos@opam:0.2.0@df49e63f": { @@ -2850,94 +2194,11 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/bigstringaf@opam:0.6.1@35f5e6d1": { - "id": "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "name": "@opam/bigstringaf", - "version": "opam:0.6.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/dc/dccf639273b1eec0e0f142f21319268d#md5:dccf639273b1eec0e0f142f21319268d", - "archive:https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz#md5:dccf639273b1eec0e0f142f21319268d" - ], - "opam": { - "name": "bigstringaf", - "version": "0.6.1", - "path": "test.esy.lock/opam/bigstringaf.0.6.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigarray-compat@opam:1.0.0@1faefa97", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigarray-compat@opam:1.0.0@1faefa97" - ] - }, - "@opam/bigarray-compat@opam:1.0.0@1faefa97": { - "id": "@opam/bigarray-compat@opam:1.0.0@1faefa97", - "name": "@opam/bigarray-compat", - "version": "opam:1.0.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/1c/1cc7c25382a8900bada34aadfd66632e#md5:1cc7c25382a8900bada34aadfd66632e", - "archive:https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz#md5:1cc7c25382a8900bada34aadfd66632e" - ], - "opam": { - "name": "bigarray-compat", - "version": "1.0.0", - "path": "test.esy.lock/opam/bigarray-compat.1.0.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.6.2@20433b4f" - ] - }, - "@opam/base64@opam:3.4.0@f5b9ad9b": { - "id": "@opam/base64@opam:3.4.0@f5b9ad9b", - "name": "@opam/base64", - "version": "opam:3.4.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/1c/1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634#sha256:1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634", - "archive:https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz#sha256:1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" - ], - "opam": { - "name": "base64", - "version": "3.4.0", - "path": "test.esy.lock/opam/base64.3.4.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-bytes@opam:base@19d0c2ff", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/base-bytes@opam:base@19d0c2ff" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -3032,13 +2293,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438", - "@opam/dune-configurator@opam:2.6.2@a8db4839", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune-configurator@opam:2.7.0@bd860a0f", + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/atdgen-runtime@opam:2.2.1@6a3a6395": { @@ -3060,13 +2321,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.6.2@20433b4f", + "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399" ] }, @@ -3089,13 +2350,13 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/biniou@opam:1.2.1@d7570399", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "@opam/atd@opam:2.2.1@071ab6bd", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/dune@opam:2.6.2@20433b4f", "@opam/biniou@opam:1.2.1@d7570399", + "@opam/dune@opam:2.7.0@50e8f3e0", "@opam/biniou@opam:1.2.1@d7570399", "@opam/atdgen-runtime@opam:2.2.1@6a3a6395", "@opam/atd@opam:2.2.1@071ab6bd" ] @@ -3121,13 +2382,13 @@ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/menhir@opam:20200624@8629ff13", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.6.2@20433b4f" + "@opam/dune@opam:2.7.0@50e8f3e0" ] }, "@opam/astring@opam:0.8.5@1300cee8": { @@ -3155,35 +2416,6 @@ ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] }, - "@opam/angstrom@opam:0.14.1@07e286b0": { - "id": "@opam/angstrom@opam:0.14.1@07e286b0", - "name": "@opam/angstrom", - "version": "opam:0.14.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/91/915bbcc1adbd0debc1b0a54531c7601a#md5:915bbcc1adbd0debc1b0a54531c7601a", - "archive:https://github.com/inhabitedtype/angstrom/archive/0.14.1.tar.gz#md5:915bbcc1adbd0debc1b0a54531c7601a" - ], - "opam": { - "name": "angstrom", - "version": "0.14.1", - "path": "test.esy.lock/opam/angstrom.0.14.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", - "@opam/dune@opam:2.6.2@20433b4f", - "@opam/bigstringaf@opam:0.6.1@35f5e6d1" - ] - }, "@glennsl/timber@1.2.0@d41d8cd9": { "id": "@glennsl/timber@1.2.0@d41d8cd9", "name": "@glennsl/timber", @@ -3198,7 +2430,7 @@ "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/logs@opam:0.7.0@1d03143e", "@opam/fmt@opam:0.8.8@01c3a23c", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [] }, @@ -3216,24 +2448,24 @@ "dependencies": [], "devDependencies": [] }, - "@esy-ocaml/reason@3.6.0@d41d8cd9": { - "id": "@esy-ocaml/reason@3.6.0@d41d8cd9", + "@esy-ocaml/reason@3.6.2@d41d8cd9": { + "id": "@esy-ocaml/reason@3.6.2@d41d8cd9", "name": "@esy-ocaml/reason", - "version": "3.6.0", + "version": "3.6.2", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#sha1:ae98f3335e9e03ff0e01376830a14cd1246b5278" + "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#sha1:49bd53c75dd241eb14f46277a85af353908f7e81" ] }, "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82", + "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.7.3@dbcf3b47", "@opam/merlin-extend@opam:0.6@404f814c", "@opam/menhir@opam:20200624@8629ff13", - "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.6.2@20433b4f" + "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.7.0@50e8f3e0" ], "devDependencies": [] }, @@ -3263,7 +2495,7 @@ "overrides": [], "dependencies": [ "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126", - "@opam/dune@opam:2.6.2@20433b4f", "@esy-ocaml/reason@3.6.0@d41d8cd9" + "@opam/dune@opam:2.7.0@50e8f3e0", "@esy-ocaml/reason@3.6.2@d41d8cd9" ], "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ] } diff --git a/test.esy.lock/opam/angstrom.0.14.1/opam b/test.esy.lock/opam/angstrom.0.14.1/opam deleted file mode 100644 index 8ccc7d997..000000000 --- a/test.esy.lock/opam/angstrom.0.14.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/angstrom" -bug-reports: "https://github.com/inhabitedtype/angstrom/issues" -dev-repo: "git+https://github.com/inhabitedtype/angstrom.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.8.1"} - "bigstringaf" - "result" -] -synopsis: "Parser combinators built for speed and memory-efficiency" -description: """ -Angstrom is a parser-combinator library that makes it easy to write efficient, -expressive, and reusable parsers suitable for high-performance applications. It -exposes monadic and applicative interfaces for composition, and supports -incremental input through buffered and unbuffered interfaces. Both interfaces -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.14.1.tar.gz" - checksum: "md5=915bbcc1adbd0debc1b0a54531c7601a" -} diff --git a/test.esy.lock/opam/base64.3.4.0/opam b/test.esy.lock/opam/base64.3.4.0/opam deleted file mode 100644 index b4869cdfa..000000000 --- a/test.esy.lock/opam/base64.3.4.0/opam +++ /dev/null @@ -1,38 +0,0 @@ -opam-version: "2.0" -maintainer: "mirageos-devel@lists.xenproject.org" -authors: [ "Thomas Gazagnaire" - "Anil Madhavapeddy" "Calascibetta Romain" - "Peter Zotov" ] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-base64" -doc: "http://mirage.github.io/ocaml-base64/" -bug-reports: "https://github.com/mirage/ocaml-base64/issues" -dev-repo: "git+https://github.com/mirage/ocaml-base64.git" -synopsis: "Base64 encoding for OCaml" -description: """ -Base64 is a group of similar binary-to-text encoding schemes that represent -binary data in an ASCII string format by translating it into a radix-64 -representation. It is specified in RFC 4648. -""" -depends: [ - "ocaml" {>="4.03.0"} - "base-bytes" - "dune-configurator" - "dune" {>= "2.0"} - "bos" {with-test} - "rresult" {with-test} - "alcotest" {with-test} -] -build: [ - ["dune" "subst"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-base64/releases/download/v3.4.0/base64-v3.4.0.tbz" - checksum: [ - "sha256=1c9cf655bdd771a4d20014f7f29aadfde7e3821b01772b49f8ba4d4bda2b1634" - "sha512=e66a67302a9eb136044bebf66a89a1d6e38a96c70622bb6cd27916fec36dcaf4b5b7e7d00c25608f0a2363f2ca4264a5fe765fe7747590958325dbce06311db9" - ] -} diff --git a/test.esy.lock/opam/bigarray-compat.1.0.0/opam b/test.esy.lock/opam/bigarray-compat.1.0.0/opam deleted file mode 100644 index 93751514d..000000000 --- a/test.esy.lock/opam/bigarray-compat.1.0.0/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -synopsis: "Compatibility library to use Stdlib.Bigarray when possible" -maintainer: "Lucas Pluvinage " -authors: "Lucas Pluvinage " -license: "ISC" -homepage: "https://github.com/mirage/bigarray-compat" -bug-reports: "https://github.com/mirage/bigarray-compat/issues" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" {>= "1.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -dev-repo: "git+https://github.com/mirage/bigarray-compat.git" -url { - src: "https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz" - checksum: [ - "md5=1cc7c25382a8900bada34aadfd66632e" - "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f" - ] -} \ No newline at end of file diff --git a/test.esy.lock/opam/bigstringaf.0.6.1/opam b/test.esy.lock/opam/bigstringaf.0.6.1/opam deleted file mode 100644 index b821673a0..000000000 --- a/test.esy.lock/opam/bigstringaf.0.6.1/opam +++ /dev/null @@ -1,43 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/bigstringaf" -bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues" -dev-repo: "git+https://github.com/inhabitedtype/bigstringaf.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -depends: [ - "dune" {>= "1.0"} - "alcotest" {with-test} - "bigarray-compat" - "ocaml" {>= "4.03.0"} -] -depopts: [ - "mirage-xen-posix" - "ocaml-freestanding" -] -conflicts: [ - "mirage-xen-posix" {< "3.1.0"} - "ocaml-freestanding" {< "0.4.1"} - "js_of_ocaml" {< "3.5.0"} -] -synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove" -description: """ -Bigstring intrinsics and fast blits based on memcpy/memmove - -The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not -widely-known, sometimes misused, and so programs that use Bigstrings are slower -than they have to be. And even if a library got that part right and exposed the -intrinsics properly, the compiler doesn't have any fast blits between -Bigstrings and other string-like types. - -So here they are. Go crazy. -""" -url { - src: "https://github.com/inhabitedtype/bigstringaf/archive/0.6.1.tar.gz" - checksum: "md5=dccf639273b1eec0e0f142f21319268d" -} diff --git a/test.esy.lock/opam/charInfo_width.1.1.0/opam b/test.esy.lock/opam/charInfo_width.1.1.0/opam index dee626092..c88c2c9d4 100644 --- a/test.esy.lock/opam/charInfo_width.1.1.0/opam +++ b/test.esy.lock/opam/charInfo_width.1.1.0/opam @@ -1,10 +1,10 @@ opam-version: "2.0" maintainer: "zandoye@gmail.com" authors: [ "ZAN DoYe" ] -homepage: "https://bitbucket.org/zandoye/charinfo_width/" -bug-reports: "https://bitbucket.org/zandoye/charinfo_width/issues" +homepage: "https://github.com/kandu/charinfo_width/" +bug-reports: "https://github.com/kandu/charinfo_width/issues" license: "MIT" -dev-repo: "hg+https://bitbucket.org/zandoye/charinfo_width" +dev-repo: "git://github.com/kandu/charinfo_width.git" build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test & (ocaml:version >= "4.04.0")} @@ -22,6 +22,6 @@ description: """ This module is implemented purely in OCaml and the width function follows the prototype of POSIX's wcwidth.""" url { - src:"https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz" - checksum: "md5=c4ab038e06f06a29692c05fdd7c268c5" + src:"https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz" + checksum: "md5=a539436d1da4aeb93711303f107bec7e" } diff --git a/test.esy.lock/opam/conf-autoconf.0.1/opam b/test.esy.lock/opam/conf-autoconf.0.1/opam deleted file mode 100644 index a538223d0..000000000 --- a/test.esy.lock/opam/conf-autoconf.0.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "unixjunkie@sdf.org" -homepage: "http://www.gnu.org/software/autoconf" -authors: "https://www.gnu.org/software/autoconf/autoconf.html#maintainer" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -license: "GPL-3.0" -build: [ - ["which" "autoconf"] -] -depends: ["conf-which" {build}] -depexts: [ - ["autoconf"] {os-family = "debian"} - ["autoconf"] {os-distribution = "centos"} - ["autoconf"] {os-distribution = "fedora"} - ["autoconf"] {os-distribution = "arch"} - ["sys-devel/autoconf"] {os-distribution = "gentoo"} - ["autoconf"] {os-distribution = "nixos"} - ["autoconf"] {os = "macos" & os-distribution = "homebrew"} - ["devel/autoconf"] {os = "openbsd"} - ["autoconf"] {os = "freebsd"} - ["autoconf"] {os = "netbsd"} - ["autoconf"] {os-distribution = "alpine"} - ["autoconf"] {os-distribution = "ol"} - ["autoconf"] {os-distribution = "rhel"} -] -synopsis: "Virtual package relying on autoconf installation" -description: """ -This package can only install if the autoconf command -is available on the system.""" -flags: conf diff --git a/test.esy.lock/opam/dune-build-info.2.6.2/opam b/test.esy.lock/opam/dune-build-info.2.6.2/opam deleted file mode 100644 index a0dfa6442..000000000 --- a/test.esy.lock/opam/dune-build-info.2.6.2/opam +++ /dev/null @@ -1,40 +0,0 @@ -opam-version: "2.0" -synopsis: "Embed build informations inside executable" -description: """ -The build-info library allows to access information about how the -executable was built, such as the version of the project at which it -was built or the list of statically linked libraries with their -versions. It supports reporting the version from the version control -system during development to get an precise reference of when the -executable was built. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.5"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/test.esy.lock/opam/dune-build-info.2.7.0/opam b/test.esy.lock/opam/dune-build-info.2.7.0/opam new file mode 100644 index 000000000..ea2f6aa11 --- /dev/null +++ b/test.esy.lock/opam/dune-build-info.2.7.0/opam @@ -0,0 +1,41 @@ +opam-version: "2.0" +synopsis: "Embed build informations inside executable" +description: """ +The build-info library allows to access information about how the +executable was built, such as the version of the project at which it +was built or the list of statically linked libraries with their +versions. It supports reporting the version from the version control +system during development to get an precise reference of when the +executable was built. +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +depends: [ + "dune" {>= "2.7"} + "odoc" {with-doc} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" + checksum: [ + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" + ] +} diff --git a/test.esy.lock/opam/dune-configurator.2.6.2/opam b/test.esy.lock/opam/dune-configurator.2.6.2/opam deleted file mode 100644 index 9ae7729b7..000000000 --- a/test.esy.lock/opam/dune-configurator.2.6.2/opam +++ /dev/null @@ -1,43 +0,0 @@ -opam-version: "2.0" -synopsis: "Helper library for gathering system configuration" -description: """ -dune-configurator is a small library that helps writing OCaml scripts that -test features available on the system, in order to generate config.h -files for instance. -Among other things, dune-configurator allows one to: -- test if a C program compiles -- query pkg-config -- import #define from OCaml header files -- generate config.h file -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.6"} - "dune-private-libs" {= version} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/test.esy.lock/opam/dune-configurator.2.7.0/opam b/test.esy.lock/opam/dune-configurator.2.7.0/opam new file mode 100644 index 000000000..a247cb8d8 --- /dev/null +++ b/test.esy.lock/opam/dune-configurator.2.7.0/opam @@ -0,0 +1,44 @@ +opam-version: "2.0" +synopsis: "Helper library for gathering system configuration" +description: """ +dune-configurator is a small library that helps writing OCaml scripts that +test features available on the system, in order to generate config.h +files for instance. +Among other things, dune-configurator allows one to: +- test if a C program compiles +- query pkg-config +- import #define from OCaml header files +- generate config.h file +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +depends: [ + "ocaml" {>= "4.03.0"} + "dune" {>= "2.7" & >= "2.6.0"} + "odoc" {with-doc} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@doc" {with-doc} + ] +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" + checksum: [ + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" + ] +} diff --git a/test.esy.lock/opam/dune-private-libs.2.6.2/opam b/test.esy.lock/opam/dune-private-libs.2.6.2/opam deleted file mode 100644 index f62a0a2fe..000000000 --- a/test.esy.lock/opam/dune-private-libs.2.6.2/opam +++ /dev/null @@ -1,42 +0,0 @@ -opam-version: "2.0" -synopsis: "Private libraries of Dune" -description: """ -!!!!!!!!!!!!!!!!!!!!!! -!!!!! DO NOT USE !!!!! -!!!!!!!!!!!!!!!!!!!!!! - -This package contains code that is shared between various dune-xxx -packages. However, it is not meant for public consumption and provides -no stability guarantee. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -depends: [ - "dune" {>= "2.5"} - "ocaml" {>= "4.07"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/test.esy.lock/opam/dune.2.6.2/opam b/test.esy.lock/opam/dune.2.6.2/opam deleted file mode 100644 index 655fb0111..000000000 --- a/test.esy.lock/opam/dune.2.6.2/opam +++ /dev/null @@ -1,55 +0,0 @@ -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 -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 -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. - -It also supports multi-context builds, such as building against -several opam roots/switches simultaneously. This helps maintaining -packages across several versions of OCaml and gives cross-compilation -for free. -""" -maintainer: ["Jane Street Group, LLC "] -authors: ["Jane Street Group, LLC "] -license: "MIT" -homepage: "https://github.com/ocaml/dune" -doc: "https://dune.readthedocs.io/" -bug-reports: "https://github.com/ocaml/dune/issues" -conflicts: [ - "dune-configurator" {< "2.3.0"} - "odoc" {< "1.3.0"} - "dune-release" {< "1.3.0"} - "js_of_ocaml-compiler" {< "3.6.0"} - "jbuilder" {= "transition"} -] -dev-repo: "git+https://github.com/ocaml/dune.git" -build: [ - # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path - ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} - ["ocaml" "bootstrap.ml" "-j" jobs] - ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] -] -depends: [ - # Please keep the lower bound in sync with .travis.yml, dune-project - # and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.07"} | ("ocaml" {< "4.07~~"} & "ocamlfind-secondary")) - "base-unix" - "base-threads" -] -url { - src: "https://github.com/ocaml/dune/releases/download/2.6.2/dune-2.6.2.tbz" - checksum: [ - "sha256=4f6ec1f3f27ac48753d03b4a172127e4a56ae724201a3a18dc827c94425788e9" - "sha512=d195479c99a59edb0cb7674375f45e518389b2f251b02e5f603c196b9592acbcf2a12193b3de70831a543fa477f57abb101fdd210660e25805b147c66877cafa" - ] -} diff --git a/test.esy.lock/opam/dune.2.7.0/opam b/test.esy.lock/opam/dune.2.7.0/opam new file mode 100644 index 000000000..c4b160031 --- /dev/null +++ b/test.esy.lock/opam/dune.2.7.0/opam @@ -0,0 +1,55 @@ +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 +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 +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. + +It also supports multi-context builds, such as building against +several opam roots/switches simultaneously. This helps maintaining +packages across several versions of OCaml and gives cross-compilation +for free. +""" +maintainer: ["Jane Street Group, LLC "] +authors: ["Jane Street Group, LLC "] +license: "MIT" +homepage: "https://github.com/ocaml/dune" +doc: "https://dune.readthedocs.io/" +bug-reports: "https://github.com/ocaml/dune/issues" +conflicts: [ + "dune-configurator" {< "2.3.0"} + "odoc" {< "1.3.0"} + "dune-release" {< "1.3.0"} + "js_of_ocaml-compiler" {< "3.6.0"} + "jbuilder" {= "transition"} +] +dev-repo: "git+https://github.com/ocaml/dune.git" +build: [ + # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path + ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"} + ["ocaml" "bootstrap.ml" "-j" jobs] + ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs] +] +depends: [ + # Please keep the lower bound in sync with .travis.yml, dune-project + # and min_ocaml_version in bootstrap.ml + ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) + "base-unix" + "base-threads" +] +url { + src: "https://github.com/ocaml/dune/releases/download/2.7.0/dune-2.7.0.tbz" + checksum: [ + "sha256=b417ca85bdce4171e71255be4a9c5a7572646cb1dcb221bba3757dc6ac8f1c15" + "sha512=5e5b649b1a16747bf2a0bf093ecf2dc701b2713c166e3d25731422bba2b94e807ded2242ee0e750e2264d21a03c966c24f4812c6d5ed690bba60543db7303f89" + ] +} diff --git a/test.esy.lock/opam/faraday-lwt-unix.0.7.1/opam b/test.esy.lock/opam/faraday-lwt-unix.0.7.1/opam deleted file mode 100644 index 3cc8377eb..000000000 --- a/test.esy.lock/opam/faraday-lwt-unix.0.7.1/opam +++ /dev/null @@ -1,24 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday-lwt" - "lwt" {>= "2.7.0"} - "base-unix" -] -synopsis: "Lwt_unix support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/test.esy.lock/opam/faraday-lwt.0.7.1/opam b/test.esy.lock/opam/faraday-lwt.0.7.1/opam deleted file mode 100644 index 4e68d3097..000000000 --- a/test.esy.lock/opam/faraday-lwt.0.7.1/opam +++ /dev/null @@ -1,23 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "faraday" {>= "0.5.0"} - "lwt" -] -synopsis: "Lwt support for Faraday" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/test.esy.lock/opam/faraday.0.7.1/opam b/test.esy.lock/opam/faraday.0.7.1/opam deleted file mode 100644 index a20e6942e..000000000 --- a/test.esy.lock/opam/faraday.0.7.1/opam +++ /dev/null @@ -1,30 +0,0 @@ -opam-version: "2.0" -maintainer: "Spiros Eliopoulos " -authors: [ "Spiros Eliopoulos " ] -license: "BSD-3-clause" -homepage: "https://github.com/inhabitedtype/faraday" -bug-reports: "https://github.com/inhabitedtype/faraday/issues" -dev-repo: "git+https://github.com/inhabitedtype/faraday.git" -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} -] -depends: [ - "ocaml" {>= "4.02.0"} - "dune" {>= "1.0"} - "alcotest" {with-test & >= "0.4.1"} - "bigstringaf" -] -synopsis: "A library for writing fast and memory-efficient serializers." -description: """ -Faraday is a library for writing fast and memory-efficient serializers. Its -core type and related operation gives the user fine-grained control over -copying and allocation behavior while serializing user-defined types, and -presents the output in a form that makes it possible to use vectorized write -operations, such as the writev system call, or any other platform or -application-specific output APIs.""" -url { - src: "https://github.com/inhabitedtype/faraday/archive/0.7.1.tar.gz" - checksum: "md5=09396dbb4a08323194e092b6bff4aaf6" -} diff --git a/test.esy.lock/opam/hpack.0.2.0/opam b/test.esy.lock/opam/hpack.0.2.0/opam deleted file mode 100644 index b09cf7cbe..000000000 --- a/test.esy.lock/opam/hpack.0.2.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "Antonio Nuno Monteiro " -authors: [ "Pieter Goetschalckx <3.14.e.ter@gmail.com>" - "Antonio Nuno Monteiro " ] -license: "BSD-3-Clause" -homepage: "https://github.com/anmonteiro/ocaml-h2" -bug-reports: "https://github.com/anmonteiro/ocaml-h2/issues" -dev-repo: "git+https://github.com/anmonteiro/ocaml-h2.git" -doc: "https://anmonteiro.github.io/ocaml-h2/" -depends: [ - "ocaml" {>= "4.04"} - "dune" - "yojson" {with-test} - "hex" {with-test} - "angstrom" - "faraday" -] -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -synopsis: - "An HPACK (Header Compression for HTTP/2) implementation in OCaml" -description: """ -hpack is an implementation of the HPACK: Header Compression for HTTP/2 -specification (RFC7541) written in OCaml. It uses Angstrom and Faraday for -parsing and serialization, respectively. -""" -url { - src: - "https://github.com/anmonteiro/ocaml-h2/releases/download/0.2.0/h2-0.2.0.tbz" - checksum: "md5=c883927ce8a9f3f7159ef7b20988f051" -} diff --git a/test.esy.lock/opam/magic-mime.1.1.2/opam b/test.esy.lock/opam/magic-mime.1.1.2/opam deleted file mode 100644 index 8e398fb3e..000000000 --- a/test.esy.lock/opam/magic-mime.1.1.2/opam +++ /dev/null @@ -1,41 +0,0 @@ -opam-version: "2.0" -name: "magic-mime" -synopsis: "Map filenames to common MIME types" -description: """ -This library contains a database of MIME types that maps filename extensions -into MIME types suitable for use in many Internet protocols such as HTTP or -e-mail. It is generated from the `mime.types` file found in Unix systems, but -has no dependency on a filesystem since it includes the contents of the -database as an ML datastructure. - -For example, here's how to lookup MIME types in the [utop] REPL: - - #require "magic-mime";; - Magic_mime.lookup "/foo/bar.txt";; - - : bytes = "text/plain" - Magic_mime.lookup "bar.css";; - - : bytes = "text/css" -""" -maintainer: "Anil Madhavapeddy " -authors: ["Anil Madhavapeddy" "Maxence Guesdon"] -license: "ISC" -homepage: "https://github.com/mirage/ocaml-magic-mime" -doc: "https://mirage.github.io/ocaml-magic-mime/" -bug-reports: "https://github.com/mirage/ocaml-magic-mime/issues" -dev-repo: "git+https://github.com/mirage/ocaml-magic-mime.git" -depends: [ - "ocaml" {>= "4.03.0"} - "dune" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: - "https://github.com/mirage/ocaml-magic-mime/releases/download/v1.1.2/magic-mime-v1.1.2.tbz" - checksum: [ - "sha256=0c590bbc747531b56d392ee8f063d879df1e2026ba2dfa2d1bc98c9a9acb04eb" - "sha512=8264db78adc2c75b8adabc23c26ad34eab98383bd3a8f2068f2236ff3425d653c0238fbd7361e55a3d70d843413ef8671b6e97293074b4d3a1e300628d5292ab" - ] -} diff --git a/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch deleted file mode 100644 index cda19dd2d..000000000 --- a/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cf3c6ad7ce2a2b2806faceccfb0a9321da5e22a Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Fri, 26 Jul 2019 12:12:19 +0100 -Subject: [PATCH] Don't build manpages for stdlib docs ---- - ocamldoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index b109815071..e31e441f61 100644 ---- a/ocamldoc/Makefile -+++ b/ocamldoc/Makefile -@@ -170,7 +170,7 @@ LIBCMIFILES = $(LIBCMOFILES:.cmo=.cmi) - - - .PHONY: all --all: lib exe generators manpages -+all: lib exe generators - - manpages: generators - --- -2.20.1 - diff --git a/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch deleted file mode 100644 index 41f5f7704..000000000 --- a/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 705739fa54260b7a0e6cbba0b5a99e52c79f9c09 Mon Sep 17 00:00:00 2001 -From: David Allsopp -Date: Tue, 6 Aug 2019 09:23:06 +0100 -Subject: [PATCH] Fix failure to install tools links - -In --disable-installing-bytecode-programs mode, the .opt version of the -tools is installed, but the symlink for the tool itself is not created. ---- - tools/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/Makefile b/tools/Makefile -index 530dd37f34..1b3014a3ab 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -197,6 +197,7 @@ else - do \ - if test -f "$$i".opt; then \ - $(INSTALL_PROG) "$$i.opt" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ -+ (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ - fi; \ - done - endif --- -2.20.1 - diff --git a/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch deleted file mode 100644 index e37b5e883..000000000 --- a/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 3f10a16153308f967149917585d2bc0b9c06492c -Author: Anil Madhavapeddy -Date: Sun Jun 21 18:40:27 2020 +0100 - - Add `-fcommon` unconditionally to CFLAGS to fix gcc10 build - - Signed-off-by: Anil Madhavapeddy - -diff --git a/configure b/configure -index 9a78a4554..0c54b560b 100755 ---- a/configure -+++ b/configure -@@ -12424,7 +12424,7 @@ $as_echo "$as_me: WARNING: Consider using GCC version 4.2 or above." >&2;}; - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( - gcc-*) : -- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings" ;; #( - msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" -diff --git a/configure.ac b/configure.ac -index f5d8a2687..775e0e2db 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -540,7 +540,7 @@ AS_CASE([$host], - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings"], - [gcc-*], -- [common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ [common_cflags="-O2 -fno-strict-aliasing -fwrapv -fcommon"; - internal_cflags="$gcc_warnings"], - [msvc-*], - [common_cflags="-nologo -O2 -Gy- -MD" diff --git a/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam deleted file mode 100644 index 905f9b3dd..000000000 --- a/test.esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam +++ /dev/null @@ -1,51 +0,0 @@ -opam-version: "2.0" -synopsis: "OCaml 4.08.1 Secondary Switch Compiler" -maintainer: "platform@lists.ocaml.org" -authors: "Xavier Leroy and many contributors" -homepage: "https://ocaml.org" -bug-reports: "https://github.com/ocaml/ocaml/issues" -dev-repo: "git://github.com/ocaml/ocaml" -depends: "ocaml" {< "4.08.0" | >= "4.09~"} -build: [ - [ - "./configure" - "--prefix=%{_:share}%" - "--libdir=%{_:share}%/lib" - "--disable-debugger" - "--disable-installing-bytecode-programs" - "--disable-debug-runtime" - "--disable-instrumented-runtime" - "--disable-graph-lib" - "CC=cc" {os = "openbsd" | os = "freebsd" | os = "macos"} - "ASPP=cc -c" {os = "openbsd" | os = "freebsd" | os = "macos"} - ] - [make "-j%{jobs}%" {os != "cygwin"} "world.opt"] -] -install: [make "install"] -url { - src: "https://github.com/ocaml/ocaml/archive/4.08.1.tar.gz" - checksum: "md5=723b6bfe8cf5abcbccc6911143f71055" -} -extra-files: [ - ["0001-Don-t-build-manpages-for-stdlib-docs.patch" "md5=6caa580fe6031c109d2dc96b19bd40cd"] - ["0001-Fix-failure-to-install-tools-links.patch" "md5=e973762c0b3d62b0b25a26468086fae3"] - ["fix-gcc10.patch" "md5=17ecd696a8f5647a4c543280599f6974"] -] -patches: [ - "0001-Don-t-build-manpages-for-stdlib-docs.patch" - "0001-Fix-failure-to-install-tools-links.patch" - "fix-gcc10.patch" -] - -post-messages: [ - "A failure in the middle of the build may be caused by build parallelism - (enabled by default). - Please file a bug report at https://github.com/ocaml/ocaml/issues" - {failure & jobs > 1 & os != "cygwin"} - "You can try installing again including --jobs=1 - to force a sequential build instead." - {failure & jobs > 1 & os != "cygwin" & opam-version >= "2.0.5"} -] -description: "Installs an additional compiler to the opam switch in -%{_:share}%/ocaml-secondary-compiler which can be accessed using -`ocamlfind -toolchain secondary`." diff --git a/test.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam b/test.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam deleted file mode 100644 index a814e1d2d..000000000 --- a/test.esy.lock/opam/ocaml-syntax-shims.1.0.0/opam +++ /dev/null @@ -1,39 +0,0 @@ -opam-version: "2.0" -synopsis: "Backport new syntax to older OCaml versions" -description: """ -This packages backports new features of the language to older -compilers, such as let+. -""" -maintainer: ["jeremie@dimino.org"] -authors: ["Jérémie Dimino "] -license: "MIT" -homepage: "https://github.com/ocaml-ppx/ocaml-syntax-shims" -doc: "https://ocaml-ppx.github.io/ocaml-syntax-shims/" -bug-reports: "https://github.com/ocaml-ppx/ocaml-syntax-shims/issues" -depends: [ - "dune" {>= "2.0"} - "ocaml" {>= "4.02.3"} -] -build: [ - ["dune" "subst"] {pinned} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: "git+https://github.com/ocaml-ppx/ocaml-syntax-shims.git" -url { - src: - "https://github.com/ocaml-ppx/ocaml-syntax-shims/releases/download/1.0.0/ocaml-syntax-shims-1.0.0.tbz" - checksum: [ - "sha256=89b2e193e90a0c168b6ec5ddf6fef09033681bdcb64e11913c97440a2722e8c8" - "sha512=75c4c6b0bfa1267a8a49a82ba494d08cf0823fc8350863d6d3d4971528cb09e5a2a29e2981d04c75e76ad0f49360b05a432c9efeff9a4fbc1ec6b28960399852" - ] -} diff --git a/test.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/test.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in deleted file mode 100644 index 12e3ee661..000000000 --- a/test.esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in +++ /dev/null @@ -1,3 +0,0 @@ -description = "OCaml Secondary Compiler" -version = "%{ocaml-secondary-compiler:version}%" -directory = "%{ocaml-secondary-compiler:share}%/bin" diff --git a/test.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/test.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in deleted file mode 100644 index d13023c9f..000000000 --- a/test.esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -path(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -destdir(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -stdlib(secondary) = "%{ocaml-secondary-compiler:share}%/lib" -ocamlc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlc" -ocamlopt(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlopt" -ocamlcp(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlcp" -ocamlmklib(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmklib" -ocamlmktop(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamlmktop" -ocamldoc(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldoc" -ocamldep(secondary) = "%{ocaml-secondary-compiler:share}%/bin/ocamldep" diff --git a/test.esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/test.esy.lock/opam/ocamlfind-secondary.1.8.1/opam deleted file mode 100644 index acdb57645..000000000 --- a/test.esy.lock/opam/ocamlfind-secondary.1.8.1/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "David Allsopp " -homepage: "https://github.com/ocaml/opam-repository" -bug-reports: "https://github.com/ocaml/opam-repository/issues" -build: ["./configure" "-sitelib" "%{ocaml-secondary-compiler:share}%/lib" "-no-camlp4"] -install: [ - [make "install-meta"] - ["mkdir" "-p" "%{lib}%/findlib.conf.d/"] - ["cp" "ocaml-secondary-compiler.conf" "%{lib}%/findlib.conf.d/"] - ["mkdir" "-p" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] - ["cp" "META" "%{ocaml-secondary-compiler:share}%/lib/ocaml"] -] -depends: [ - "ocaml-secondary-compiler" - "ocamlfind" {= "1.8.1"} -] -synopsis: "ocamlfind support for ocaml-secondary-compiler" -description: """ -Exposes the compiler built by the ocaml-secondary-compielr package via --toolchain secondary. A virtual package called ocaml is also installed to -locate the binary directory via `ocamlfind -toolchain secondary query ocaml`.""" -authors: ["Gerd Stolpmann " "David Allsopp "] -substs: ["META" "ocaml-secondary-compiler.conf"] -extra-files: [ - ["META.in" "md5=8c6ea8a0158a33ed87e6c38a7d686d49"] - ["ocaml-secondary-compiler.conf.in" "md5=367a7bb68e2e1e65a31356421ddc809c"] -] -url { - src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz" - checksum: "md5=18ca650982c15536616dea0e422cbd8c" - mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz" -} diff --git a/test.esy.lock/opam/stringext.1.6.0/opam b/test.esy.lock/opam/stringext.1.6.0/opam deleted file mode 100644 index 5242fe31a..000000000 --- a/test.esy.lock/opam/stringext.1.6.0/opam +++ /dev/null @@ -1,32 +0,0 @@ -opam-version: "2.0" -maintainer: "rudi.grinberg@gmail.com" -authors: "Rudi Grinberg" -license: "MIT" -homepage: "https://github.com/rgrinberg/stringext" -bug-reports: "https://github.com/rgrinberg/stringext/issues" -depends: [ - "ocaml" {>= "4.02.3"} - "dune" {>= "1.0"} - "ounit" {with-test} - "qtest" {with-test & >= "2.2"} - "base-bytes" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -dev-repo: "git+https://github.com/rgrinberg/stringext.git" -synopsis: "Extra string functions for OCaml" -description: """ -Extra string functions for OCaml. Mainly splitting. All functions are in the -Stringext module. -""" -url { - src: - "https://github.com/rgrinberg/stringext/releases/download/1.6.0/stringext-1.6.0.tbz" - checksum: [ - "sha256=db41f5d52e9eab17615f110b899dfeb27dd7e7f89cd35ae43827c5119db206ea" - "sha512=d8ebe40f42b598a9bd99f1ef4b00ba93458385a4accd121af66a0bf3b3f8d7135f576740adf1a43081dd409977c2219fd4bdbb5b3d1308890d301d553ed49900" - ] -} diff --git a/test.esy.lock/opam/uri.3.1.0/opam b/test.esy.lock/opam/uri.3.1.0/opam deleted file mode 100644 index 45406b00a..000000000 --- a/test.esy.lock/opam/uri.3.1.0/opam +++ /dev/null @@ -1,35 +0,0 @@ -opam-version: "2.0" -maintainer: "anil@recoil.org" -authors: ["Anil Madhavapeddy" "David Sheets" "Rudi Grinberg"] -license: "ISC" -tags: ["url" "uri" "org:mirage" "org:xapi-project"] -homepage: "https://github.com/mirage/ocaml-uri" -bug-reports: "https://github.com/mirage/ocaml-uri/issues" -dev-repo: "git+https://github.com/mirage/ocaml-uri.git" -doc: "https://mirage.github.io/ocaml-uri/" -synopsis: "An RFC3986 URI/URL parsing library" -description: """ -This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification -for parsing URI or URLs. -""" -depends: [ - "ocaml" {>= "4.04.0"} - "dune" {>= "1.2.0"} - "ounit" {with-test & >= "1.0.2"} - "ppx_sexp_conv" {with-test & >= "v0.9.0" & < "v0.15"} - "re" {>= "1.9.0"} - "stringext" {>= "1.4.0"} -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -url { - src: - "https://github.com/mirage/ocaml-uri/releases/download/v3.1.0/uri-v3.1.0.tbz" - checksum: [ - "sha256=c452823fd870cf7cffe51aef3e9ca646a382dc6f87282f2b16bfe30a7515ac43" - "sha512=c015576bb077fd243022bcd8804e628d23a253dcd8bbdda8dc2a57e86cfeb9fd629087ec7d7e23dc71dd7cd137450ca2c5ecf8fb7d184ec9d1d4e41f6f83ee38" - ] -} diff --git a/test.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json b/test.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json deleted file mode 100644 index 312f6e01c..000000000 --- a/test.esy.lock/overrides/opam__s__conf_autoconf_opam__c__0.1_opam_override/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build": [ "true" ], - "dependencies": { - "esy-autoconf": "esy-packages/esy-autoconf#fb93edf" - } -} diff --git a/test.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json b/test.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json deleted file mode 100644 index f2b2e9f48..000000000 --- a/test.esy.lock/overrides/opam__s__dune_opam__c__2.6.2_opam_override/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "buildsInSource": true, - "build": [ - [ - "ocaml", - "configure.ml", - "--libdir", - "#{self.lib}" - ], - [ - "env", - "-u", - "OCAMLLIB", - "ocaml", - "bootstrap.ml" - ], - [ - "./dune.exe", - "build", - "-p", - "dune", - "--profile", - "dune-bootstrap" - ] - ], - "install": "esy-installer dune.install", - "buildEnv": { - "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", - "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" - }, - "dependencies": { - "ocaml": "*" - } -} diff --git a/test.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json b/test.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json new file mode 100644 index 000000000..affde1bc3 --- /dev/null +++ b/test.esy.lock/overrides/opam__s__dune_opam__c__2.7.0_opam_override/package.json @@ -0,0 +1,31 @@ +{ + "buildsInSource": true, + "build": [ + [ + "ocaml", + "configure.ml", + "--libdir", + "#{self.lib}" + ], + [ + "env", + "-u", + "OCAMLLIB", + "ocaml", + "bootstrap.ml" + ], + [ + "./dune.exe", + "build", + "-p", + "dune", + "--profile", + "dune-bootstrap" + ] + ], + "install": "esy-installer dune.install", + "buildEnv": { + "OCAMLFIND_CONF": "$OCAMLFIND_SECONDARY_PREFIX/lib/findlib.conf.d/ocaml-secondary-compiler.conf", + "OCAMLPATH": "#{ $OCAMLFIND_SECONDARY_PREFIX / 'lib' : ocaml.lib : $OCAML_SECONDARY_COMPILER_PREFIX / 'share' / 'ocaml-secondary-compiler' / 'lib' }" + } +} diff --git a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll deleted file mode 100755 index 26301ddd3..000000000 --- a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -# clone-flexdll -# -# Brings in flexdll, if necessary - -if [ -d "flexdll" ] && [ -f "flexdll/flexdll.c" ]; then - echo "[Flexdll] Already present, no need to clone." -else - echo "[Flexdll] Cloning..." - git clone https://github.com/esy-ocaml/flexdll.git - cd flexdll - git checkout f84baaeae463f96f9582883a9cfb7dd1096757ff - cd .. - echo "[Flexdll] Clone successful!" -fi \ No newline at end of file diff --git a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows b/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows deleted file mode 100755 index 4040b49ea..000000000 --- a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/configure-windows +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -# configure-windows -# -# Creates a native Windows MingW build, based on: -# https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc - - -export prefix=C:/ocamlmgw64 -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - esac - shift -done - -echo "[configure-windows] Setting up flexdll" -./clone-flexdll -./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32 --prefix=$prefix -make flexdll diff --git a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build b/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build deleted file mode 100755 index b95356a53..000000000 --- a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-build +++ /dev/null @@ -1,24 +0,0 @@ -#! /usr/bin/env bash - -# esy-build -# -# Wrapper to execute appropriate build strategy, based on platform - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-build] Detected windows environment..." - make -j4 world.opt - make flexlink.opt - ;; - *) - echo "[esy-build] Detected OSX / Linux environment" - make -j4 world.opt - ;; -esac - -# Common build steps -make install \ No newline at end of file diff --git a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure b/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure deleted file mode 100755 index fd196c517..000000000 --- a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/esy-configure +++ /dev/null @@ -1,29 +0,0 @@ -#! /usr/bin/env bash - -# esy-configure -# -# Wrapper to delegate to configuration to the -# appropriate `configure` strategy based on the active platform. -# -# Today, OCaml has separate build strategies: -# - Linux, OSX, Cygwin (gcc) - https://github.com/ocaml/ocaml/blob/trunk/INSTALL.adoc -# - Windows, Cygin (mingw) - https://github.com/ocaml/ocaml/blob/trunk/README.win32.adoc -# -# We want `esy` to work cross-platform, so this is a shim script that will delegate to the -# appropriate script depending on the platform. We assume that if the platform is `CYGWIN` -# that the `mingw` (native executable) strategy is desired. - -set -u -set -e -set -o pipefail - -case "$(uname -s)" in - CYGWIN*|MINGW32*|MSYS*) - echo "[esy-configure] Detected windows environment..." - ./configure-windows "$@" - ;; - *) - echo "[esy-configure] Detected OSX / Linux environment" - ./configure "$@" - ;; -esac \ No newline at end of file diff --git a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json b/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json deleted file mode 100644 index 948455caf..000000000 --- a/test.esy.lock/overrides/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "buildEnv": { - "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - }, - "build": [ - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-configure", - "--disable-cfi", - "--prefix", "$cur__install/share/ocaml-secondary-compiler", - "--libdir", "$cur__install/share/ocaml-secondary-compiler/lib", - "--disable-debugger", - "--disable-installing-bytecode-programs", - "--disable-debug-runtime", - "--disable-instrumented-runtime", - "--disable-graph-lib" - ], - [ - "env", - "-u", - "OCAMLLIB", - "bash", "./esy-build" - ] - ], - "buildsInSource": true -} diff --git a/test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch b/test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch deleted file mode 100644 index 3e3ee5a24..000000000 --- a/test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./Makefile -+++ ./Makefile -@@ -57,16 +57,16 @@ - cat findlib.conf.in | \ - $(SH) tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf - if ./tools/cmd_from_same_dir ocamlc; then \ -- echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \ -+ echo 'ocamlc="ocamlc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamlopt; then \ -- echo 'ocamlopt="ocamlopt.opt"' >>findlib.conf; \ -+ echo 'ocamlopt="ocamlopt.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldep; then \ -- echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ -+ echo 'ocamldep="ocamldep.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - if ./tools/cmd_from_same_dir ocamldoc; then \ -- echo 'ocamldoc="ocamldoc.opt"' >>findlib.conf; \ -+ echo 'ocamldoc="ocamldoc.opt$(EXEC_SUFFIX)"' >>findlib.conf; \ - fi - - .PHONY: install-doc ---- ./src/findlib/findlib_config.mlp -+++ ./src/findlib/findlib_config.mlp -@@ -24,3 +24,5 @@ - | "MacOS" -> "" (* don't know *) - | _ -> failwith "Unknown Sys.os_type" - ;; -+ -+let exec_suffix = "@EXEC_SUFFIX@";; ---- ./src/findlib/findlib.ml -+++ ./src/findlib/findlib.ml -@@ -28,15 +28,20 @@ - let conf_ldconf = ref "";; - let conf_ignore_dups_in = ref ([] : string list);; - --let ocamlc_default = "ocamlc";; --let ocamlopt_default = "ocamlopt";; --let ocamlcp_default = "ocamlcp";; --let ocamloptp_default = "ocamloptp";; --let ocamlmklib_default = "ocamlmklib";; --let ocamlmktop_default = "ocamlmktop";; --let ocamldep_default = "ocamldep";; --let ocamlbrowser_default = "ocamlbrowser";; --let ocamldoc_default = "ocamldoc";; -+let add_exec str = -+ match Findlib_config.exec_suffix with -+ | "" -> str -+ | a -> str ^ a ;; -+let ocamlc_default = add_exec "ocamlc";; -+let ocamlopt_default = add_exec "ocamlopt";; -+let ocamlcp_default = add_exec "ocamlcp";; -+let ocamloptp_default = add_exec "ocamloptp";; -+let ocamlmklib_default = add_exec "ocamlmklib";; -+let ocamlmktop_default = add_exec "ocamlmktop";; -+let ocamldep_default = add_exec "ocamldep";; -+let ocamlbrowser_default = add_exec "ocamlbrowser";; -+let ocamldoc_default = add_exec "ocamldoc";; -+ - - - let init_manually ---- ./src/findlib/fl_package_base.ml -+++ ./src/findlib/fl_package_base.ml -@@ -133,7 +133,15 @@ - List.find (fun def -> def.def_var = "exists_if") p.package_defs in - let files = Fl_split.in_words def.def_value in - List.exists -- (fun file -> Sys.file_exists (Filename.concat d' file)) -+ (fun file -> -+ let fln = Filename.concat d' file in -+ let e = Sys.file_exists fln in -+ (* necessary for ppx executables *) -+ if e || Sys.os_type <> "Win32" || Filename.check_suffix fln ".exe" then -+ e -+ else -+ Sys.file_exists (fln ^ ".exe") -+ ) - files - with Not_found -> true in - ---- ./src/findlib/fl_split.ml -+++ ./src/findlib/fl_split.ml -@@ -126,10 +126,17 @@ - | '/' | '\\' -> true - | _ -> false in - let norm_dir_win() = -- if l >= 1 && s.[0] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[0]; -- if l >= 2 && s.[1] = '/' then -- Buffer.add_char b '\\' else Buffer.add_char b s.[1]; -+ if l >= 1 then ( -+ if s.[0] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[0] ; -+ if l >= 2 then -+ if s.[1] = '/' then -+ Buffer.add_char b '\\' -+ else -+ Buffer.add_char b s.[1]; -+ ); - for k = 2 to l - 1 do - let c = s.[k] in - if is_slash c then ( ---- ./src/findlib/frontend.ml -+++ ./src/findlib/frontend.ml -@@ -31,10 +31,18 @@ - else - Sys_error (arg ^ ": " ^ Unix.error_message code) - -+let is_win = Sys.os_type = "Win32" -+ -+let () = -+ match Findlib_config.system with -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> -+ (try set_binary_mode_out stdout true with _ -> ()); -+ (try set_binary_mode_out stderr true with _ -> ()); -+ | _ -> () - - let slashify s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "cygwin" | "mingw64" | "cygwin64" -> - let b = Buffer.create 80 in - String.iter - (function -@@ -49,7 +57,7 @@ - - let out_path ?(prefix="") s = - match Findlib_config.system with -- | "mingw" | "mingw64" | "cygwin" -> -+ | "win32" | "win64" | "mingw" | "mingw64" | "cygwin" -> - let u = slashify s in - prefix ^ - (if String.contains u ' ' then -@@ -273,11 +281,9 @@ - - - let identify_dir d = -- match Sys.os_type with -- | "Win32" -> -- failwith "identify_dir" (* not available *) -- | _ -> -- let s = Unix.stat d in -+ if is_win then -+ failwith "identify_dir"; (* not available *) -+ let s = Unix.stat d in - (s.Unix.st_dev, s.Unix.st_ino) - ;; - -@@ -459,6 +465,96 @@ - ) - packages - -+let rewrite_cmd s = -+ if s = "" || not is_win then -+ s -+ else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_cmd s = -+ if s = "" || not is_win then s else -+ let s = -+ let l = String.length s in -+ let b = Buffer.create l in -+ for i = 0 to pred l do -+ match s.[i] with -+ | '/' -> Buffer.add_char b '\\' -+ | x -> Buffer.add_char b x -+ done; -+ Buffer.contents b -+ in -+ if (Filename.is_implicit s && String.contains s '\\' = false) || -+ Filename.check_suffix (String.lowercase s) ".exe" then -+ s -+ else -+ let s' = s ^ ".exe" in -+ if Sys.file_exists s' then -+ s' -+ else -+ s -+ -+let rewrite_pp cmd = -+ if not is_win then cmd else -+ let module T = struct exception Keep end in -+ let is_whitespace = function -+ | ' ' | '\011' | '\012' | '\n' | '\r' | '\t' -> true -+ | _ -> false in -+ (* characters that triggers special behaviour (cmd.exe, not unix shell) *) -+ let is_unsafe_char = function -+ | '(' | ')' | '%' | '!' | '^' | '<' | '>' | '&' -> true -+ | _ -> false in -+ let len = String.length cmd in -+ let buf = Buffer.create (len + 4) in -+ let buf_cmd = Buffer.create len in -+ let rec iter_ws i = -+ if i >= len then () else -+ let cur = cmd.[i] in -+ if is_whitespace cur then ( -+ Buffer.add_char buf cur; -+ iter_ws (succ i) -+ ) -+ else -+ iter_cmd i -+ and iter_cmd i = -+ if i >= len then add_buf_cmd () else -+ let cur = cmd.[i] in -+ if is_unsafe_char cur || cur = '"' || cur = '\'' then -+ raise T.Keep; -+ if is_whitespace cur then ( -+ add_buf_cmd (); -+ Buffer.add_substring buf cmd i (len - i) -+ ) -+ else ( -+ Buffer.add_char buf_cmd cur; -+ iter_cmd (succ i) -+ ) -+ and add_buf_cmd () = -+ if Buffer.length buf_cmd > 0 then -+ Buffer.add_string buf (rewrite_cmd (Buffer.contents buf_cmd)) -+ in -+ try -+ iter_ws 0; -+ Buffer.contents buf -+ with -+ | T.Keep -> cmd - - let process_pp_spec syntax_preds packages pp_opts = - (* Returns: pp_command *) -@@ -549,7 +645,7 @@ - None -> [] - | Some cmd -> - ["-pp"; -- cmd ^ " " ^ -+ (rewrite_cmd cmd) ^ " " ^ - String.concat " " (List.map Filename.quote pp_i_options) ^ " " ^ - String.concat " " (List.map Filename.quote pp_archives) ^ " " ^ - String.concat " " (List.map Filename.quote pp_opts)] -@@ -625,9 +721,11 @@ - in - try - let preprocessor = -+ rewrite_cmd ( - resolve_path - ~base ~explicit:true -- (package_property predicates pname "ppx") in -+ (package_property predicates pname "ppx") ) -+ in - ["-ppx"; String.concat " " (preprocessor :: options)] - with Not_found -> [] - ) -@@ -895,6 +993,14 @@ - switch (e.g. -L instead of -L ) - *) - -+(* We may need to remove files on which we do not have complete control. -+ On Windows, removing a read-only file fails so try to change the -+ mode of the file first. *) -+let remove_file fname = -+ try Sys.remove fname -+ with Sys_error _ when is_win -> -+ (try Unix.chmod fname 0o666 with Unix.Unix_error _ -> ()); -+ Sys.remove fname - - let ocamlc which () = - -@@ -1022,9 +1128,12 @@ - - "-intf", - Arg.String (fun s -> pass_files := !pass_files @ [ Intf(slashify s) ]); -- -+ - "-pp", -- Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" s); -+ Arg.String (fun s -> pp_specified := true; add_spec_fn "-pp" (rewrite_pp s)); -+ -+ "-ppx", -+ Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); - - "-thread", - Arg.Unit (fun _ -> threads := threads_default); -@@ -1237,7 +1346,7 @@ - with - any -> - close_out initl; -- Sys.remove initl_file_name; -+ remove_file initl_file_name; - raise any - end; - -@@ -1245,9 +1354,9 @@ - at_exit - (fun () -> - let tr f x = try f x with _ -> () in -- tr Sys.remove initl_file_name; -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmi"); -- tr Sys.remove (Filename.chop_extension initl_file_name ^ ".cmo"); -+ tr remove_file initl_file_name; -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmi"); -+ tr remove_file (Filename.chop_extension initl_file_name ^ ".cmo"); - ); - - let exclude_list = [ stdlibdir; threads_dir; vmthreads_dir ] in -@@ -1493,7 +1602,9 @@ - [ "-v", Arg.Unit (fun () -> verbose := Verbose); - "-pp", Arg.String (fun s -> - pp_specified := true; -- options := !options @ ["-pp"; s]); -+ options := !options @ ["-pp"; rewrite_pp s]); -+ "-ppx", Arg.String (fun s -> -+ options := !options @ ["-ppx"; rewrite_pp s]); - ] - ) - ) -@@ -1672,7 +1783,9 @@ - Arg.String (fun s -> add_spec_fn "-I" (slashify (resolve_path s))); - - "-pp", Arg.String (fun s -> pp_specified := true; -- add_spec_fn "-pp" s); -+ add_spec_fn "-pp" (rewrite_pp s)); -+ "-ppx", Arg.String (fun s -> add_spec_fn "-ppx" (rewrite_pp s)); -+ - ] - ) - ) -@@ -1830,7 +1943,10 @@ - output_string ch_out append; - close_out ch_out; - close_in ch_in; -- Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime; -+ (try Unix.utimes outpath s.Unix.st_mtime s.Unix.st_mtime -+ with Unix.Unix_error(e,_,_) -> -+ prerr_endline("Warning: setting utimes for " ^ outpath -+ ^ ": " ^ Unix.error_message e)); - - prerr_endline("Installed " ^ outpath); - with -@@ -1882,6 +1998,8 @@ - Unix.openfile (Filename.concat dir owner_file) [Unix.O_RDONLY] 0 in - let f = - Unix.in_channel_of_descr fd in -+ if is_win then -+ set_binary_mode_in f false; - try - let line = input_line f in - let is_my_file = (line = pkg) in -@@ -2208,7 +2326,7 @@ - let lines = read_ldconf !ldconf in - let dlldir_norm = Fl_split.norm_dir dlldir in - let dlldir_norm_lc = string_lowercase_ascii dlldir_norm in -- let ci_filesys = (Sys.os_type = "Win32") in -+ let ci_filesys = is_win in - let check_dir d = - let d' = Fl_split.norm_dir d in - (d' = dlldir_norm) || -@@ -2356,7 +2474,7 @@ - List.iter - (fun file -> - let absfile = Filename.concat dlldir file in -- Sys.remove absfile; -+ remove_file absfile; - prerr_endline ("Removed " ^ absfile) - ) - dll_files -@@ -2365,7 +2483,7 @@ - (* Remove the files from the package directory: *) - if Sys.file_exists pkgdir then begin - let files = Sys.readdir pkgdir in -- Array.iter (fun f -> Sys.remove (Filename.concat pkgdir f)) files; -+ Array.iter (fun f -> remove_file (Filename.concat pkgdir f)) files; - Unix.rmdir pkgdir; - prerr_endline ("Removed " ^ pkgdir) - end -@@ -2415,7 +2533,9 @@ - - - let print_configuration() = -+ let sl = slashify in - let dir s = -+ let s = sl s in - if Sys.file_exists s then - s - else -@@ -2453,27 +2573,27 @@ - if md = "" then "the corresponding package directories" else dir md - ); - Printf.printf "The standard library is assumed to reside in:\n %s\n" -- (Findlib.ocaml_stdlib()); -+ (sl (Findlib.ocaml_stdlib())); - Printf.printf "The ld.conf file can be found here:\n %s\n" -- (Findlib.ocaml_ldconf()); -+ (sl (Findlib.ocaml_ldconf())); - flush stdout - | Some "conf" -> -- print_endline (Findlib.config_file()) -+ print_endline (sl (Findlib.config_file())) - | Some "path" -> -- List.iter print_endline (Findlib.search_path()) -+ List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path()) - | Some "destdir" -> -- print_endline (Findlib.default_location()) -+ print_endline ( sl (Findlib.default_location())) - | Some "metadir" -> -- print_endline (Findlib.meta_directory()) -+ print_endline ( sl (Findlib.meta_directory())) - | Some "metapath" -> - let mdir = Findlib.meta_directory() in - let ddir = Findlib.default_location() in -- print_endline -- (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META") -+ print_endline ( sl -+ (if mdir <> "" then mdir ^ "/META.%s" else ddir ^ "/%s/META")) - | Some "stdlib" -> -- print_endline (Findlib.ocaml_stdlib()) -+ print_endline ( sl (Findlib.ocaml_stdlib())) - | Some "ldconf" -> -- print_endline (Findlib.ocaml_ldconf()) -+ print_endline ( sl (Findlib.ocaml_ldconf())) - | _ -> - assert false - ;; -@@ -2481,7 +2601,7 @@ - - let ocamlcall pkg cmd = - let dir = package_directory pkg in -- let path = Filename.concat dir cmd in -+ let path = rewrite_cmd (Filename.concat dir cmd) in - begin - try Unix.access path [ Unix.X_OK ] - with -@@ -2647,6 +2767,10 @@ - | Sys_error f -> - prerr_endline ("ocamlfind: " ^ f); - exit 2 -+ | Unix.Unix_error (e, fn, f) -> -+ prerr_endline ("ocamlfind: " ^ fn ^ " " ^ f -+ ^ ": " ^ Unix.error_message e); -+ exit 2 - | Findlib.No_such_package(pkg,info) -> - prerr_endline ("ocamlfind: Package `" ^ pkg ^ "' not found" ^ - (if info <> "" then " - " ^ info else "")); ---- ./src/findlib/Makefile -+++ ./src/findlib/Makefile -@@ -90,6 +90,7 @@ - cat findlib_config.mlp | \ - $(SH) $(TOP)/tools/patch '@CONFIGFILE@' '$(OCAMLFIND_CONF)' | \ - $(SH) $(TOP)/tools/patch '@STDLIB@' '$(OCAML_CORE_STDLIB)' | \ -+ $(SH) $(TOP)/tools/patch '@EXEC_SUFFIX@' '$(EXEC_SUFFIX)' | \ - sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \ - -e 's;@SYSTEM@;$(SYSTEM);g' \ - >findlib_config.ml diff --git a/test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh b/test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh deleted file mode 100644 index c923ef49e..000000000 --- a/test.esy.lock/overrides/opam__s__ocamlfind_secondary_opam__c__1.8.1_opam_override/files/gen-findlib-conf.sh +++ /dev/null @@ -1,14 +0,0 @@ -OCAML_SECONDARY_COMPILER=$1 - -cat >ocaml-secondary-compiler.conf <META <