Merge remote-tracking branch 'origin/master' into closure-size

pkgs/tools/system/ansible/default.nix

@@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec {
   };
 
   prePatch = ''
-    sed -i "s,\/usr\/share\/ansible\/,$out/share/ansible," lib/ansible/constants.py
+    sed -i "s,/usr/,$out," lib/ansible/constants.py
   '';
 
   doCheck = false;
@@ -19,14 +19,10 @@ pythonPackages.buildPythonPackage rec {
   dontPatchELF = true;
   dontPatchShebangs = true;
 
-  propagatedBuildInputs = with pythonPackages; [
+  pythonPath = with pythonPackages; [
     paramiko jinja2 pyyaml httplib2 boto six
   ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
-  postFixup = ''
-      wrapPythonProgramsIn $out/bin "$out $pythonPath"
-  '';
-
   meta = with stdenv.lib; {
     homepage = "http://www.ansible.com";
     description = "A simple automation tool";

pkgs/tools/system/augeas/default.nix

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl2;
     homepage = http://augeas.net/;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }

pkgs/tools/system/dd_rescue/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A tool to copy data from a damaged block device";
     maintainers = with maintainers; [ raskin iElectric ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/";
     inherit version;
     updateWalker = true;

pkgs/tools/system/dog/default.nix

@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "cat replacement";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ qknight ];
-    platforms = with platforms; all;
+    platforms = platforms.all;
   };
 }

pkgs/tools/system/foremost/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://foremost.sourceforge.net/;
     license = licenses.publicDomain;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 

pkgs/tools/system/ioping/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Disk I/O latency measuring tool";
     maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
     license = licenses.gpl3Plus;
     homepage = https://github.com/koct9i/ioping;
   };

pkgs/tools/system/iops/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.vanheusden.com/iops/;
     license = licenses.gpl2;
     maintainers = with maintainers; davidak;
-    platforms = with platforms; linux; # build problems on Darwin
+    platforms = platforms.linux; # build problems on Darwin
   };
 }
 

pkgs/tools/system/ipmitool/default.nix

@@ -12,6 +12,10 @@ stdenv.mkDerivation {
     sha256 = "0y6g8xg9p854n7xm3kds8m3d53jrsllnknp8lcr3jscf99j4x5ph";
   };
 
+  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/plugins/ipmi_intf.c --replace "s6_addr16" "s6_addr"
+  '';
+
   buildInputs = [ openssl ];
 
   preConfigure = ''

pkgs/tools/system/setserial/default.nix

@@ -1,33 +1,24 @@
-a @ { groff, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, groff }:
+
+stdenv.mkDerivation rec {
+  name = "setserial-${version}";
+  version = "2.17";
 
-  version = a.lib.attrByPath ["version"] "2.17" a;
-  buildInputs = with a; [
-    groff
-  ];
-in
-rec {
   src = fetchurl {
-    url = "mirror://sourceforge/setserial/setserial-${version}.tar.gz";
+    url = "mirror://sourceforge/setserial/${name}.tar.gz";
     sha256 = "0jkrnn3i8gbsl48k3civjmvxyv9rbm1qjha2cf2macdc439qfi3y";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ groff ];
 
-  installFlags = "DESTDIR=$out";
+  installFlags = ''DESTDIR=$(out)'';
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "patchPath" "doMakeInstall"];
-
-  patchPath = a.fullDepEntry (''
+  postConfigure = ''
     sed -e s@/usr/man/@/share/man/@ -i Makefile
-  '') ["minInit" "doUnpack" "doConfigure"];
+  '';
 
-  neededDirs = ["$out/bin" "$out/share/man/man8"];
+  preInstall = ''mkdir -p "$out/bin" "$out/share/man/man8"'';
 
-  name = "setserial-" + version;
   meta = {
     description = "Serial port configuration utility";
   };

pkgs/tools/system/stress-ng/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, attr, keyutils }:
 
 let
-  version = "0.04.21";
+  version = "0.05.00";
   name = "stress-ng-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    sha256 = "01308c31dx7ln7w3r74f18c473hz9236f118b27z1js94dsya0hw";
+    sha256 = "0ppri86z6fj48nm5l0x1r8mh7mwaf7bvhmi10jz6a8w7apnc181w";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

pkgs/tools/system/tm/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     description = "terminal mixer - multiplexer for the i/o of terminal applications";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; all;
+    platforms = platforms.all;
   };
 
 }

pkgs/tools/system/ts/default.nix

@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "task spooler - batch queue";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; all;
+    platforms = platforms.all;
   };
 }

pkgs/tools/system/uptimed/default.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     '';
     homepage = https://github.com/rpodgorny/uptimed/;
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 
   patches = [ ./no-var-spool-install.patch ];