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

5 files changed, 4 insertions, 69 deletions

diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix
index c033814c6311..284f6cbb3d28 100644
--- a/pkgs/tools/system/ansible/default.nix
+++ b/pkgs/tools/system/ansible/default.nix
@@ -20,7 +20,7 @@ pythonPackages.buildPythonPackage rec {
   dontPatchShebangs = true;
 
   propagatedBuildInputs = with pythonPackages; [
-    paramiko jinja2 pyyaml httplib2 boto
+    paramiko jinja2 pyyaml httplib2 boto six
   ];
 
   postFixup = ''
diff --git a/pkgs/tools/system/journal-mailer/default.nix b/pkgs/tools/system/journal-mailer/default.nix
deleted file mode 100644
index 5de15f8457ad..000000000000
--- a/pkgs/tools/system/journal-mailer/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, baseCompat, fetchgit, hspec, hspecExpectations
-, libsystemdJournal, mimeMail, mtl, pipes, pipesBytestring
-, pipesSafe, QuickCheck, silently, stringConversions, temporary
-, text, time, unorderedContainers, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "journal-mailer";
-  version = "0.1.1.0";
-  src = fetchgit {
-    url = "https://github.com/zalora/journal-mailer.git";
-    sha256 = "cd28b39746fd8a9652eb5d4dc5dcfd66704826d1ee466572fb47925b054cd07b";
-    rev = "ab1b4df09e7ddbe139959374437331cdddf754b2";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    baseCompat libsystemdJournal mimeMail pipes pipesBytestring
-    pipesSafe stringConversions text time unorderedContainers yaml
-  ];
-  testDepends = [
-    baseCompat hspec hspecExpectations libsystemdJournal mimeMail mtl
-    pipes pipesBytestring pipesSafe QuickCheck silently
-    stringConversions temporary text time unorderedContainers yaml
-  ];
-  meta = {
-    description = "Sends out emails for every severe message logged to systemd's journal";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.tv ];
-  };
-})
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 972fb41804ab..349da460485a 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,12 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
-let
-  pciids = fetchurl {
-    # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://tarballs.nixos.org/pci.ids.20131006.bz2;
-    sha256 = "1vmshcgxqminiyh52pdcak24lm24qlic49py9cmkp96y1s48lvsc";
-  };
-in
 stdenv.mkDerivation rec {
   name = "pciutils-3.3.1"; # with database from 2015-04
 
@@ -17,8 +10,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig zlib kmod which ];
 
-  #preBuild = "bunzip2 < ${pciids} > pci.ids";
-
   makeFlags = "SHARED=yes PREFIX=\${out}";
 
   installTargets = "install install-lib";
diff --git a/pkgs/tools/system/sizes/default.nix b/pkgs/tools/system/sizes/default.nix
deleted file mode 100644
index a20a40f701c2..000000000000
--- a/pkgs/tools/system/sizes/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, cmdargs, deepseq, dlist, lens, parallelIo, regexPosix
-, systemFileio, systemFilepath, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sizes";
-  version = "2.3.2";
-  sha256 = "0xns0xl3khks1jvsmxh0nqf1saxs7qscvkbcg4270pp7n6lziqdg";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    cmdargs deepseq dlist lens parallelIo regexPosix systemFileio
-    systemFilepath text
-  ];
-  meta = {
-    homepage = "https://github.com/jwiegley/sizes";
-    description = "Recursively show space (size and i-nodes) used in subdirectories";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index f67921c6b712..a769cb77eca3 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.00"; in
+let version = "0.04.01"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "1rivmqa3qy9saxcz7mg211imcfyfwdhyhl2z6k1zc55vhnjdwhih";
+    sha256 = "1n7980lx32jvk9z9gl5621vas83x2jvyvp3l2jzw3afh09vd5axk";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
       bugs that only occur when a system is being thrashed hard.
     '';
     homepage = http://kernel.ubuntu.com/~cking/stress-ng;
+    downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
     license = with licenses; gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];