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

15 files changed, 11 insertions, 266 deletions

diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix
index b7bcadd73c58..fba7a28eded9 100644
--- a/pkgs/tools/backup/attic/default.nix
+++ b/pkgs/tools/backup/attic/default.nix
@@ -7,7 +7,7 @@ python3Packages.buildPythonPackage rec {
   src = fetchzip {
     name = "${name}-src";
     url = "https://github.com/jborg/attic/archive/0.15.tar.gz";
-    sha256 = "0bing5zg82mwvdi27jl77ardw65zaq4996k4677gz2lq7p7b4gd7";
+    sha256 = "0c5rsxxcg897a619cbv75hzi1ahpkym8dccf6y3jlcs98z11vm5d";
   };
 
   propagatedBuildInputs = with python3Packages;
diff --git a/pkgs/tools/misc/escoger/default.nix b/pkgs/tools/misc/escoger/default.nix
deleted file mode 100644
index 2fe67f1b97f4..000000000000
--- a/pkgs/tools/misc/escoger/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ cabal, dataDefault, fetchFromGitHub, HUnit, mtl, parallel
-, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, vector, vectorAlgorithms, vty
-}:
-
-let
-  rv = "b6b11c51846a9283ef4ee7c839b99ded9f6c3bc8";
-in
-cabal.mkDerivation (self: {
-  pname = "escoger";
-  version = "0.1.0.0-${rv}";
-  src = fetchFromGitHub {
-    owner = "tstat";
-    repo = "escoger";
-    rev = rv;
-    sha256 = "0n6mvg5cm50ym20bz74b7q1afkljp0fc9pxhqk0ai82a71xxbxy3";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    dataDefault mtl parallel vector vectorAlgorithms vty
-  ];
-  testDepends = [
-    dataDefault HUnit mtl parallel QuickCheck testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms
-    vty
-  ];
-  meta = {
-    description = "A multithreaded terminal fuzzy selector";
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 7924615201e6..8c0f0e96d21e 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
-    sha256 = "1w7d10h6hzgz5zww8g4aja2fbl7xwx30vd07hcg1fcy7hm8yc1q2";
+    sha256 = "16703m6g5l97af3jwpypgac7gpmh3yjkdpqygf5a2scfip0hxm2g";
   };
 
   # Look for ‘sysless’ in /etc.
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 0830871c0cde..8e3f5d34f1ea 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "v0.5.9-rc5"; in
+let version = "v0.5.9-rc5-22-gdafb89c"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "76f4acca4bef1658543a97475f1c1d83accc395c";
-    sha256 = "11k88lsdqy41j4xwyx3vq85zjj4n39hj828f1b6naq1ywyfcvmr5";
+    rev = "dafb89c7a307272189b29a5c74bd6e33068ac831";
+    sha256 = "0j6gii9jw93pdnbdk8yxddcc67g30623r2xvgdvrbhg3v2q6k1qm";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 110fec50a6bb..63f82f12787d 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
 
 stdenv.mkDerivation rec {
-  name = "radvd-2.10";
+  name = "radvd-2.11";
   
   src = fetchurl {
     url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
-    sha256 = "0wwpzdkk6lpsai11iwsrwiblmf9x19rds0wdqcnf82hj0j1yxkkn";
+    sha256 = "1k2sbfs4w2lkgz2mh4zh66fgahjrn2hvxcpfc091bykrzj464qq4";
   };
 
   buildInputs = [ pkgconfig libdaemon bison flex check ];
diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
deleted file mode 100644
index d4a709ab13ba..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.16.0.2";
-  sha256 = "162nbkkffpbalg368m5s49jrvg9nibdwlwj0j1b8wriyyg4srpv6";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network random time zlib
-  ];
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  patchPhase = ''
-    sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
deleted file mode 100644
index e391d80420dc..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck
-, random, stm, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.18.0.3";
-  sha256 = "0h01mz6p4fwl8h6k2ybrlp598f0j3n2zasrr63fy0vjbjibmgf41";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network random stm time zlib
-  ];
-  testDepends = [
-    Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 time zlib
-  ];
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  patchPhase = ''
-    sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.6.nix b/pkgs/tools/package-management/cabal-install/1.20.0.6.nix
deleted file mode 100644
index adb2f24f5b26..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.20.0.6.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, networkUri
-, QuickCheck, random, stm, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, time, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.20.0.6";
-  sha256 = "1hc187yzl59518cswk25xzsabn9dvm4wqpq817hmclrvkf4zr3pl";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network networkUri random stm time zlib
-  ];
-  testDepends = [
-    Cabal filepath HTTP HUnit mtl network networkUri QuickCheck stm
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 time zlib
-  ];
-  doCheck = false;
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/1.22.0.0.nix b/pkgs/tools/package-management/cabal-install/1.22.0.0.nix
deleted file mode 100644
index abf3809872b4..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.22.0.0.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, extensibleExceptions, filepath, HTTP, HUnit, mtl
-, network, networkUri, QuickCheck, random, regexPosix, stm
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
-, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.22.0.0";
-  sha256 = "17cf2bkrxawjldhkq4hzlzlf7b2xqgkrzl7fa31whnnpni68v6jz";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network networkUri random stm time zlib
-  ];
-  testDepends = [
-    Cabal extensibleExceptions filepath HTTP HUnit mtl network
-    networkUri QuickCheck regexPosix stm testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 time zlib
-  ];
-  doCheck = false;
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
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 ];
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
deleted file mode 100644
index 35e609b440ab..000000000000
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, filepath, mtl, regexCompat, texLive }:
-
-cabal.mkDerivation (self: {
-  pname = "lhs2tex";
-  version = "1.18.1";
-  sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath mtl regexCompat ];
-  extraLibraries = [ texLive ];
-  postInstall = ''
-    mkdir -p "$out/share/doc/$name"
-    cp doc/Guide2.pdf $out/share/doc/$name
-    mkdir -p "$out/nix-support"
-  '';
-  meta = {
-    homepage = "http://www.andres-loeh.de/lhs2tex/";
-    description = "Preprocessor for typesetting Haskell sources with LaTeX";
-    license = self.stdenv.lib.licenses.gpl2;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})