summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-09-21 18:30:39 +0100
committerGitHub <noreply@github.com>2017-09-21 18:30:39 +0100
commite5b97e36c5301b1cb024988e6a073aa24e24e663 (patch)
treeda00b67b5504e12958f25e9585e97675b2342a4c /pkgs/development
parent5f328b33abefca6bedd8b204a752c27318af4348 (diff)
parent8fde5790b4f41cec33e994a0f7faa5326e503b7e (diff)
downloadnixlib-e5b97e36c5301b1cb024988e6a073aa24e24e663.tar
nixlib-e5b97e36c5301b1cb024988e6a073aa24e24e663.tar.gz
nixlib-e5b97e36c5301b1cb024988e6a073aa24e24e663.tar.bz2
nixlib-e5b97e36c5301b1cb024988e6a073aa24e24e663.tar.lz
nixlib-e5b97e36c5301b1cb024988e6a073aa24e24e663.tar.xz
nixlib-e5b97e36c5301b1cb024988e6a073aa24e24e663.tar.zst
nixlib-e5b97e36c5301b1cb024988e6a073aa24e24e663.zip
Merge pull request #29642 from Zimmi48/update-compcert
Update CompCert
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/compcert/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index f519776b6891..a12f1c42ba61 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -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 ];