[CI] Use new nicer override mechanism for ocamlPackages.elpi

Since NixOS/nixpkgs#374505
proux01 · Jan 18, 2025 · 627b579 · 627b579
1 parent d4147f9
commit 627b579
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 206 deletions.
diff --git a/.nix/config.nix b/.nix/config.nix
@@ -27,30 +27,24 @@ let master = [
   default-bundle = "coq-8.20";
   bundles = {
 
-    "coq-8.20" = {
-      coqPackages = common-bundles // {
-        coq.override.version = "8.20";
-      };
-      # only way to override elpi version is in .nix/coq-overlays/coq-elpi/default.nix
+    "coq-8.20".coqPackages = common-bundles // {
+      coq.override.version = "8.20";
+      coq-elpi.override.elpi-version = "2.0.7";
     };
 
-    "coq-master" = {
-      coqPackages = common-bundles // {
-        coq.override.version = "master";
-        stdlib.override.version = "master";
-        coqeal.job = false;  # broken in master, c.f. https://github.com/coq/coq/pull/19228
-      };
-      ocamlPackages = { elpi.override.version = "2.0.7"; };
+    "coq-master".coqPackages = common-bundles // {
+      coq.override.version = "master";
+      coq-elpi.override.elpi-version = "2.0.7";
+      stdlib.override.version = "master";
+      coqeal.job = false;  # broken in master, c.f. https://github.com/coq/coq/pull/19228
     };
 
     /* uncomment bundle below if min and max elpi version start to differ
-    "coq-master-min-elpi" = {
-      coqPackages = common-bundles // {
-        coq.override.version = "master";
-        stdlib.override.version = "master";
-        coqeal.job = false;  # broken in master, c.f. https://github.com/coq/coq/pull/19228
-      };
-      ocamlPackages = { elpi.override.version = "2.0.7"; };
+    "coq-master-min-elpi"coqPackages = common-bundles // {
+      coq.override.version = "master";
+      coq-elpi.override.elpi-version = "2.0.7";
+      stdlib.override.version = "master";
+      coqeal.job = false;  # broken in master, c.f. https://github.com/coq/coq/pull/19228
     }; */
 
   };

diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix
@@ -1 +1 @@
-"a24e6f4fb01d4ca0811dc8d16246cfe36b37ac52"
+"82da08ded8f5b913ab813ab079a698eff6ab70e2"
diff --git a/.nix/coq-overlays/coq-elpi/default.nix b/.nix/coq-overlays/coq-elpi/default.nix
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		"a24e6f4fb01d4ca0811dc8d16246cfe36b37ac52"
		"82da08ded8f5b913ab813ab079a698eff6ab70e2"