diff options
| author | Vincent Laporte | 2024-06-10 14:11:36 +0200 |
|---|---|---|
| committer | Vincent Laporte | 2024-06-17 13:01:26 +0200 |
| commit | 54174e9f0ce5a96528a59b40f4b000ad0d71b8e4 (patch) | |
| tree | 39f13e725152b55a247f3f05df06ee5f6a1ff15c | |
| parent | df5dfa65250e12c4d95a274adadda44ab0500704 (diff) | |
compcert: add support for Coq 8.19.2
(cherry picked from commit 4ec26ff3d46ee4ad2844f358fc89709b38ae442a)
| -rw-r--r-- | pkgs/development/coq-modules/VST/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/coq-modules/compcert/default.nix | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 706d11786354..8cfe5e9f764e 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -43,7 +43,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 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.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}' ''; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 0557311c3650..0bbce6b0ce87 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -193,6 +193,20 @@ compcert.overrideAttrs (o: url = "https://github.com/AbsInt/CompCert/commit/a2e4ed62fc558d565366845f9d135bd7db5e23c4.patch"; hash = "sha256-ufk0bokuayLfkSvK3cK4E9iXU5eZpp9d/ETSa/zCfMg="; }) + # Support for Coq 8.19.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; + hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; + }) + ]; + } + { cases = [ (isEq "8.19") (isEq "3.14") ]; + out = [ + # Support for Coq 8.19.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; + hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; + }) ]; } ] []; |