diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2bd2fc8ad..e9a3cc86c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,19 +38,9 @@ jobs: with: ocaml-version: ${{ matrix.ocaml-version }} - # Pull the Mdx submodule - # actions/checkout doesn't support that - # Also, this is supposed to be temporary - - run: git submodule update --init - - name: Install dependencies if: steps.cache.outputs.cache-hit != 'true' run: | - # Mdx dependencies - opam pin add -n ./mdx - opam depext -y -t mdx - opam install --deps-only mdx - # - opam pin add -n . opam depext -y -t odoc opam install --deps-only -t odoc @@ -104,4 +94,4 @@ jobs: run: esy install --verbose - name: Build odoc - run: esy odoc --version + run: esy x odoc --version diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index cb8042de52..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "mdx"] - path = mdx - url = https://github.com/jonludlam/mdx diff --git a/dune b/dune index 44c0c83d5b..7fc2364be1 100644 --- a/dune +++ b/dune @@ -8,5 +8,3 @@ (release (flags (:standard -g -w -18-53)))) - -(vendored_dirs mdx) diff --git a/dune-project b/dune-project index 198c1503b8..7e1d9cab26 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,3 @@ (lang dune 2.7) (name odoc) -(using mdx 0.1) (cram enable) diff --git a/esy.lock/index.json b/esy.lock/index.json index 13cc3895e9..22692a904e 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "28966419b039dee26ad0800b10c4fcf8", + "checksum": "54a2ca2738bd3f24d15cb7a71b92c9e3", "root": "odoc@link-dev:./package.json", "node": { "odoc@link-dev:./package.json": { @@ -17,14 +17,13 @@ "@opam/sexplib0@opam:v0.14.0@ddeb6438", "@opam/result@opam:1.4@dc720aef", "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/mdx@opam:1.7.0@0554d529", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/markup@github:aantron/markup.ml:markup.opam#9f8e77@d41d8cd9", "@opam/lambdasoup@opam:0.7.1@4ede102f", - "@opam/fpath@opam:0.7.2@3fd2da53", "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/fpath@opam:0.7.2@3fd2da53", "@opam/dune@opam:2.7.1@baccb77f", "@opam/cppo@opam:1.6.5@f8ff4f1a", "@opam/cmdliner@opam:1.0.2@1c17346c", - "@opam/bisect_ppx@opam:2.4.1@b38eb938", + "@opam/bisect_ppx@opam:2.4.1@dfb4bc5f", "@opam/astring@opam:0.8.3@1e8f8178", "@opam/alcotest@opam:0.8.5@4bc922ed" ], @@ -81,13 +80,13 @@ "overrides": [], "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.5@f8ff4f1a", + "@opam/dune@opam:2.7.1@baccb77f", "@opam/cppo@opam:1.6.5@f8ff4f1a", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/biniou@opam:1.2.1@d7570399" + "@opam/dune@opam:2.7.1@baccb77f", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uutf@opam:1.0.2@4440868f": { @@ -110,7 +109,7 @@ "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.2@1c17346c", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -138,7 +137,7 @@ "overrides": [], "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.2@1c17346c", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -188,12 +187,12 @@ "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f", "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:2.7.1@f5f493bc" + "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/topkg@opam:1.0.3@e4e10f1c": { @@ -214,7 +213,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -222,29 +221,29 @@ "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03" ] }, - "@opam/stdlib-shims@opam:0.1.0@148f22ac": { - "id": "@opam/stdlib-shims@opam:0.1.0@148f22ac", + "@opam/stdlib-shims@opam:0.3.0@0d088929": { + "id": "@opam/stdlib-shims@opam:0.3.0@0d088929", "name": "@opam/stdlib-shims", - "version": "opam:0.1.0", + "version": "opam:0.3.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/12/12b5704eed70c6bff5ac39a16db1425d#md5:12b5704eed70c6bff5ac39a16db1425d", - "archive:https://github.com/ocaml/stdlib-shims/releases/download/0.1.0/stdlib-shims-0.1.0.tbz#md5:12b5704eed70c6bff5ac39a16db1425d" + "archive:https://opam.ocaml.org/cache/sha256/ba/babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a#sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a", + "archive:https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz#sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a" ], "opam": { "name": "stdlib-shims", - "version": "0.1.0", - "path": "esy.lock/opam/stdlib-shims.0.1.0" + "version": "0.3.0", + "path": "esy.lock/opam/stdlib-shims.0.3.0" } }, "overrides": [], "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/sexplib0@opam:v0.14.0@ddeb6438": { @@ -265,11 +264,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/seq@opam:0.2.2@e9144e45": { @@ -290,11 +289,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/result@opam:1.4@dc720aef": { @@ -315,11 +314,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { @@ -341,11 +340,11 @@ "overrides": [], "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", - "@opam/dune@opam:2.7.1@f5f493bc" + "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414": { @@ -367,13 +366,13 @@ "overrides": [], "dependencies": [ "ocaml@4.6.1003@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ocaml-migrate-parsetree@opam:1.8.0@caf9847c", + "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173", - "@opam/dune@opam:2.7.1@f5f493bc" + "@opam/ocaml-migrate-parsetree@opam:1.8.0@caf9847c", + "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -394,44 +393,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" - ] - }, - "@opam/odoc@opam:1.5.2@236518eb": { - "id": "@opam/odoc@opam:1.5.2@236518eb", - "name": "@opam/odoc", - "version": "opam:1.5.2", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/d2/d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871", - "archive:https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871" - ], - "opam": { - "name": "odoc", - "version": "1.5.2", - "path": "esy.lock/opam/odoc.1.5.2" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/tyxml@opam:4.3.0@c1da25f1", - "@opam/result@opam:1.4@dc720aef", "@opam/fpath@opam:0.7.2@3fd2da53", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.5@f8ff4f1a", - "@opam/cmdliner@opam:1.0.2@1c17346c", - "@opam/astring@opam:0.8.3@1e8f8178", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/tyxml@opam:4.3.0@c1da25f1", - "@opam/result@opam:1.4@dc720aef", "@opam/fpath@opam:0.7.2@3fd2da53", - "@opam/dune@opam:2.7.1@f5f493bc", - "@opam/cmdliner@opam:1.0.2@1c17346c", - "@opam/astring@opam:0.8.3@1e8f8178" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/ocamlfind-secondary@opam:1.8.1@1afa38b2": { @@ -458,17 +424,17 @@ } ], "dependencies": [ - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@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/ocamlfind@opam:1.8.1@b7dc3072", "@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", + "@opam/ocamlfind@opam:1.8.1@b7dc3072": { + "id": "@opam/ocamlfind@opam:1.8.1@b7dc3072", "name": "@opam/ocamlfind", "version": "opam:1.8.1", "source": { @@ -523,32 +489,6 @@ ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] }, - "@opam/ocaml-version@opam:2.6.1@d85bfa24": { - "id": "@opam/ocaml-version@opam:2.6.1@d85bfa24", - "name": "@opam/ocaml-version", - "version": "opam:2.6.1", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/a9/a986eb48c55b85d4df001a88c3d5bb28188079811a3714af9cb90bf6d9f88964#sha256:a986eb48c55b85d4df001a88c3d5bb28188079811a3714af9cb90bf6d9f88964", - "archive:https://github.com/ocurrent/ocaml-version/releases/download/v2.6.1/ocaml-version-v2.6.1.tbz#sha256:a986eb48c55b85d4df001a88c3d5bb28188079811a3714af9cb90bf6d9f88964" - ], - "opam": { - "name": "ocaml-version", - "version": "2.6.1", - "path": "esy.lock/opam/ocaml-version.2.6.1" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/dune@opam:2.7.1@f5f493bc" - ] - }, "@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", @@ -576,8 +516,8 @@ ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] }, - "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173": { - "id": "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173", + "@opam/ocaml-migrate-parsetree@opam:1.8.0@caf9847c": { + "id": "@opam/ocaml-migrate-parsetree@opam:1.8.0@caf9847c", "name": "@opam/ocaml-migrate-parsetree", "version": "opam:1.8.0", "source": { @@ -596,12 +536,12 @@ "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:2.7.1@f5f493bc" + "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/merlin@opam:3.3.9@e0b69f63": { @@ -623,54 +563,13 @@ "overrides": [], "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ocamlfind@opam:1.8.1@b7dc3072", + "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/dune@opam:2.7.1@f5f493bc" - ] - }, - "@opam/mdx@opam:1.7.0@0554d529": { - "id": "@opam/mdx@opam:1.7.0@0554d529", - "name": "@opam/mdx", - "version": "opam:1.7.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/sha256/27/270e805d32923dadfaa45f09377a0863d691a2e772bb0c99bf7bd0673518ec6e#sha256:270e805d32923dadfaa45f09377a0863d691a2e772bb0c99bf7bd0673518ec6e", - "archive:https://github.com/realworldocaml/mdx/releases/download/1.7.0/mdx-1.7.0.tbz#sha256:270e805d32923dadfaa45f09377a0863d691a2e772bb0c99bf7bd0673518ec6e" - ], - "opam": { - "name": "mdx", - "version": "1.7.0", - "path": "esy.lock/opam/mdx.1.7.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/odoc@opam:1.5.2@236518eb", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-version@opam:2.6.1@d85bfa24", - "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173", - "@opam/logs@opam:0.7.0@1d03143e", "@opam/fmt@opam:0.8.9@e0843a5b", - "@opam/dune@opam:2.7.1@f5f493bc", "@opam/cppo@opam:1.6.5@f8ff4f1a", - "@opam/cmdliner@opam:1.0.2@1c17346c", - "@opam/astring@opam:0.8.3@1e8f8178", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.4@dc720aef", - "@opam/re@opam:1.9.0@d4d5e13d", "@opam/odoc@opam:1.5.2@236518eb", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-version@opam:2.6.1@d85bfa24", - "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173", - "@opam/logs@opam:0.7.0@1d03143e", "@opam/fmt@opam:0.8.9@e0843a5b", - "@opam/dune@opam:2.7.1@f5f493bc", - "@opam/cmdliner@opam:1.0.2@1c17346c", - "@opam/astring@opam:0.8.3@1e8f8178" + "@opam/ocamlfind@opam:1.8.1@b7dc3072", + "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/markup@github:aantron/markup.ml:markup.opam#9f8e77@d41d8cd9": { @@ -685,43 +584,15 @@ "overrides": [], "dependencies": [ "@opam/uutf@opam:1.0.2@4440868f", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/dune@opam:2.7.1@f5f493bc", - "@opam/bisect_ppx@opam:2.4.1@b38eb938", + "@opam/dune@opam:2.7.1@baccb77f", + "@opam/bisect_ppx@opam:2.4.1@dfb4bc5f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/uutf@opam:1.0.2@4440868f", "@opam/uchar@opam:0.0.2@c8218eea", - "@opam/bisect_ppx@opam:2.4.1@b38eb938" + "@opam/bisect_ppx@opam:2.4.1@dfb4bc5f" ] }, - "@opam/logs@opam:0.7.0@1d03143e": { - "id": "@opam/logs@opam:0.7.0@1d03143e", - "name": "@opam/logs", - "version": "opam:0.7.0", - "source": { - "type": "install", - "source": [ - "archive:https://opam.ocaml.org/cache/md5/2b/2bf021ca13331775e33cf34ab60246f7#md5:2bf021ca13331775e33cf34ab60246f7", - "archive:https://erratique.ch/software/logs/releases/logs-0.7.0.tbz#md5:2bf021ca13331775e33cf34ab60246f7" - ], - "opam": { - "name": "logs", - "version": "0.7.0", - "path": "esy.lock/opam/logs.0.7.0" - } - }, - "overrides": [], - "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", - "@opam/fmt@opam:0.8.9@e0843a5b", - "@opam/cmdliner@opam:1.0.2@1c17346c", - "@opam/base-threads@opam:base@36803084", - "@esy-ocaml/substs@0.0.1@d41d8cd9" - ], - "devDependencies": [ "ocaml@4.6.1003@d41d8cd9" ] - }, "@opam/lambdasoup@opam:0.7.1@4ede102f": { "id": "@opam/lambdasoup@opam:0.7.1@4ede102f", "name": "@opam/lambdasoup", @@ -742,12 +613,12 @@ "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/markup@github:aantron/markup.ml:markup.opam#9f8e77@d41d8cd9", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/markup@github:aantron/markup.ml:markup.opam#9f8e77@d41d8cd9", - "@opam/dune@opam:2.7.1@f5f493bc" + "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2": { @@ -792,7 +663,7 @@ "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", "@opam/result@opam:1.4@dc720aef", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/astring@opam:0.8.3@1e8f8178", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -821,16 +692,16 @@ "overrides": [], "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/stdlib-shims@opam:0.1.0@148f22ac", + "@opam/stdlib-shims@opam:0.3.0@0d088929", "@opam/seq@opam:0.2.2@e9144e45", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.2@1c17346c", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac", + "ocaml@4.6.1003@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@0d088929", "@opam/seq@opam:0.2.2@e9144e45" ] }, @@ -852,15 +723,15 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc", + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@f5f493bc" + "ocaml@4.6.1003@d41d8cd9", "@opam/dune@opam:2.7.1@baccb77f" ] }, - "@opam/dune@opam:2.7.1@f5f493bc": { - "id": "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dune@opam:2.7.1@baccb77f": { + "id": "@opam/dune@opam:2.7.1@baccb77f", "name": "@opam/dune", "version": "opam:2.7.1", "source": { @@ -969,7 +840,7 @@ "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", "@opam/result@opam:1.4@dc720aef", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -977,8 +848,8 @@ "ocaml@4.6.1003@d41d8cd9", "@opam/result@opam:1.4@dc720aef" ] }, - "@opam/bisect_ppx@opam:2.4.1@b38eb938": { - "id": "@opam/bisect_ppx@opam:2.4.1@b38eb938", + "@opam/bisect_ppx@opam:2.4.1@dfb4bc5f": { + "id": "@opam/bisect_ppx@opam:2.4.1@dfb4bc5f", "name": "@opam/bisect_ppx", "version": "opam:2.4.1", "source": { @@ -997,8 +868,8 @@ "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", - "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173", - "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/ocaml-migrate-parsetree@opam:1.8.0@caf9847c", + "@opam/dune@opam:2.7.1@baccb77f", "@opam/cmdliner@opam:1.0.2@1c17346c", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1006,8 +877,8 @@ "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/ppx_tools_versioned@opam:5.4.0@32d1a414", - "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173", - "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/ocaml-migrate-parsetree@opam:1.8.0@caf9847c", + "@opam/dune@opam:2.7.1@baccb77f", "@opam/cmdliner@opam:1.0.2@1c17346c", "@opam/base-unix@opam:base@87d0b2eb" ] @@ -1031,11 +902,11 @@ "overrides": [], "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.7.1@f5f493bc", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:2.7.1@baccb77f", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:2.7.1@f5f493bc" + "@opam/dune@opam:2.7.1@baccb77f" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -1087,11 +958,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" + "ocaml@4.6.1003@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@b7dc3072" ] }, "@opam/astring@opam:0.8.3@1e8f8178": { @@ -1113,7 +984,7 @@ "overrides": [], "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c", - "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/ocamlfind@opam:1.8.1@b7dc3072", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1142,7 +1013,7 @@ "dependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/uuidm@opam:0.9.7@bf725775", "@opam/result@opam:1.4@dc720aef", "@opam/fmt@opam:0.8.9@e0843a5b", - "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dune@opam:2.7.1@baccb77f", "@opam/cmdliner@opam:1.0.2@1c17346c", "@opam/astring@opam:0.8.3@1e8f8178", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -1150,7 +1021,7 @@ "devDependencies": [ "ocaml@4.6.1003@d41d8cd9", "@opam/uuidm@opam:0.9.7@bf725775", "@opam/result@opam:1.4@dc720aef", "@opam/fmt@opam:0.8.9@e0843a5b", - "@opam/dune@opam:2.7.1@f5f493bc", + "@opam/dune@opam:2.7.1@baccb77f", "@opam/cmdliner@opam:1.0.2@1c17346c", "@opam/astring@opam:0.8.3@1e8f8178" ] diff --git a/esy.lock/opam/bisect_ppx.2.4.1/opam b/esy.lock/opam/bisect_ppx.2.4.1/opam index 238e6e5bba..981cc68db0 100644 --- a/esy.lock/opam/bisect_ppx.2.4.1/opam +++ b/esy.lock/opam/bisect_ppx.2.4.1/opam @@ -23,6 +23,7 @@ depends: [ "cmdliner" {>= "1.0.0"} "dune" "ocaml" {>= "4.02.0"} + "ocaml" {with-test & < "4.12"} "ocaml-migrate-parsetree" {>= "1.7.0" & < "2.0.0"} "ppx_tools_versioned" {>= "5.4.0"} @@ -32,7 +33,7 @@ depends: [ build: [ ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name] {with-test} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] post-messages: [ diff --git a/esy.lock/opam/dune.2.7.1/opam b/esy.lock/opam/dune.2.7.1/opam index aaa13e6777..3b175872c1 100644 --- a/esy.lock/opam/dune.2.7.1/opam +++ b/esy.lock/opam/dune.2.7.1/opam @@ -42,7 +42,7 @@ build: [ depends: [ # Please keep the lower bound in sync with .github/workflows/workflow.yml, # dune-project and min_ocaml_version in bootstrap.ml - ("ocaml" {>= "4.08"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) + ("ocaml" {>= "4.08" & < "4.12"} | ("ocaml" {< "4.08~~"} & "ocamlfind-secondary")) "base-unix" "base-threads" ] diff --git a/esy.lock/opam/logs.0.7.0/opam b/esy.lock/opam/logs.0.7.0/opam deleted file mode 100644 index e69bb7f6f2..0000000000 --- a/esy.lock/opam/logs.0.7.0/opam +++ /dev/null @@ -1,64 +0,0 @@ -opam-version: "2.0" -maintainer: "Daniel Bünzli " -authors: ["The logs programmers"] -homepage: "https://erratique.ch/software/logs" -doc: "https://erratique.ch/software/logs/doc" -dev-repo: "git+https://erratique.ch/repos/logs.git" -bug-reports: "https://github.com/dbuenzli/logs/issues" -tags: [ "log" "system" "org:erratique" ] -license: "ISC" -depends: [ - "ocaml" {>= "4.03.0"} - "ocamlfind" {build} - "ocamlbuild" {build} - "topkg" {build} - "mtime" {with-test} ] -depopts: [ - "js_of_ocaml" - "fmt" - "cmdliner" - "lwt" - "base-threads" -] -conflicts: [ - "js_of_ocaml" { < "3.3.0" } ] - -build: [[ - "ocaml" "pkg/pkg.ml" "build" - "--pinned" "%{pinned}%" - "--with-js_of_ocaml" "%{js_of_ocaml:installed}%" - "--with-fmt" "%{fmt:installed}%" - "--with-cmdliner" "%{cmdliner:installed}%" - "--with-lwt" "%{lwt:installed}%" - "--with-base-threads" "%{base-threads:installed}%" -]] - -synopsis: """Logging infrastructure for OCaml""" -description: """\ - -Logs provides a logging infrastructure for OCaml. Logging is performed -on sources whose reporting level can be set independently. Log message -report is decoupled from logging and is handled by a reporter. - -A few optional log reporters are distributed with the base library and -the API easily allows to implement your own. - -`Logs` has no dependencies. The optional `Logs_fmt` reporter on OCaml -formatters depends on [Fmt][fmt]. The optional `Logs_browser` -reporter that reports to the web browser console depends on -[js_of_ocaml][jsoo]. The optional `Logs_cli` library that provides -command line support for controlling Logs depends on -[`Cmdliner`][cmdliner]. The optional `Logs_lwt` library that provides -Lwt logging functions depends on [`Lwt`][lwt] - -Logs and its reporters are distributed under the ISC license. - -[fmt]: http://erratique.ch/software/fmt -[jsoo]: http://ocsigen.org/js_of_ocaml/ -[cmdliner]: http://erratique.ch/software/cmdliner -[lwt]: http://ocsigen.org/lwt/ -""" -url { -archive: "https://erratique.ch/software/logs/releases/logs-0.7.0.tbz" -checksum: "2bf021ca13331775e33cf34ab60246f7" -} diff --git a/esy.lock/opam/mdx.1.7.0/opam b/esy.lock/opam/mdx.1.7.0/opam deleted file mode 100644 index 400d772556..0000000000 --- a/esy.lock/opam/mdx.1.7.0/opam +++ /dev/null @@ -1,58 +0,0 @@ -opam-version: "2.0" -maintainer: "Thomas Gazagnaire " -authors: ["Thomas Gazagnaire = "4.02.3" & < "4.12.0"} - "dune" {>= "2.0"} - "ocamlfind" - "fmt" - "cppo" {build} - "astring" - "logs" - "cmdliner" {>= "1.0.0"} - "re" {>= "1.7.2"} - "result" - "ocaml-migrate-parsetree" {>= "1.0.6" & < "2.0.0"} - "ocaml-version" {>= "2.3.0"} - "odoc" - "lwt" {with-test} - "alcotest" {with-test} -] - -synopsis: "Executable code blocks inside markdown files" -description: """ -`ocaml-mdx` allows to execute code blocks inside markdown files. -There are (currently) two sub-commands, corresponding -to two modes of operations: pre-processing (`ocaml-mdx pp`) -and tests (`ocaml-mdx test`). - -The pre-processor mode allows to mix documentation and code, -and to practice "literate programming" using markdown and OCaml. - -The test mode allows to ensure that shell scripts and OCaml fragments -in the documentation always stays up-to-date. - -`ocaml-mdx` is released as two binaries called `ocaml-mdx` and `mdx` which are -the same, mdx being the deprecated name, kept for now for compatibility. -""" -x-commit-hash: "84e303587ef9d47b6cff30d921066ceaaae33490" -url { - src: - "https://github.com/realworldocaml/mdx/releases/download/1.7.0/mdx-1.7.0.tbz" - checksum: [ - "sha256=270e805d32923dadfaa45f09377a0863d691a2e772bb0c99bf7bd0673518ec6e" - "sha512=6ea55660ba3a79e4867a0b3ced2cb6bc8f46c0ce4633114365a929fb465070e46699b05daeeefc08bce83742c0e9931e55ad6cf9376d9b76313a28ebb8d05425" - ] -} diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.8.0/opam b/esy.lock/opam/ocaml-migrate-parsetree.1.8.0/opam index fbf553ae3d..84f1fae4a4 100644 --- a/esy.lock/opam/ocaml-migrate-parsetree.1.8.0/opam +++ b/esy.lock/opam/ocaml-migrate-parsetree.1.8.0/opam @@ -17,7 +17,7 @@ depends: [ "result" "ppx_derivers" "dune" {>= "1.9.0"} - "ocaml" {>= "4.02.3"} + "ocaml" {>= "4.02.3" & < "4.13"} ] synopsis: "Convert OCaml parsetrees between different versions" description: """ diff --git a/esy.lock/opam/ocaml-version.2.6.1/opam b/esy.lock/opam/ocaml-version.2.6.1/opam deleted file mode 100644 index 4ea169357c..0000000000 --- a/esy.lock/opam/ocaml-version.2.6.1/opam +++ /dev/null @@ -1,48 +0,0 @@ -opam-version: "2.0" -maintainer: "Anil Madhavapeddy " -authors: "Anil Madhavapeddy " -license: "ISC" -tags: "org:ocamllabs" -homepage: "https://github.com/ocurrent/ocaml-version" -doc: "https://ocurrent.github.io/ocaml-version/doc" -bug-reports: "https://github.com/ocurrent/ocaml-version/issues" -depends: [ - "ocaml" {>= "4.02.0"} - "dune" - "result" -] -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -dev-repo: "git+https://github.com/ocurrent/ocaml-version.git" -synopsis: "Manipulate, parse and generate OCaml compiler version strings" -description: """ -This library provides facilities to parse version numbers of the OCaml -compiler, and enumerates the various official OCaml releases and configuration -variants. - -OCaml version numbers are of the form `major.minor.patch+extra`, where the -`patch` and `extra` fields are optional. This library offers the following -functionality: - -- Functions to parse and serialise OCaml compiler version numbers. -- Enumeration of official OCaml compiler version releases. -- Test compiler versions for a particular feature (e.g. the `bytes` type) -- [opam](https://opam.ocaml.org) compiler switch enumeration. - -### Further information - -- **Discussion:** Post on with the `ocaml` tag under - the Ecosystem category. -- **Bugs:** -- **Docs:** -""" -url { - src: - "https://github.com/ocurrent/ocaml-version/releases/download/v2.6.1/ocaml-version-v2.6.1.tbz" - checksum: [ - "sha256=a986eb48c55b85d4df001a88c3d5bb28188079811a3714af9cb90bf6d9f88964" - "sha512=be42e1d0036146fe597700257da3904b76b55de87d77beeae272c584ceb6d8520ef08c63ae8634bfd2008d96b79b74edf93d63c4c784d232e7291a4d2e625bb7" - ] -} diff --git a/esy.lock/opam/ocamlfind.1.8.1/opam b/esy.lock/opam/ocamlfind.1.8.1/opam index d757d669ca..04cbc6ccaf 100644 --- a/esy.lock/opam/ocamlfind.1.8.1/opam +++ b/esy.lock/opam/ocamlfind.1.8.1/opam @@ -31,11 +31,25 @@ build: [ [make "opt"] {ocaml:native} ] install: [ + [ + "./configure" + "-bindir" + bin + "-sitelib" + lib + "-mandir" + man + "-config" + "%{lib}%/findlib.conf" + "-no-custom" + "-no-camlp4" {!ocaml:preinstalled & ocaml:version >= "4.02.0"} + "-no-topfind" {ocaml:preinstalled} + ] [make "install"] ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled} ] depends: [ - "ocaml" {>= "4.00.0"} + "ocaml" {>= "4.00.0" & < "4.13"} "conf-m4" {build} ] extra-files: [ diff --git a/esy.lock/opam/odoc.1.5.2/opam b/esy.lock/opam/odoc.1.5.2/opam deleted file mode 100644 index f59e640771..0000000000 --- a/esy.lock/opam/odoc.1.5.2/opam +++ /dev/null @@ -1,53 +0,0 @@ -opam-version: "2.0" - -homepage: "http://github.com/ocaml/odoc" -doc: "https://ocaml.github.io/odoc/" -bug-reports: "https://github.com/ocaml/odoc/issues" -license: "ISC" - -authors: [ - "Thomas Refis " - "David Sheets " - "Leo White " - "Anton Bachin " - "Jon Ludlam " -] -maintainer: "Anton Bachin " -dev-repo: "git+https://github.com/ocaml/odoc.git" - -synopsis: "OCaml documentation generator" -description: """ -Odoc is a documentation generator for OCaml. It reads doc comments, -delimited with `(** ... *)`, and outputs HTML. -""" - -depends: [ - "astring" - "cmdliner" - "cppo" {build} - "dune" - "fpath" - "ocaml" {>= "4.02.0"} - "result" - "tyxml" {>= "4.3.0"} - - "alcotest" {dev & >= "0.8.3"} - "markup" {dev & >= "1.0.0"} - "ocamlfind" {dev} - "sexplib" {dev & >= "113.33.00"} - - "bisect_ppx" {with-test & >= "1.3.0"} -] - -build: [ - ["dune" "subst"] {pinned} - ["dune" "build" "-p" name "-j" jobs] -] -x-commit-hash: "c0df8ce2171fa9645a41f371429aa3ddc16de5c1" -url { - src: "https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz" - checksum: [ - "sha256=d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871" - "sha512=e6c83630325de422f31cda8f88c038d213969f8b98e989593c057658f3956c0855860c9bc38f61b6479929516ca95aee689ddfba3ad8c47d821c4fdf54524cf9" - ] -} diff --git a/esy.lock/opam/stdlib-shims.0.1.0/opam b/esy.lock/opam/stdlib-shims.0.3.0/opam similarity index 67% rename from esy.lock/opam/stdlib-shims.0.1.0/opam rename to esy.lock/opam/stdlib-shims.0.3.0/opam index c6f3529a33..d657e04368 100644 --- a/esy.lock/opam/stdlib-shims.0.1.0/opam +++ b/esy.lock/opam/stdlib-shims.0.3.0/opam @@ -8,9 +8,8 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues" tags: ["stdlib" "compatibility" "org:ocaml"] license: ["typeof OCaml system"] depends: [ - "ocaml" {>= "4.02.3"} "dune" - ("dune" {>= "2.8.0"} | "ocaml" {< "4.12.0~~"}) + "ocaml" {>= "4.02.3"} ] build: [ "dune" "build" "-p" name "-j" jobs ] synopsis: "Backport some of the new stdlib features to older compiler" @@ -21,8 +20,12 @@ such as the Stdlib module. This allows projects that require compatibility with older compiler to use these new features in their code. """ +x-commit-hash: "fb6815e5d745f07fd567c11671149de6ef2e74c8" url { src: - "https://github.com/ocaml/stdlib-shims/releases/download/0.1.0/stdlib-shims-0.1.0.tbz" - checksum: "md5=12b5704eed70c6bff5ac39a16db1425d" + "https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz" + checksum: [ + "sha256=babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a" + "sha512=1151d7edc8923516e9a36995a3f8938d323aaade759ad349ed15d6d8501db61ffbe63277e97c4d86149cf371306ac23df0f581ec7e02611f58335126e1870980" + ] } diff --git a/mdx b/mdx deleted file mode 160000 index 356bbed2d4..0000000000 --- a/mdx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 356bbed2d40eae60cd3f38840982fc0242c95707 diff --git a/odoc.opam b/odoc.opam index fdfb4d727d..278d6a3c81 100644 --- a/odoc.opam +++ b/odoc.opam @@ -46,7 +46,7 @@ depends: [ ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test}) "conf-jq" {with-test} - "bisect_ppx" {with-test & >= "2.5.0"} + "bisect_ppx" {with-test & = "2.5.0"} ] build: [ diff --git a/package.json b/package.json index 464b15ef3a..c540c8bf63 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "Leo White " ], "esy": { - "build": "dune build", + "build": "dune build -p odoc", "release": { "releasedBinaries": [ "odoc" @@ -42,7 +42,6 @@ "@opam/result": "1.4", "@opam/sexplib0": "*", "@opam/tyxml": "4.3.0", - "@opam/mdx": "1.7.0", "@opam/ocamlfind-secondary":"1.8.1", "ocaml": "~4.2.0" }, diff --git a/src/xref2/dune b/src/xref2/dune index 516c755b42..f984b963ce 100644 --- a/src/xref2/dune +++ b/src/xref2/dune @@ -4,51 +4,3 @@ (instrumentation (backend bisect_ppx)) (libraries compiler-libs.common odoc_model unix)) - -(rule - (alias runtest) - (deps - (:x paths.md) - (package odoc)) - (enabled_if - (> %{ocaml_version} 4.08)) - (action - (progn - (run ocaml-mdx-test %{x}) - (diff? %{x} %{x}.corrected)))) - -(rule - (alias runtest) - (deps - (:x test.md) - (package odoc)) - (enabled_if - (> %{ocaml_version} 4.08)) - (action - (progn - (run ocaml-mdx-test %{x}) - (diff? %{x} %{x}.corrected)))) - -(rule - (alias runtest) - (deps - (:x notes.md) - (package odoc)) - (enabled_if - (> %{ocaml_version} 4.08)) - (action - (progn - (run ocaml-mdx-test %{x}) - (diff? %{x} %{x}.corrected)))) - -(rule - (alias runtest) - (deps - (:x scratch.md) - (package odoc)) - (enabled_if - (> %{ocaml_version} 4.08)) - (action - (progn - (run ocaml-mdx-test %{x}) - (diff? %{x} %{x}.corrected)))) diff --git a/test/xref2/dune b/test/xref2/dune index 4f31033ca6..3169320f2f 100644 --- a/test/xref2/dune +++ b/test/xref2/dune @@ -9,5 +9,7 @@ (../odoc_print/odoc_print.exe as odoc_print) (./compile.exe as compile)))) +(dirs :standard \ strengthen subst refs resolve) + (cram (deps %{bin:odoc} %{bin:odoc_print} %{bin:compile}))