public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34946 from vbgl/compcert-3.2

Browse Source 
compcert: 3.1 -> 3.2
This commit is contained in:
Samuel Leathers 2018-02-13 21:31:44 -05:00 committed by GitHub
commit 711f799adf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/compcert/default.nix
View File

@ -7,11 +7,11 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compcert-${version}"; name = "compcert-${version}";
version = "3.1"; version = "3.2";
src = fetchurl { src = fetchurl {
url = "http://compcert.inria.fr/release/${name}.tgz"; url = "http://compcert.inria.fr/release/${name}.tgz";
sha256 = "0irfwlw2chalp0g2gw0makc699hn3z37sha1a239p9d90mzx03cx"; sha256 = "11q4121s0rxva63njjwya7syfx9w0p4hzr6avh8s57vfbrcakc93";
}; };
buildInputs = [ coq ] buildInputs = [ coq ]
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
configurePhase = '' configurePhase = ''
substituteInPlace VERSION --replace '3.0.1' '3.1'
substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
(if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"); (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux");