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

6 files changed, 16 insertions, 11 deletions

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 0d961ab5c23c..fc1e8e5d54ec 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -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 = ''
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 50583f65f602..2e01e4d8f28e 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -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
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index b20662c889ab..778aaa90cbe9 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -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 ];
   };
 }
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 374f0fee3f11..bd3f33d169a1 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -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";
   };
 
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index 4a33a0cd8f33..00eb5b9afc13 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -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 ];
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index b0950fb8cb24..4ad19b615f9a 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -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";