about summary refs log tree commit diff
path: root/pkgs/development/coq-modules
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2022-02-08 17:51:52 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2022-02-16 08:03:02 +0100
commitc845a272a58a463c90de03525848fdd82bba5e4b (patch)
tree511bebe0b417e43cf38566098e0373460e463c79 /pkgs/development/coq-modules
parent4687b2ed82c90c135595cc0487b12d643991d542 (diff)
downloadnixlib-c845a272a58a463c90de03525848fdd82bba5e4b.tar
nixlib-c845a272a58a463c90de03525848fdd82bba5e4b.tar.gz
nixlib-c845a272a58a463c90de03525848fdd82bba5e4b.tar.bz2
nixlib-c845a272a58a463c90de03525848fdd82bba5e4b.tar.lz
nixlib-c845a272a58a463c90de03525848fdd82bba5e4b.tar.xz
nixlib-c845a272a58a463c90de03525848fdd82bba5e4b.tar.zst
nixlib-c845a272a58a463c90de03525848fdd82bba5e4b.zip
coqPackages.compcert: enable for Coq 8.15
and make version 3.9 the default for Coq 8.12
Diffstat (limited to 'pkgs/development/coq-modules')
-rw-r--r--pkgs/development/coq-modules/compcert/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix
index 9757b3e43c8b..197f1a96fc4a 100644
--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@@ -16,7 +16,8 @@ let compcert = mkCoqDerivation rec {
 
   defaultVersion =  with versions; switch coq.version [
       { case = range "8.8" "8.11"; out = "3.8"; }
-      { case = range "8.12" "8.14"; out = "3.10"; }
+      { case = isEq "8.12"       ; out = "3.9"; }
+      { case = range "8.12" "8.15"; out = "3.10"; }
     ] null;
 
   release = {
@@ -106,13 +107,18 @@ compcert.overrideAttrs (o:
           })
         ];
       }
-      { cases = [ (isEq "8.14") "3.10" ];
+      { cases = [ (range "8.14" "8.15") "3.10" ];
         out = [
           # Support for Coq 8.14.1
           (fetchpatch {
             url = "https://github.com/AbsInt/CompCert/commit/a79f0f99831aa0b0742bf7cce459cc9353bd7cd0.patch";
             sha256 = "sha256:0g20x8gfzvplpad9y9vr1p33k6qv6rsp691x6687v9ffvz7zsz94";
           })
+          # Support for Coq 8.15.0
+          (fetchpatch {
+            url = "https://github.com/AbsInt/CompCert/commit/a882f78c069f7337dd9f4abff117d4df98ef38a6.patch";
+            sha256 = "sha256:16i87s608fj9ni7cvd5wrd7gicqniad7w78wi26pxdy0pacl7bjg";
+          })
         ];
       }
     ] [];