fixing CI

coq · Sep 11, 2024 · 47f2ca2 · 47f2ca2
1 parent 0b4902e
commit 47f2ca2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/.nix/coq-overlays/stdlib-html/default.nix b/.nix/coq-overlays/stdlib-html/default.nix
@@ -1,10 +1,13 @@
-{ graphviz, stdlib }:
-stdlib.overrideAttrs (o: {
-  buildInputs = o.buildInputs ++ [ graphviz ];
+{ graphviz, stdlib, coqPackages }:
+
+coqPackages.lib.overrideCoqDerivation {
+  pname = "stdlib-html";
+
+  overrideBuildInputs = stdlib.buildInputs ++ [ graphviz ];
 
   preBuild = ''
     patchShebangs doc/stdlib/make-library-index
   '';
 
   buildFlags = [ "stdlib-html" ];
-})
+} stdlib
diff --git a/.nix/coq-overlays/stdlib-refman-html/default.nix b/.nix/coq-overlays/stdlib-refman-html/default.nix
@@ -1,7 +1,9 @@
-{ antlr4_9, python311, coq, stdlib }:
+{ antlr4_9, python311, coq, stdlib, coqPackages }:
 
-stdlib.overrideAttrs (o: {
-  buildInputs = o.buildInputs ++ [ coq.ocamlPackages.ocaml coq.ocamlPackages.dune_3 stdlib ]
+coqPackages.lib.overrideCoqDerivation {
+  pname = "stdlib-refman-html";
+
+  overrideBuildInputs = stdlib.buildInputs ++ [ coq.ocamlPackages.ocaml coq.ocamlPackages.dune_3 stdlib ]
   ++ [
     # Sphinx doc dependencies
     (python311.withPackages
@@ -16,4 +18,4 @@ stdlib.overrideAttrs (o: {
     echo "nothing to install"
     touch $out
   '';
-})
+} stdlib
diff --git a/.nix/coq-overlays/stdlib-subcomponents/default.nix b/.nix/coq-overlays/stdlib-subcomponents/default.nix
@@ -1,7 +1,7 @@
 # CI job to test that we don't break the subcomponent structure of the stdlib,
 # as described in the graph doc/stdlib/depends
 
-{ stdlib }:
+{ stdlib, coqPackages }:
 
 let
   # stdlib subcomponents with their dependencies
@@ -54,7 +54,7 @@ let
   stdlib_ = component: let
     pname = "stdlib-${component}";
     stdlib-deps = map stdlib_ components.${component};
-    in stdlib.overrideAttrs ({
+    in coqPackages.lib.overrideCoqDerivation ({
       inherit pname;
       propagatedBuildInputs = stdlib-deps;
     } // (if component != "all" then {
@@ -67,5 +67,5 @@ let
       installPhase = ''
         echo "nothing left to install"
       '';
-    }));
+    })) stdlib;
 in stdlib_ "all"
diff --git a/.nix/coq-overlays/stdlib-test/default.nix b/.nix/coq-overlays/stdlib-test/default.nix
@@ -1,6 +1,9 @@
-{ rsync, coq, stdlib }:
+{ rsync, coq, stdlib, coqPackages }:
+
+coqPackages.lib.overrideCoqDerivation {
+
+  pname = "stdlib-test";
 
-stdlib.overrideAttrs {
   propagatedBuildInputs = [ rsync stdlib ]
     ++ (with coq.ocamlPackages; [ ocaml findlib zarith ]);
 
@@ -11,4 +14,4 @@ stdlib.overrideAttrs {
   installPhase = ''
     echo "nothing to install"
   '';
-}
+} stdlib