From 8abb1f5afba9aea806f7c214b035834b16240295 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Jun 2024 14:11:36 +0200 Subject: compcert: add support for Coq 8.19.2 --- pkgs/development/coq-modules/VST/default.nix | 2 +- pkgs/development/coq-modules/compcert/default.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 706d117863540..8cfe5e9f764e9 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 1f2ec1cdfd1cb..59cfd680427b6 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="; + }) ]; } ] []; -- cgit 1.4.1