Build using Coq 8.18

jwiegley · Sep 22, 2023 · b22ae29 · b22ae29
1 parent 89dab97
commit b22ae29
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/.github/workflows/coq-ci.yml b/.github/workflows/coq-ci.yml
@@ -9,6 +9,7 @@ jobs:
       matrix:
         image:
           - 'coqorg/coq:dev'
+          - 'coqorg/coq:8.18'
           - 'coqorg/coq:8.17'
           - 'coqorg/coq:8.16'
           - 'coqorg/coq:8.15'

diff --git a/coq-category-theory.opam b/coq-category-theory.opam
@@ -15,7 +15,7 @@ practical work.
 build: [make "-j%{jobs}%"]
 install: [make "install"]
 depends: [
-  "coq" {(>= "8.14" & < "8.18~") | (= "dev")}
+  "coq" {(>= "8.14" & < "8.19~") | (= "dev")}
   "coq-equations" {(>= "1.2" & < "1.4~") | (= "dev")}
 ]
 

diff --git a/default.nix b/default.nix
@@ -1,6 +1,6 @@
 args@{
-  rev    ? "c6fd903606866634312e40cceb2caee8c0c9243f"
-, sha256 ? "04iai62cvjyk7niq0jbfd1x0afk6rbz9y1cncldrx126p2cm6wa7"
+  rev    ? "8b5ab8341e33322e5b66fb46ce23d724050f6606"
+, sha256 ? "05ynih3wc7shg324p7icz21qx71ckivzdhkgf5xcvdz6a407v53h"
 
 , pkgs   ? import (builtins.fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
@@ -34,12 +34,17 @@ equations = coqPackages:
     (if coqPackages == "coqPackages_8_16"
      then {
        rev = "v1.3-8.16";
-       sha256 = "sha256-MwMW7vXEM02DsBhs2LthscEbTK3qYaZhrThzyBOPjqI=";
+       sha256 = "sha256-zyMGeRObtSGWh7n3WCqesBZL5EgLvKwmnTy09rYpxyE=";
      } else {}) //
     (if coqPackages == "coqPackages_8_17"
      then {
        rev = "v1.3-8.17";
        sha256 = "sha256-yNotSIxFkhTg3reZIchGQ7cV9WmTJ7p7hPfKGBiByDw=";
+     } else {}) //
+    (if coqPackages == "coqPackages_8_18"
+     then {
+       rev = "v1.3-8.18";
+       sha256 = "sha256-8MZO9vWdr8wlAov0lBTYMnde0RuMyhaiM99zp7Zwfao=";
      } else {}));
 
     phases = [
@@ -64,7 +69,8 @@ equations = coqPackages:
 
     env = pkgs.buildEnv { inherit name; paths = buildInputs; };
     passthru = {
-      compatibleCoqVersions = v: builtins.elem v [ "8.14" "8.15" "8.16" "8.17" ];
+      compatibleCoqVersions = v:
+        builtins.elem v [ "8.14" "8.15" "8.16" "8.17" "8.18" ];
     };
   };
 
@@ -80,7 +86,8 @@ category-theory = coqPackages:
     buildInputs = [
       coq coq.ocaml coq.findlib (equations coqPackages)
     ] ++ pkgs.lib.optionals (coqPackages != "coqPackages_8_16" &&
-                             coqPackages != "coqPackages_8_17") [
+                             coqPackages != "coqPackages_8_17" &&
+                             coqPackages != "coqPackages_8_18") [
       dpdgraph
     ];
     enableParallelBuilding = true;
@@ -97,14 +104,17 @@ category-theory = coqPackages:
 
     env = pkgs.buildEnv { inherit name; paths = buildInputs; };
     passthru = {
-      compatibleCoqVersions = v: builtins.elem v [ "8.14" "8.15" "8.16" "8.17" ];
+      compatibleCoqVersions = v:
+        builtins.elem v [ "8.14" "8.15" "8.16" "8.17" "8.18" ];
     };
   };
 
-in {
+in rec {
   inherit category-theory;
   category-theory_8_14 = category-theory "coqPackages_8_14";
   category-theory_8_15 = category-theory "coqPackages_8_15";
   category-theory_8_16 = category-theory "coqPackages_8_16";
   category-theory_8_17 = category-theory "coqPackages_8_17";
+  category-theory_8_18 = category-theory "coqPackages_8_18";
+  category-theory_cur  = category-theory_8_18;
 }
diff --git a/shell.nix b/shell.nix
@@ -1,2 +1,2 @@
-args@{ version ? "category-theory_8_17", pkgs ? null }:
+args@{ version ? "category-theory_cur", pkgs ? null }:
 (import ./default.nix (if pkgs == null then {} else { inherit pkgs; })).${version}