nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 22:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

compcert: add support for Coq 8.20.0

Browse Source
This commit is contained in:
Vincent Laporte 2024-09-30 21:17:54 +02:00 committed by Vincent Laporte
parent 031c0e9b9d
commit a2f49d26d3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/coq-modules/compcert/default.nix
View File

@ -29,7 +29,7 @@ compcert = mkCoqDerivation {
releaseRev = v: "v${v}";
defaultVersion = with lib.versions; lib.switch coq.version [
{ case = range "8.14" "8.19"; out = "3.14"; }
{ case = range "8.14" "8.20"; out = "3.14"; }
{ case = isEq "8.13" ; out = "3.10"; }
{ case = isEq "8.12" ; out = "3.9"; }
{ case = range "8.8" "8.11"; out = "3.8"; }
@ -201,13 +201,18 @@ patched_compcert = compcert.overrideAttrs (o:
})
];
}
{ cases = [ (isEq "8.19") (isEq "3.14") ];
{ cases = [ (range "8.19" "8.20") (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=";
})
# Support for Coq 8.20.0
(fetchpatch {
url = "https://github.com/AbsInt/CompCert/commit/20a5b48758bf8ac18e4c420df67017b371efc237.patch";
hash = "sha256-TJ87CvLiAv1absGnPsTXsD/HQwKgS82loUTcosulyso=";
})
];
}
] [];

2
pkgs/top-level/all-packages.nix
View File

@ -14508,7 +14508,7 @@ with pkgs;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
};
inherit (coqPackages_8_19) compcert;
inherit (coqPackages) compcert;
computecpp-unwrapped = callPackage ../development/compilers/computecpp { };
computecpp = wrapCCWith rec {