Work around coq-community/coq-nix-toolbox#95 (whonore#265)

* Revert "Temporarily remove Coq master from CI" This reverts commit 2d38bf3.
Rixxc · Jul 2, 2024 · d96f4f8 · d96f4f8
1 parent 98e2f53
commit d96f4f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,12 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # NOTE: A recent change to using `findlib` broke Coq installed through nix.
-        # See:
-        # https://coq.zulipchat.com/#narrow/stream/237656-Coq-devs.20.26.20plugin.20devs/topic/Findlib.20error.20with.20master.20.2B.20nix
-        # and
-        # https://github.com/coq/coq/pull/15220#issuecomment-1030597338
-        coq_version: ['8.4', '8.5', '8.6', '8.7', '8.8', '8.9', '8.10', '8.11', '8.12', '8.13', '8.14']
+        coq_version: ['8.4', '8.5', '8.6', '8.7', '8.8', '8.9', '8.10', '8.11', '8.12', '8.13', '8.14', 'master']
         py_version: [3.6]
     steps:
       - uses: actions/checkout@v2

diff --git a/ci/coq.nix b/ci/coq.nix
@@ -11,5 +11,15 @@ let
     (filter (s: s != "") (match "coq([0-9]|master)([0-9]*)-.*" tox_version));
 in if dot_version == "8.4" then
   (import (fetchTarball url_8_4) { }).coq_8_4
+else if dot_version == "master" then
+  # NOTE: Temporary workaround until
+  # https://github.com/coq-community/coq-nix-toolbox/issues/95 is resolved
+  (pkgs.coq.override { version = dot_version; }).overrideAttrs (old: {
+    postInstall = old.postInstall + ''
+      for prog in $out/bin/coq*; do
+        wrapProgram $prog --prefix OCAMLPATH : $OCAMLPATH
+      done
+    '';
+  })
 else
   pkgs.coq.override ({ version = dot_version; })