summary refs log tree commit diff
path: root/pkgs/development/coq-modules/VST
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2022-02-09 06:19:54 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2022-02-16 08:03:02 +0100
commit6d5e3764dd3802fe55d8753e27daeb14a76ce0e0 (patch)
tree4031359819d64726c9ae11fa3b77f5997def3288 /pkgs/development/coq-modules/VST
parentdd09b527000ea379b5ba4a2696a801af98768142 (diff)
downloadnixpkgs-6d5e3764dd3802fe55d8753e27daeb14a76ce0e0.tar
nixpkgs-6d5e3764dd3802fe55d8753e27daeb14a76ce0e0.tar.gz
nixpkgs-6d5e3764dd3802fe55d8753e27daeb14a76ce0e0.tar.bz2
nixpkgs-6d5e3764dd3802fe55d8753e27daeb14a76ce0e0.tar.lz
nixpkgs-6d5e3764dd3802fe55d8753e27daeb14a76ce0e0.tar.xz
nixpkgs-6d5e3764dd3802fe55d8753e27daeb14a76ce0e0.tar.zst
nixpkgs-6d5e3764dd3802fe55d8753e27daeb14a76ce0e0.zip
coqPackages.VST: 2.8 → 2.9
Diffstat (limited to 'pkgs/development/coq-modules/VST')
-rw-r--r--pkgs/development/coq-modules/VST/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix
index 1d2a1a3c05f..80aaf506139 100644
--- a/pkgs/development/coq-modules/VST/default.nix
+++ b/pkgs/development/coq-modules/VST/default.nix
@@ -1,5 +1,7 @@
 { lib, mkCoqDerivation, coq, compcert, ITree, version ? null }:
 
+with lib;
+
 # A few modules that are not built and installed by default
 #  but that may be useful to some users.
 # They depend on ITree.
@@ -7,12 +9,15 @@ let extra_floyd_files = [
   "ASTsize.v"
   "io_events.v"
   "powerlater.v"
-  "printf.v"
+  ]
+  # floyd/printf.v is broken in VST 2.9
+  ++ optional (!versions.isGe "8.13" coq.coq-version) "printf.v"
+  ++ [
   "quickprogram.v"
   ];
 in
 
-with lib; mkCoqDerivation {
+mkCoqDerivation {
   pname = "coq${coq.coq-version}-VST";
   namePrefix = [];
   displayVersion = { coq = false; };
@@ -20,8 +25,10 @@ with lib; mkCoqDerivation {
   repo = "VST";
   inherit version;
   defaultVersion = with versions; switch coq.coq-version [
+    { case = range "8.13" "8.15"; out = "2.9"; }
     { case = range "8.12" "8.13"; out = "2.8"; }
   ] null;
+  release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf";
   release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0=";
   releaseRev = v: "v${v}";
   extraBuildInputs = [ ITree ];