Skip to content

Commit

Permalink
coqPackages.VST: 2.14 -> 2.15
Browse files Browse the repository at this point in the history
  • Loading branch information
proux01 authored and vbgl committed Feb 12, 2025
1 parent 9b34de6 commit 82dc1d7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion pkgs/development/coq-modules/VST/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ mkCoqDerivation {
defaultVersion =
with lib.versions;
lib.switch coq.coq-version [
{
case = range "8.19" "8.20";
out = "2.15";
}
{
case = range "8.15" "8.19";
out = "2.14";
Expand All @@ -57,6 +61,7 @@ mkCoqDerivation {
out = "2.8";
}
] null;
release."2.15".sha256 = "sha256-51k2W4efMaEO4nZ0rdkRT9rA8ZJLpot1YpFmd6RIAXw=";
release."2.14".sha256 = "sha256-NHc1ZQ2VmXZy4lK2+mtyeNz1Qr9Nhj2QLxkPhhQB7Iw=";
release."2.13".sha256 = "sha256-i6rvP3cpayBln5KHZOpeNfraYU5h0O9uciBQ4jRH4XA=";
release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw=";
Expand All @@ -71,7 +76,7 @@ mkCoqDerivation {
preConfigure = ''
patchShebangs util
substituteInPlace Makefile \
--replace 'COQVERSION= ' 'COQVERSION= 8.19.2 or-else 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
--replace 'COQVERSION= ' 'COQVERSION= 8.20.1 or-else 8.19.2 or-else 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
--replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}'
'';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/coq-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ let
(lib.versionAtLeast self.coq.version "8.14") {
compcert = self.compcert.override {
version = with lib.versions; lib.switch self.coq.version [
{ case = range "8.15" "8.19"; out = "3.13.1"; }
{ case = range "8.15" "8.18"; out = "3.13.1"; }
{ case = isEq "8.14"; out = "3.11"; }
] null;
};
Expand Down

0 comments on commit 82dc1d7

Please sign in to comment.