From c9a53a6ae6cd9b0969bacf306a2038917ba65879 Mon Sep 17 00:00:00 2001
From: Kazuhiko Sakaguchi <pi8027@gmail.com>
Date: Mon, 8 Jul 2024 11:49:21 +0200
Subject: [PATCH] Update Nix toolbox

---
 .nix/config.nix          | 32 +++++++++++++++++---------------
 .nix/coq-nix-toolbox.nix |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.nix/config.nix b/.nix/config.nix
index 2cbd823..6231fa6 100644
--- a/.nix/config.nix
+++ b/.nix/config.nix
@@ -38,24 +38,26 @@
   ## When generating GitHub Action CI, one workflow file
   ## will be created per bundle
   bundles = let
-    gen = coqv: mcv:
-      { "coq${coqv}+mc${mcv}".coqPackages = {
-               coq.override.version = coqv;
-               mathcomp.override.version = mcv;
-               mathcomp.job = false;
+    gen = coqv: mcv: elpiv:
+      { "coq${coqv}+mc${mcv}" = {
+        coqPackages = {
+          coq.override.version = coqv;
+          mathcomp.override.version = mcv;
+          mathcomp.job = false;
         } // (if (coqv == "master") then {
-            coq-elpi.override.version = "coq-master";
-            hierarchy-builder.override.version = "master";
+          coq-elpi.override.version = "master";
+          hierarchy-builder.override.version = "master";
         } else {}) // {
-            mathcomp-real-closed.override.version = "master";
-            mathcomp-bigenough.override.version = "1.0.1";
+          mathcomp-real-closed.override.version = "master";
+          mathcomp-bigenough.override.version = "1.0.1";
         };
-      }; in
-    gen "8.16" "mathcomp-2.1.0" //
-    gen "8.17" "mathcomp-2.1.0" //
-    gen "8.18" "mathcomp-2.1.0" //
-    gen "8.19" "mathcomp-2.2.0" //
-    gen "master" "master";
+        ocamlPackages = if (elpiv != "") then { elpi.override.version = elpiv; } else {};
+      }; }; in
+    gen "8.16" "mathcomp-2.1.0" "" //
+    gen "8.17" "mathcomp-2.1.0" "" //
+    gen "8.18" "mathcomp-2.1.0" "" //
+    gen "8.19" "mathcomp-2.2.0" "" //
+    gen "master" "master" "1.19.2";
 
   ## Cachix caches to use in CI
   ## Below we list some standard ones
diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix
index b5a006a..3ac5205 100644
--- a/.nix/coq-nix-toolbox.nix
+++ b/.nix/coq-nix-toolbox.nix
@@ -1 +1 @@
-"281be33f1e42a92e5c47f30907819aad1a45e5f2"
+"66abb687550ec2800bc1724036cfb5d9656c901c"