MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

compcert: 3.9 → 3.10

Browse source 
Enable for Coq 8.14

Use default version of OCaml (instead of 4.05)

VST is not ready for CompCert 3.10, so it still uses 3.9
This commit is contained in:
Vincent Laporte 2021-11-22 07:38:45 +01:00 committed by Vincent Laporte
parent 94ebf717ca
commit 5b861824b3
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/coq-modules/compcert/default.nix
View file

@ -16,12 +16,13 @@ let compcert = mkCoqDerivation rec {
defaultVersion = with versions; switch coq.version [
{ case = range "8.8" "8.11"; out = "3.8"; }
{ case = range "8.12" "8.13"; out = "3.9"; }
{ case = range "8.12" "8.14"; out = "3.10"; }
] null;
release = {
"3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7";
"3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb";
"3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6";
};
nativeBuildInputs = [ makeWrapper ];

5
pkgs/top-level/coq-packages.nix
View file

@ -24,7 +24,6 @@ let
Cheerios = callPackage ../development/coq-modules/Cheerios {};
CoLoR = callPackage ../development/coq-modules/CoLoR {};
compcert = callPackage ../development/coq-modules/compcert {
ocamlPackages = ocamlPackages_4_05;
inherit fetchpatch makeWrapper coq2html lib stdenv;
};
coq-bits = callPackage ../development/coq-modules/coq-bits {};
@ -96,7 +95,9 @@ let
topology = callPackage ../development/coq-modules/topology {};
Velisarios = callPackage ../development/coq-modules/Velisarios {};
Verdi = callPackage ../development/coq-modules/Verdi {};
VST = callPackage ../development/coq-modules/VST {};
VST = callPackage ../development/coq-modules/VST {
compcert = self.compcert.override { version = "3.9"; };
};
zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {};
filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self;
};