Merge remote-tracking branch 'origin/master' into hardened-stdenv

This commit is contained in:
Franz Pletz
2016-05-18 17:10:02 +02:00
1470 changed files with 62103 additions and 28701 deletions
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "6.17";
version = "6.18";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
sha256 = "1cfcjz1fg9ilqqaqlbzd5n7nsx1kzy6sabjp92b9d8mwy15bn5ql";
sha256 = "1ls2q6zvnfsvb3b5d9s1p6c5gcdnwm2mlj2dm8jr4nifkymi6q5m";
};
installPhase = ''
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ];
buildInputs = [ clang llvmPackages.clang perl makeWrapper ];
buildPhase = "true";
dontBuild = true;
installPhase = ''
mkdir -p $out/bin $out/libexec
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = http://cppcheck.sourceforge.net/;
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ simons joachifm ];
maintainers = with maintainers; [ joachifm ];
};
}
@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "include-what-you-use-${version}";
# Also bump llvmPackages in all-packages.nix to the supported version!
version = "0.5";
version = "0.6";
src = fetchurl {
sha256 = "19pwhgwvfr86n8ks099p9r02v7zh8d3qs7g7snzkhpdgq1azww85";
sha256 = "0n3z4pfbby0rl338irbs4yvcmjfnza82xg9a8r9amyl0bkfasbxb";
url = "${meta.homepage}/downloads/${name}.src.tar.gz";
};
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "code coverage tester for compiled programs, Python scripts and shell scripts";
longDescription =
'' Kcov is a code coverage tester for compiled programs, Python
longDescription = ''
Kcov is a code coverage tester for compiled programs, Python
scripts and shell scripts. It allows collecting code coverage
information from executables without special command-line
arguments, and continuosly produces output from long-running
applications.
'';
'';
homePage = http://simonkagstrom.github.io/kcov/index.html;
homepage = http://simonkagstrom.github.io/kcov/index.html;
license = licenses.gpl2;
maintainers = [ maintainers.gal_bolle ];
@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps gdb ];
cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING=";
cmakeFlags = [
"-DCMAKE_C_FLAGS_RELEASE:STRING="
"-DCMAKE_CXX_FLAGS_RELEASE:STRING="
"-Ddisable32bit=ON"
];
# we turn on additional warnings due to hardening
NIX_CFLAGS_COMPILE = "-Wno-error";