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

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

@@ -3,6 +3,7 @@
 let
   withPlugins = plugins: runCommand "wrapped-${package.name}" {
     buildInputs = [ makeWrapper ] ++ plugins;
+    propagatedBuildInputs = package.propagatedBuildInputs;
     passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins);
   } ''
     makeWrapper ${package}/bin/buildbot $out/bin/buildbot \
@@ -10,14 +11,14 @@ let
     ln -sfv ${package}/lib $out/lib
   '';
 
-  package = pythonPackages.buildPythonApplication (rec {
+  package = pythonPackages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "buildbot";
-    version = "0.9.9.post2";
+    version = "0.9.11";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w";
+      sha256 = "1s3y218wry7502xp4zxccf3z996xm8cnp3dcxl7m5ldmmb055qwv";
     };
 
     buildInputs = with pythonPackages; [
@@ -39,7 +40,6 @@ let
     ];
 
     propagatedBuildInputs = with pythonPackages; [
-
       # core
       twisted
       jinja2
@@ -87,5 +87,5 @@ let
       maintainers = with maintainers; [ nand0p ryansydnor ];
       license = licenses.gpl2;
     };
-  });
+  };
 in package

pkgs/development/tools/build-managers/buildbot/worker.nix

@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "0.9.9.post2";
+  version = "0.9.11";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1wb2fw0djamhn1sb7rwnf12i4ijdq9y4k33ri7dcwxxcavxsvqa0";
+    sha256 = "0lb8kwg3m9jgrww929d5nrjs4rj489mb4dnsdxcbdb358jbbym22";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

pkgs/development/tools/glslviewer/default.nix

@@ -1,6 +1,7 @@
-{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage,
-  libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi,
-  libX11, mesa_glu }:
+{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
+, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
+, libX11, mesa_glu, Cocoa
+}:
 
 stdenv.mkDerivation rec {
   name = "glslviewer-${version}";
@@ -15,17 +16,21 @@ stdenv.mkDerivation rec {
 
   # Makefile has /usr/local/bin hard-coded for 'make install'
   preConfigure = ''
-    sed s,/usr/local,$out, -i Makefile
+    substituteInPlace Makefile \
+        --replace '/usr/local' "$out" \
+        --replace '/usr/bin/clang++' 'clang++'
   '';
 
   preInstall = ''
     mkdir -p $out/bin
   '';
-  
-  buildInputs = [ glfw mesa_glu pkgconfig glfw libXrandr libXdamage
-                  libXext libXrender libXinerama libXcursor libXxf86vm
-                  libXi libX11 ];
-  
+
+  buildInputs = [
+    glfw mesa_glu pkgconfig glfw libXrandr libXdamage
+    libXext libXrender libXinerama libXcursor libXxf86vm
+    libXi libX11
+  ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+
   meta = with stdenv.lib; {
     description = "Live GLSL coding renderer";
     homepage = http://patriciogonzalezvivo.com/2015/glslViewer/;

pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.colescott ];
     platforms = stdenv.lib.platforms.linux;
-
+    broken = true; # since 2017-09-10
     priority = 3;
   };
 }

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

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Filesystem benchmark tool based on load patterns";
     homepage = https://dbench.samba.org/;
     license = licenses.gpl3;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
 }

pkgs/development/tools/profiling/oprofile/default.nix

@@ -1,17 +1,23 @@
-{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders
+{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders, coreutils
 , libiberty_static, withGUI ? false , qt4 ? null}:
 
 # libX11 is needed because the Qt build stuff automatically adds `-lX11'.
 assert withGUI -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "oprofile-1.1.0";
+  name = "oprofile-1.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/oprofile/${name}.tar.gz";
-    sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg";
+    sha256 = "0zd5ih6gmm1pkqavd9laa93iff7qv5jkbfjznhlyxl5p826gk5gb";
   };
 
+  postPatch = ''
+    substituteInPlace opjitconv/opjitconv.c \
+      --replace "/bin/rm" "${coreutils}/bin/rm" \
+      --replace "/bin/cp" "${coreutils}/bin/cp"
+  '';
+
   buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ]
     ++ stdenv.lib.optionals withGUI [ qt4 ];