Merge remote-tracking branch 'upstream/staging' into binutils-wrapper

pkgs/development/tools/misc/editorconfig-core-c/default.nix

@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ pcre ];
   nativeBuildInputs = [ cmake doxygen ];
 
+  # Multiple doxygen can not generate man pages in the same base directory in
+  # parallel: https://bugzilla.gnome.org/show_bug.cgi?id=791153
+  enableParallelBuilding = false;
+
   meta = with stdenv.lib; {
     homepage = http://editorconfig.org/;
     description = "EditorConfig core library written in C";

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

@@ -5,16 +5,20 @@ in
 python27Packages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "gdbgui";
-    version = "0.9.0.1";
+    version = "0.9.1.0";
 
     buildInputs = [ gdb ];
     propagatedBuildInputs = builtins.attrValues deps.packages;
 
     src = python27Packages.fetchPypi {
       inherit pname version;
-      sha256 = "1gjc7dycrc4zafhrd9yib7qnh4agh7cpa6rlw4p5405rlmwmsbj3";
+      sha256 = "0ybgkk4h9zwhbx5d0j0fmfzxxgg8f6apm8v7djavm0ldpr6f5z26";
     };
 
+    postPatch = ''
+      echo ${version} > gdbgui/VERSION.txt
+    '';
+
     postInstall = ''
       wrapProgram $out/bin/gdbgui \
                   --prefix PATH : ${stdenv.lib.makeBinPath [ gdb ]}

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

@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.47.4";
+  name = "help2man-1.47.5";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l";
+    sha256 = "1cb14kp380jzk1yi4i7x9d8qplc8c5mgcbgycgs9ggpx34jhp9kw";
   };
 
   nativeBuildInputs = [ makeWrapper gettext LocaleGettext ];

pkgs/development/tools/misc/intel-gpu-tools/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = https://01.org/linuxgraphics/;
     description = "Tools for development and testing of the Intel DRM driver";
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = with maintainers; [ pSub ];
   };
 }

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

@@ -9,7 +9,7 @@ let
     "macosx"
   else if stdenv.system == "aarch64-linux" then
     "linux-arm"
-  else abort "Platform ${stdenv.system} not yet supported.";
+  else throw "Platform ${stdenv.system} not yet supported.";
 in
 
 stdenv.mkDerivation rec {

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

@@ -2,13 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "libtool-1.5.26";
-  
+
   src = fetchurl {
     url = "mirror://gnu/libtool/${name}.tar.gz";
     sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w";
   };
-  
-  buildInputs = [m4 perl];
+
+  nativeBuildInputs = [m4];
+  buildInputs = [perl];
 
   # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
   # "fixed" path in generated files!

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

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     description = "Set of programs to inspect and build Windows Installer (.MSI) files";
     homepage = https://wiki.gnome.org/msitools;
     license = [licenses.gpl2 licenses.lgpl21];
-    maintainer = [maintainers.vcunat];
+    maintainers = [maintainers.vcunat];
     platforms = platforms.unix;
   };
 }

pkgs/development/tools/misc/premake/5.nix

@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, CoreServices }:
+{ stdenv, fetchFromGitHub, Foundation, readline }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "premake-${version}";
-  version = "5.0.0pre.alpha.11";
+  name = "premake5-${version}";
+  version = "5.0.0-alpha12";
 
   src = fetchFromGitHub {
     owner = "premake";
     repo = "premake-core";
-    rev = "5dfb0238bc309df04819dd430def621ce854678d";
-    sha256 = "0k9xbqrnbwj0hnmdgcrwn70py1kiqvr10l42aw42xnlmdyg1sgsc";
+    rev = "v${version}";
+    sha256 = "1h3hr96pdz94njn4bg02ldcz0k5j1x017d8svc7fdyvl2b77nqzf";
   };
 
-  buildInputs = optional stdenv.isDarwin [ CoreServices ];
+  buildInputs = optionals stdenv.isDarwin [ Foundation readline ];
 
   patchPhase = optional stdenv.isDarwin ''
     substituteInPlace premake5.lua \

pkgs/development/tools/misc/saleae-logic/default.nix

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
         sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7";
       }
     else
-      abort "Saleae Logic software requires i686-linux or x86_64-linux";
+      throw "Saleae Logic software requires i686-linux or x86_64-linux";
 
   desktopItem = makeDesktopItem {
     name = "saleae-logic";