mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity

Merge pull request #29642 from Zimmi48/update-compcert

Browse source 
Update CompCert
This commit is contained in:
Jörg Thalheim 2017-09-21 18:30:39 +01:00 committed by GitHub
parent 5f328b33ab 8fde5790b4
commit e5b97e36c5
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/licenses.nix
View file

@ -292,9 +292,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Independent JPEG Group License";
};
inria = {
fullName = "INRIA Non-Commercial License Agreement";
inria-compcert = {
fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler";
url = "http://compcert.inria.fr/doc/LICENSE";
free = false;
};
ipa = spdx {

7
pkgs/development/compilers/compcert/default.nix
View file

@ -7,11 +7,11 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "compcert-${version}";
version = "3.0.1";
version = "3.1";
src = fetchurl {
url = "http://compcert.inria.fr/release/${name}.tgz";
sha256 = "0dgrj26dzdy4n3s9b5hwc6lm54vans1v4qx9hdp1q8w1qqcdriq9";
sha256 = "0irfwlw2chalp0g2gw0makc699hn3z37sha1a239p9d90mzx03cx";
};
buildInputs = [ coq ]
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configurePhase = ''
substituteInPlace VERSION --replace '3.0.1' '3.1'
substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
(if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux");
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Formally verified C compiler";
homepage = "http://compcert.inria.fr";
license = licenses.inria;
license = licenses.inria-compcert;
platforms = platforms.linux ++
platforms.darwin;
maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ];

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

@ -5346,10 +5346,7 @@ with pkgs;
cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
compcert = callPackage ../development/compilers/compcert {
# Pin the version of coq used in compcert to 8.6 until the next release
coq = callPackage ../applications/science/logic/coq { version = "8.6"; };
};
compcert = callPackage ../development/compilers/compcert { };
# Users installing via `nix-env` will likely be using the REPL,