Merge branch 'master' into staging

37 files changed, 237 insertions, 141 deletions

diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index 767edbc47d56..90159d82c39b 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, buildPythonApplication, pythonPackages
+{ stdenv, fetchurl, pythonPackages
 , which, xpra, xmodmap }:
 
 let
-  base = buildPythonApplication rec {
+  base = pythonPackages.buildPythonApplication rec {
     name = "winswitch-${version}";
     namePrefix = "";
     version = "0.12.16";
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index ce9f17b1a517..cfee6a8b94c8 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildPythonApplication, pythonPackages, fetchurl }:
+{ lib, pythonPackages, fetchurl }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "cli53-${version}";
   namePrefix = "";  # Suppress "python27-" name prefix
   version = "0.4.4";
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index cf58f75aaccc..5d3053b2a3e3 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,10 +1,12 @@
 { stdenv, fetchurl, gobjectIntrospection
-, python, gtk2, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
+, gtk2, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
-, kbproto, libX11, libXext, xextproto, pygobject2, libgcrypt, gtk3, vala_0_23
-, pygobject3, libogg, enableGTK3 ? false, libgpgerror }:
+, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_23
+, libogg, enableGTK3 ? false, libgpgerror, pythonPackages }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) pygobject3 pygobject2 pygtk python;
+in stdenv.mkDerivation rec {
   name = "gtk-vnc-${version}";
   version = "0.5.3";
 
diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix
deleted file mode 100644
index ab5897fab6ca..000000000000
--- a/pkgs/tools/admin/salt/testing.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pythonPackages }:
-
-pythonPackages.buildPythonApplication rec {
-  name = "SaltTesting-${version}";
-  version = "2016.9.7";
-
-  disabled = pythonPackages.isPy3k;
-
-  src = fetchurl {
-    url = "mirror://pypi/S/SaltTesting/${name}.tar.gz";
-    sha256 = "0vcw1b1176qm9nkic3sbxh6vnv9kpd9kgyqz5fpsp5jnb2hsf1qx";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/saltstack/salt-testing;
-    description = "Common testing tools used in the Salt Stack projects";
-    maintainers = with maintainers; [ aneeshusa ];
-    license = licenses.asl20;
-  };
-}
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 44f318a0cc6f..30b05b2b2340 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, unzip }:
 stdenv.mkDerivation rec {
   name = "zpaq-${version}";
-  version = "7.14";
+  version = "715";
 
   src = let
     mungedVersion = with stdenv.lib; concatStrings (splitString "." version);
   in fetchurl {
-    sha256 = "1xmmn5sy19yip8cbr3plhd7nh7x7k1b09lq2kqfcp6bndg7jxgby";
+    sha256 = "066l94yyladlfzri877nh2dhkvspagjn3m5bmv725fmhkr9c4pp8";
     url = "http://mattmahoney.net/dc/zpaq${mungedVersion}.zip";
   };
 
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus ;
     maintainers = with maintainers; [ raskin nckx ];
     platforms = platforms.linux;
+    inherit version;
   };
 }
diff --git a/pkgs/tools/archivers/zpaq/default.upstream b/pkgs/tools/archivers/zpaq/default.upstream
new file mode 100644
index 000000000000..84daee900cec
--- /dev/null
+++ b/pkgs/tools/archivers/zpaq/default.upstream
@@ -0,0 +1,6 @@
+url http://mattmahoney.net/dc/zpaq.html
+version_link 'zpaq[0-9]+[.]zip'
+version "[^0-9]*([0-9]+)[^0-9]*" '\1'
+name zpaq
+attribute_name zpaq
+minimize_overwrite
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index ff247f9e3f98..499bccaa425b 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -3,10 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaqd";
-    version="7.08";
+    version="715";
     name="${baseName}-${version}";
-    url="http://mattmahoney.net/dc/zpaqd708.zip";
-    sha256="18mkfz7v73rp5l712107m3x5a3v6y0vjf47a6s3di8x416kbcp2a";
+    hash="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk";
+    url="http://mattmahoney.net/dc/zpaqd715.zip";
+    sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk";
   };
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 75f74e71be52..273b5d94c9fc 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "beets-alternatives-${version}";
   version = "0.8.2";
 
diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
index d3b36d15e03e..fa00d64f673f 100644
--- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix
+++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "beets-copyartifacts";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index d7fb0e2aab4f..283a6d48ca26 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales
-, buildPythonApplication, pythonPackages, python, imagemagick
+, pythonPackages, imagemagick
 
 , enableAcousticbrainz ? true
 , enableAcoustid       ? true
@@ -72,10 +72,9 @@ let
   testShell = "${bashInteractive}/bin/bash --norc";
   completion = "${bashCompletion}/share/bash-completion/bash_completion";
 
-in buildPythonApplication rec {
+in pythonPackages.buildPythonApplication rec {
   name = "beets-${version}";
   version = "1.3.19";
-  namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
@@ -93,8 +92,8 @@ in buildPythonApplication rec {
     pythonPackages.pathlib
     pythonPackages.pyyaml
     pythonPackages.unidecode
-    python.modules.sqlite3
-    python.modules.readline
+    pythonPackages.python.modules.sqlite3
+    pythonPackages.python.modules.readline
   ] ++ optional enableAcoustid     pythonPackages.pyacoustid
     ++ optional (enableFetchart
               || enableEmbyupdate
@@ -108,10 +107,10 @@ in buildPythonApplication rec {
     ++ optional enableThumbnails   pythonPackages.pyxdg
     ++ optional enableWeb          pythonPackages.flask
     ++ optional enableAlternatives (import ./alternatives-plugin.nix {
-      inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub;
+      inherit stdenv pythonPackages fetchFromGitHub;
     })
     ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix {
-      inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub;
+      inherit stdenv pythonPackages fetchFromGitHub;
     });
 
   buildInputs = with pythonPackages; [
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix
index a5cd54bf74d9..b745652b15c4 100644
--- a/pkgs/tools/filesystems/davfs2/default.nix
+++ b/pkgs/tools/filesystems/davfs2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, neon, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "davfs2-1.5.2";
+  name = "davfs2-1.5.3";
 
   src = fetchurl {
     url = "mirror://savannah/davfs2/${name}.tar.gz";
-    sha256 = "0n5k2xxfxmbsavg5fhp65lmy30hq9jg3w242rdzafvksnnda2d5y";
+    sha256 = "1x9ri19995ika89cmc56za7z3ipiizhh6zdhi4mf4p7chxzdnhrw";
   };
 
   buildInputs = [ neon zlib ];
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
index 7ea5d581a59b..7165789cf81c 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -1,15 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, fuse, zlib, glib }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }:
 
 stdenv.mkDerivation rec {
   name = "fuseiso-20070708";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2";
-    sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692";  
+    sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b";
   };
 
   buildInputs = [ pkgconfig fuse zlib glib ];
 
+  patches = let fetchPatchFromDebian = { patch, sha256 }:
+    fetchpatch {
+      inherit sha256;
+      url = "https://sources.debian.net/data/main/f/fuseiso/20070708-3.2/debian/patches/${patch}";
+    };
+  in [
+    (fetchPatchFromDebian {
+      patch = "00-support_large_iso.patch";
+      sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw";
+    })
+    (fetchPatchFromDebian { # CVE-2015-8837
+      patch = "02-prevent-buffer-overflow.patch";
+      sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig";
+    })
+    (fetchPatchFromDebian { # CVE-2015-8836
+      patch = "03-prevent-integer-overflow.patch";
+      sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv";
+    })
+  ];
+
   meta = {
     homepage = http://sourceforge.net/projects/fuseiso;
     description = "FUSE module to mount ISO filesystem images";
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index 9c44394697f7..31c4ceccbc09 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, python, buildPythonApplication, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "gitfs-0.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 9da5332ce676..e97f246e70b9 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.8.1";
+    version="3.8.4";
     name="${baseName}-${version}";
-    hash="1j3r2wnk1pwwwn02pfnrrgh1if92b5cl51dqg7284qxrkjiafb2k";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.8/3.8.1/glusterfs-3.8.1.tar.gz";
-    sha256="1j3r2wnk1pwwwn02pfnrrgh1if92b5cl51dqg7284qxrkjiafb2k";
+    hash="0f715r6bf12b37s1l3259qzfbz8l2g3mdsnnh2lflagzazn6jnap";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.8/3.8.4/glusterfs-3.8.4.tar.gz";
+    sha256="0f715r6bf12b37s1l3259qzfbz8l2g3mdsnnh2lflagzazn6jnap";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline
diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index f40c6e35f710..d71b6332321a 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, libuuid, libselinux }:
 let 
   sourceInfo = rec {
-    version = "2.2.4";
+    version = "2.2.5";
     url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2";
-    sha256 = "1ywmhrf6dz5g3ik4wf3hlnzmv1qa0q2qrgh3ir1pmbdhlgmkxdhm";
+    sha256 = "0a5iavbjj8c255mfl968ljmj3cb217k7803cc1sdaskacwnykdq2";
     baseName = "nilfs-utils";
     name = "${baseName}-${version}";
   };
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 9a181e7d087d..66f61d9a459e 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, imagemagickBig, pkgconfig, python, pygtk, perl
+{ stdenv, fetchurl, imagemagickBig, pkgconfig, pythonPackages, perl
 , libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) pygtk python;
+in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "zbar";
   version = "0.10";
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index dc170bcd14bb..ff146e609232 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, bash, buildPythonApplication }:
+{ stdenv, fetchurl, bash, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   version = "1.3";
   name = "apt-offline-${version}";
 
@@ -12,8 +12,6 @@ buildPythonApplication rec {
     sha256 = "1sp7ai2abzhbg9y84700qziybphvpzl2nk3mz1d1asivzyjvxlxy";
   };
 
-  buildInputs = [ ];
-
   doCheck = false;
 
   # Requires python-qt4 (feel free to get it working).
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index e51150d68769..0b26dbc06e2b 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonApplication, pythonPackages, python }:
+{ stdenv, fetchurl, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "i3minator-${version}";
   version = "0.0.4";
 
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index 6ee14a0ce937..1efac3b78441 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchgit, perl, cdrkit, syslinux }:
+{ stdenv, fetchgit, perl, cdrkit, syslinux, xz, openssl }:
 
 let
-  date = "20141124";
-  rev = "5cbdc41778622c07429e00f5aee383b575532bf0";
+  date = "20160831";
+  rev = "827dd1bfee67daa683935ce65316f7e0f057fe1c";
 in
 
 stdenv.mkDerivation {
   name = "ipxe-${date}-${builtins.substring 0 7 rev}";
 
-  buildInputs = [ perl cdrkit syslinux ];
+  buildInputs = [ perl cdrkit syslinux xz openssl ];
 
   src = fetchgit {
     url = git://git.ipxe.org/ipxe.git;
-    sha256 = "0wiy3kag6x8a2a71pc9za9izmac8gdz90vaqp2mwgih6p2lz01zq";
+    sha256 = "11w8b0vln3skfn8r1cvzngslz12njdkwmnacyq3qffb96k2dn2ww";
     inherit rev;
   };
 
-  preConfigure = "cd src";
-
   # not possible due to assembler code
   hardeningDisable = [ "pic" "stackprotector" ];
 
@@ -28,11 +26,17 @@ stdenv.mkDerivation {
       "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin"
     ];
 
-  installPhase =
-    ''
-      mkdir $out
-      cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out
-    '';
+
+  configurePhase = ''
+    echo "#define  DOWNLOAD_PROTO_HTTPS" >> src/config/general.h
+  '';
+
+  preBuild = "cd src";
+
+  installPhase = ''
+    mkdir -p $out
+    cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out
+  '';
 
   meta = with stdenv.lib;
     { description = "Network boot firmware";
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index cb0859cfa68b..437be3a46808 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests2 mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "0gxr9hcscxq7h8nwinm1arjfy2rw4i1iwq6ghnm7pw7ay1n7sfzq";
+    sha256 = "1hmg49fhvdf7yjybxmky4ymy5s4mgbh9b8pbgyfnhm1i3s544bz2";
   };
 
   pythonPaths = [ pycrypto requests2 ];
diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix
index 14b9b1fcd9df..e945e560f1b0 100644
--- a/pkgs/tools/misc/togglesg-download/default.nix
+++ b/pkgs/tools/misc/togglesg-download/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, buildPythonApplication, makeWrapper, ffmpeg_3 }:
+{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
 
   name = "togglesg-download-git-${version}";
   version = "2016-05-31";
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
index 2b18d4e910d5..1fd3b3d8371f 100644
--- a/pkgs/tools/misc/xflux/gui.nix
+++ b/pkgs/tools/misc/xflux/gui.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage
-, pexpect, pyGtkGlade, pygobject, pyxdg
-, gnome_python, python
+{ stdenv, fetchFromGitHub, pythonPackages
+, gnome_python
 , libappindicator-gtk2, xflux, librsvg, wrapGAppsHook
 }:
-buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "xflux-gui-${version}";
   version = "2016-09-21";
 
@@ -14,11 +13,10 @@ buildPythonPackage rec {
     sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r";
   };
 
-  # not sure if these need to be propagated or not?
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with pythonPackages; [
     pexpect
     pyGtkGlade
-    pygobject
+    pygobject2
     pyxdg
     libappindicator-gtk2
     gnome_python
@@ -36,7 +34,7 @@ buildPythonPackage rec {
     wrapGAppsHook
     makeWrapperArgs="''${gappsWrapperArgs[@]}"
     wrapPythonPrograms
-    patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py
+    patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix
index b95b95e4379b..0b78b9a06473 100644
--- a/pkgs/tools/misc/xsel/default.nix
+++ b/pkgs/tools/misc/xsel/default.nix
@@ -1,15 +1,29 @@
-{stdenv, fetchurl, xlibsWrapper}:
+{stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }:
 
-stdenv.mkDerivation {
-  name = "xsel-1.2.0";
-  src = fetchurl {
-    url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-1.2.0.tar.gz;
-    sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr";
+stdenv.mkDerivation rec {
+  name = "xsel-unstable-${version}";
+
+  version = "2016-09-02";
+
+  src = fetchFromGitHub {
+    owner = "kfish";
+    repo = "xsel";
+    rev = "aa7f57eed805adb09e9c59c8ea841870e8206b81";
+    sha256 = "04mrc8j0rr7iy1k6brfxnx26pmxm800gh4nqrxn6j2lz6vd5y9m5";
   };
 
-  buildInputs = [xlibsWrapper];
+  buildInputs = [ libX11 autoreconfHook ];
+
+  # We need a README file, otherwise autoconf complains.
+  postUnpack = ''
+    mv $sourceRoot/README{.md,}
+  '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with lib; {
+    description = "Command-line program for getting and setting the contents of the X selection";
+    homepage = "http://www.kfish.org/software/xsel";
+    license = licenses.mit;
+    maintainers = [ maintainers.cstrahan ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index c3cdaffcc27f..e7a593ff830c 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper
-, coreutils, gnused, bind, openldap ? null
+, coreutils, gnused, openldap ? null
 }:
 
 stdenv.mkDerivation rec {
   name = "dhcp-${version}";
-  version = "4.3.3";
-  
+  version = "4.3.4";
+
   src = fetchurl {
     url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
-    sha256 = "1pjy4lylx7dww1fp2mk5ikya5vxaf97z70279j81n74vn12ljg2m";
+    sha256 = "0zk0imll6bfyp9p4ndn8h6s4ifijnw5bhixswifr5rnk7pp5l4gm";
   };
 
   patches =
@@ -23,21 +23,9 @@ stdenv.mkDerivation rec {
       ./set-hostname.patch
     ];
 
-  # Fixes "socket.c:591: error: invalid application of 'sizeof' to
-  # incomplete type 'struct in6_pktinfo'".  See
-  # http://www.mail-archive.com/blfs-book@linuxfromscratch.org/msg13013.html
-  #
-  # Also adds the ability to run dhcpd as a non-root user / group
-  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE -DPARANOIA";
-
-  # It would automatically add -Werror, which disables build in gcc 4.4
-  # due to an uninitialized variable.
-  CFLAGS = "-g -O2 -Wall";
-
-  buildInputs = [ perl makeWrapper openldap bind ];
+  buildInputs = [ perl makeWrapper openldap ];
 
   configureFlags = [
-    "--with-libbind=${bind.dev}"
     "--enable-failover"
     "--enable-execute"
     "--enable-tracing"
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 6f280257692c..9ffb9a311837 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, buildPythonApplication }:
+{ stdenv, fetchurl, pythonPackages }:
 
-buildPythonApplication rec {
-  version = "4.50.0";
+pythonPackages.buildPythonApplication rec {
+  version = "4.51.0";
   name = "getmail-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "1hcb5079mkcx3gglfycrhglrgg4jsa499br50yjrh9sal6wpgg7w";
+    sha256 = "1nzdjm62lrg7qbh8xz2irj9wxf2861s3ld6zd5fbcgpjy3v588mw";
   };
 
   doCheck = false;
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index 4ccd09ac555a..47e1360df8f2 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, fetchurl, buildPythonApplication, pythonPackages }:
+{ pkgs, fetchurl, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   version = "1.8.1-beta";
   name = "gmvault-${version}";
 
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 114247682c7a..a01c39743fe6 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.31";
+  version = "5.36";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "1dz0p85ha78vxc2hjhrkr4xf8w3q8r177bqdrgm26v6wncdbfim7";
+    sha256 = "1smmwkzr0i6w4jwrjxazbyf82jq1qlg8x9zil5b51pzwzpy552gb";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index dee408e1d65a..6c3a63119b06 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "rpm-4.12.0";
+  name = "rpm-4.13.0-rc1";
 
   src = fetchurl {
-    url = "http://rpm.org/releases/rpm-4.12.x/${name}.tar.bz2";
-    sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp";
+    url = "http://www.rpm.org/releases/testing/rpm-4.13.0-rc1.tar.bz2";
+    sha256 = "097mc0kkrf09c01hrgi71df7maahmvayfgsvspnxigvl3xysv8hp";
   };
 
   outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
index 7e4ff32e8805..5ff93ae6a033 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication, hping }:
+{ stdenv, fetchFromGitHub, pythonPackages, hping }:
 
 pythonPackages.buildPythonApplication rec {
   rev  = "bf14bbff";
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 2aa5f9fb4c4e..fb2a66ecf37e 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -49,6 +49,11 @@ stdenv.mkDerivation rec {
     varnish yajl jdk libtool python udev net_snmp hiredis libmnl
   ];
 
+  patches = [
+    # Replace deprecated readdir_r() with readdir() to avoid a fatal warning.
+    ./readdir-fix.patch
+  ];
+
   # for some reason libsigrok isn't auto-detected
   configureFlags =
     stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
diff --git a/pkgs/tools/system/collectd/readdir-fix.patch b/pkgs/tools/system/collectd/readdir-fix.patch
new file mode 100644
index 000000000000..171dfc689a4d
--- /dev/null
+++ b/pkgs/tools/system/collectd/readdir-fix.patch
@@ -0,0 +1,55 @@
+diff -Naur collectd-5.6.0/src/vserver.c collectd-5.6.0/src/vserver.c
+--- collectd-5.6.0/src/vserver.c	2016-09-11 01:10:25.279038699 -0700
++++ collectd-5.6.0/src/vserver.c	2016-09-25 07:44:40.771177458 -0700
+@@ -132,15 +132,8 @@
+ 
+ static int vserver_read (void)
+ {
+-#if NAME_MAX < 1024
+-# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1)
+-#else
+-# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1)
+-#endif
+-
+ 	DIR 			*proc;
+ 	struct dirent 	*dent; /* 42 */
+-	char dirent_buffer[DIRENT_BUFFER_SIZE];
+ 
+ 	errno = 0;
+ 	proc = opendir (PROCDIR);
+@@ -165,19 +158,23 @@
+ 
+ 		int status;
+ 
+-		status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent);
+-		if (status != 0)
+-		{
+-			char errbuf[4096];
+-			ERROR ("vserver plugin: readdir_r failed: %s",
+-					sstrerror (errno, errbuf, sizeof (errbuf)));
+-			closedir (proc);
+-			return (-1);
+-		}
+-		else if (dent == NULL)
++		errno = 0;
++		dent = readdir (proc);
++		if (dent == NULL)
+ 		{
+-			/* end of directory */
+-			break;
++			if (errno != 0)
++			{
++				char errbuf[4096];
++				ERROR ("vserver plugin: readdir failed: %s",
++						sstrerror (errno, errbuf, sizeof (errbuf)));
++				closedir (proc);
++				return (-1);
++			}
++			else
++			{
++				/* end of directory */
++				break;
++			}
+ 		}
+ 
+ 		if (dent->d_name[0] == '.')
diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix
index 7c33d2e166df..6946862422ba 100644
--- a/pkgs/tools/system/honcho/default.nix
+++ b/pkgs/tools/system/honcho/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
-let honcho = buildPythonApplication rec {
+let honcho = pythonPackages.buildPythonApplication rec {
   name = "honcho-${version}";
   version = "0.6.6";
   namePrefix = "";
diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 41b51aa41775..37f5131a0370 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.9";
+  version = "3.0.0";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "1xi5d49zmcczya4iq662wkx39slrk3d4p2dzpfjcc0m0hs1y1b5y";
+    sha256 = "0r986mvh6q1f7369qry2vq4rqc6kc4kq957s2g5qsl8m1pyw2mvx";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index e2786ea77fef..eed5c06552b2 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.10";
-  
+  name = "monit-5.19.0";
+
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "0lwlils6b59kr6zg328q113c7mrpggqydpq4l6j52sqv3dd1b49p";
+    sha256 = "1f32dz7zzp575d35m8xkgjgrqs2vbls0q6vdzm7wwashcm1xbz5y";
   };
 
   nativeBuildInputs = [ bison flex ];
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
new file mode 100644
index 000000000000..ca08a2371283
--- /dev/null
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "ripgrep-${version}";
+  version = "0.1.17";
+
+  src = fetchFromGitHub {
+    owner = "BurntSushi";
+    repo = "ripgrep";
+    rev = "${version}";
+    sha256 = "18bpb1jl9fnipgp9icf1wwzm7934lk0ycbpvzlhvs2873zqhv6a6";
+  };
+
+  depsSha256 = "0fzjk5qynxivxmmz7r1za7mzdbdwzwwvxlc5a6cmxmzwnix2lby3";
+
+  meta = with stdenv.lib; {
+    description = "An untility that combines the usability of The Silver Searcher with the raw speed of grep";
+    homepage = https://github.com/BurntSushi/ripgrep;
+    license = with licenses; [ unlicense ];
+    maintainers = [ maintainers.tailhook ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 59059c632b97..89ed36231a2a 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python
+{ fetchurl, stdenv, python2
 
 , enableStandardFeatures ? false
 , sourceHighlight ? null
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
     sha256 = "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq";
   };
 
-  buildInputs = [ python unzip ];
+  buildInputs = [ python2 unzip ];
 
   # install filters early, so their shebangs are patched too
   patchPhase = with stdenv.lib; ''
@@ -247,7 +247,7 @@ stdenv.mkDerivation rec {
         -i a2x.py
   '' + ''
     for n in $(find "$out" . -name \*.py); do
-      sed -i -e "s,^#![[:space:]]*.*/bin/env python,#!${python}/bin/python,g" "$n"
+      sed -i -e "s,^#![[:space:]]*.*/bin/env python,#!${python2}/bin/python,g" "$n"
       chmod +x "$n"
     done
 
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
index fe1e915e27bf..140784fa9369 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, buildPythonApplication, libreoffice, lpod, lxml, mistune, pillow
-, pygments
-}:
+{ stdenv, fetchurl, pythonPackages, libreoffice }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
 
   name = "odpdown-${version}";
   version = "0.4.1";
@@ -12,7 +10,7 @@ buildPythonApplication rec {
     sha256 = "005eecc73c65b9d4c09532547940718a7b308cd565f62a213dfa040827d4d565";
   };
 
-  propagatedBuildInputs = [ libreoffice lpod lxml mistune pillow pygments ];
+  propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/thorstenb/odpdown;