Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/development/tools/analysis/include-what-you-use/default.nix

@@ -3,14 +3,14 @@
 stdenv.mkDerivation rec {
   name = "include-what-you-use-${version}";
   # Also bump llvmPackages in all-packages.nix to the supported version!
-  version = "0.6";
+  version = "0.8";
 
   src = fetchurl {
-    sha256 = "0n3z4pfbby0rl338irbs4yvcmjfnza82xg9a8r9amyl0bkfasbxb";
+    sha256 = "0r6n5gqicl0f9c8jrphq40kc2cis952gmnkm3643m3jwad0mn33d";
     url = "${meta.homepage}/downloads/${name}.src.tar.gz";
   };
 
-  buildInputs = with llvmPackages; [ clang llvm ];
+  buildInputs = with llvmPackages; [ clang-unwrapped llvm ];
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ];

pkgs/development/tools/build-managers/meson/default.nix

@@ -1,12 +1,12 @@
 { lib, python3Packages }:
 python3Packages.buildPythonApplication rec {
-  version = "0.41.2";
+  version = "0.42.1";
   pname = "meson";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0p69hir68ar3nzrjn0zjsnyzq181b0kq6arrcmxqpzl7g5qhf5xd";
+    sha256 = "1phf1xpwm8m85qiiirkqhrf5aigx7ajaw0l59d6lzadf1fmgfx5v";
   };
 
   postFixup = ''

pkgs/development/tools/dtools/default.nix

@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
 
       substituteInPlace posix.mak \
           --replace gcc $CC
+
+      # To fix rdmd test with newer phobos
+      substituteInPlace rdmd.d \
+          --replace " std.stdiobase," ""
   '';
 
   nativeBuildInputs = [ dmd ];
@@ -45,10 +49,11 @@ stdenv.mkDerivation rec {
     }
 	'';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Ancillary tools for the D programming language compiler";
     homepage = https://github.com/dlang/tools;
     license = lib.licenses.boost;
+    maintainers = with maintainers; [ ThomasMader ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/development/tools/irony-server/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "irony-server-${version}";
   inherit (irony) version;
 
-  buildInputs = [ cmake llvmPackages.clang ];
+  nativeBuildInputs = [ cmake ];
 
   dontUseCmakeBuildDir = true;
 

pkgs/development/tools/misc/strace/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.18";
+  version = "4.19";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "026agy9nq238nx3ynhmi8h3vx96yra4xacfsm2ybs9k23ry8ibc9";
+    sha256 = "10bjh2mrkvx41fk60b2iqv5b5k4r7a3qdsx04iyg904jqb3fp4vw";
   };
 
   nativeBuildInputs = [ perl ];

pkgs/development/tools/rtags/default.nix

@@ -4,7 +4,9 @@ stdenv.mkDerivation rec {
   name = "rtags-${version}";
   version = "2.12";
 
-  buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs pkgconfig ]
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ llvmPackages.llvm openssl emacs ]
+    ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
     ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];