Merge branch 'master.upstream' into staging.upstream

69 files changed, 508 insertions, 318 deletions

diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index c305583a3f9f..488c97ad36b5 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, libX11, libXinerama, imlib2}:
+{stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}:
 
 stdenv.mkDerivation rec {
 
   name = "bgs-${version}";
-  version = "0.7.1";
+  version = "0.8";
 
   src = fetchurl {
     url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz";
-    sha256 = "1kgm139daz4xrymx11whbmwzsnps9yn4g34a17s34ihi0raf70w8";
+    sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+
   buildInputs = [ libX11 libXinerama imlib2 ];
 
   preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 0b41e05e3f21..edddf42d2c55 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -1,17 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, libX11, xextproto, libXtst, libXi, libXext
+{ stdenv, fetchFromGitHub, pkgconfig, libX11, xextproto, libXtst, libXi, libXext
 , libXinerama, glib, cairo, xdotool }:
 
+let release = "20150730"; in
 stdenv.mkDerivation rec {
-  name = "keynav-0.20110708.0";
+  name = "keynav-0.${release}.0";
 
-  src = fetchurl {
-    url = "https://semicomplete.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1gizjhji3yspxxxvb90js3z1bv18rbf5phxg8rciixpj3cccff8z";
+  src = fetchFromGitHub {
+    owner = "jordansissel";
+    repo = "keynav";
+    rev = "4ae486db6697877e84b66583a0502afc7301ba16";
+    sha256 = "0v1m8w877fcrk918p6b6q3753dsz8i1f4mb9bi064cp11kh85nq5";
   };
 
   buildInputs = [ pkgconfig libX11 xextproto libXtst libXi libXext libXinerama
                   glib cairo xdotool ];
 
+  patchPhase = ''
+    echo >>VERSION MAJOR=0
+    echo >>VERSION RELEASE=${release}
+    echo >>VERSION REVISION=0
+  '';
+
   installPhase =
     ''
       mkdir -p $out/bin $out/share/keynav/doc
diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix
index 2eeb61dfaf4c..4c675a69842c 100644
--- a/pkgs/tools/X11/xdotool/default.nix
+++ b/pkgs/tools/X11/xdotool/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, libX11, perl, libXtst, xextproto, libXi, libXinerama }:
+{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xextproto, libXi, libXinerama, libxkbcommon }:
 
-let version = "2.20110530.1"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "xdotool-${version}";
+  version = "3.20150503.1";
   src = fetchurl {
-    url = "http://semicomplete.googlecode.com/files/xdotool-${version}.tar.gz";
-    sha256 = "0rxggg1cy7nnkwidx8x2w3c5f3pk6dh2b6q0q7hp069r3n5jrd77";
+    url = "https://github.com/jordansissel/xdotool/releases/download/v${version}/xdotool-${version}.tar.gz";
+    sha256 = "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8";
   };
 
-  buildInputs = [ libX11 perl libXtst xextproto libXi libXinerama ];
+  nativeBuildInputs = [ pkgconfig perl ];
+  buildInputs = [ libX11 libXtst xextproto libXi libXinerama libxkbcommon ];
 
-  configurePhase = ''
-    export makeFlags="PREFIX=$out";
-  '';
+  makeFlags = "PREFIX=$(out)";
 
   meta = {
     homepage = http://www.semicomplete.com/projects/xdotool/;
diff --git a/pkgs/tools/admin/webdruid/default.nix b/pkgs/tools/admin/webdruid/default.nix
index ee81b0c053d9..ee4dabf78e78 100644
--- a/pkgs/tools/admin/webdruid/default.nix
+++ b/pkgs/tools/admin/webdruid/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { zlib, libpng, freetype, gd, which, libxml2, geoip, ... } :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     zlib libpng freetype gd which libxml2
@@ -15,7 +15,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall" "doLinks"];
-      
+
   doLinks = a.fullDepEntry (''
     ln -s shared_en.xsl $out/share/webdruid/classic/shared.xsl
   '') ["minInit"];
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index b430c4732ff1..b43ce30b2a89 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.15";
+  version = "1.16";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "1wpvy6qrrp2k0b38a864n0ayh5mr8353rndiqb8ax7z0y3jz484x";
+    sha256 = "0fv9pxilg0mjs6pw80c3sm23p5smpapyc49zgcm839qarl90fqz5";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 9c538842816f..1234ecd770bb 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
+{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which
+, p7zip, mtools, syslinux }:
 
-let version = "608"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
+  version = "613";
 
   src = fetchurl {
     url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1010ccdrblsjr5zid6wl3c3b75ld37lrr1a1xc6dlrhz1gvcb6ff";
+    sha256 = "1f389z5lqimp4hlxm6zlrh1ja474r6ivzb9r43i9bvf0z1n21f0q";
   };
 
   sourceRoot = ".";
@@ -15,49 +15,47 @@ stdenv.mkDerivation {
   buildInputs = [ makeWrapper qt4 ];
 
   # Lots of nice hard-coded paths...
-  postUnpack =
-    ''
-      substituteInPlace unetbootin.cpp \
-          --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
-          --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
-          --replace /sbin/blkid ${utillinux}/sbin/blkid \
-          --replace /bin/df ${coreutils}/bin/df \
-          --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
-          --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
-          --replace /usr/share/syslinux ${syslinux}/share/syslinux
-      substituteInPlace main.cpp \
-          --replace /usr/share/unetbootin $out/share/unetbootin
-      substituteInPlace unetbootin.desktop \
-          --replace /usr/bin $out/bin
-    '';
-
-  buildPhase =
-    ''
-      lupdate unetbootin.pro
-      lrelease unetbootin.pro
-      qmake
-      make
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      cp unetbootin $out/bin
-
-      mkdir -p $out/share/unetbootin
-      cp unetbootin_*.qm  $out/share/unetbootin
-
-      mkdir -p $out/share/applications
-      cp unetbootin.desktop $out/share/applications
-
-      wrapProgram $out/bin/unetbootin \
-          --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
-    '';
-
-  meta = {
+  postUnpack = ''
+    substituteInPlace unetbootin.cpp \
+      --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
+      --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
+      --replace /sbin/blkid ${utillinux}/sbin/blkid \
+      --replace /bin/df ${coreutils}/bin/df \
+      --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
+      --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
+      --replace /usr/share/syslinux ${syslinux}/share/syslinux
+    substituteInPlace main.cpp \
+      --replace /usr/share/unetbootin $out/share/unetbootin
+    substituteInPlace unetbootin.desktop \
+      --replace /usr/bin $out/bin
+  '';
+
+  buildPhase = ''
+    lupdate unetbootin.pro
+    lrelease unetbootin.pro
+    qmake
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp unetbootin $out/bin
+
+    mkdir -p $out/share/unetbootin
+    cp unetbootin_*.qm  $out/share/unetbootin
+
+    mkdir -p $out/share/applications
+    cp unetbootin.desktop $out/share/applications
+
+    wrapProgram $out/bin/unetbootin \
+      --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
+  '';
+
+  meta = with stdenv.lib; {
     homepage = http://unetbootin.sourceforge.net/;
     description = "A tool to create bootable live USB drives from ISO images";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.ebzzry ];
   };
 }
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index a9f507ec7f18..b217b43524b3 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.1.2"; in
+let version = "4.2"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "04ig3gbfq0zccyqrcrl21g1kp1snqxaflb0i09izp2l6l3361nv2";
+    sha256 = "1glglnglwz1rz6zy54xwdm601n5csbd1g73lx0rz8ay5jhz3q8r5";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch b/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
new file mode 100644
index 000000000000..142bcabec544
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
@@ -0,0 +1,25 @@
+From 1213dde3d207d0d91ccecfca4dd6af1bdee0ed65 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai@redhat.com>
+Date: Fri, 17 Jul 2015 01:12:03 +0800
+Subject: [PATCH] cls: fix the build on i386
+
+this is a leftover of 0dae022
+
+Signed-off-by: Kefu Chai <kchai@redhat.com>
+---
+ src/cls/cephfs/cls_cephfs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cls/cephfs/cls_cephfs.h b/src/cls/cephfs/cls_cephfs.h
+index 3cee0db..d4a5f23 100644
+--- a/src/cls/cephfs/cls_cephfs.h
++++ b/src/cls/cephfs/cls_cephfs.h
+@@ -118,7 +118,7 @@ class AccumulateResult
+   // Largest object seen
+   uint64_t max_obj_size;
+   // Highest mtime seen
+-  time_t   max_mtime;
++  int64_t   max_mtime;
+ 
+   AccumulateResult()
+     : ceiling_obj_index(0), ceiling_obj_size(0), max_obj_size(0), max_mtime(0)
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
index 2d0a1a633063..23757278b6f0 100644
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -9,5 +9,8 @@ callPackage ./generic.nix (args // rec {
     sha256 = "08ccy735srzmi505qlrpqdh5js40mpd5k1vdhnysknra0vqlpmdx";
   };
 
-  patches = [ ./fix-pythonpath.patch ];
+  patches = [
+    ./fix-pythonpath.patch
+    ./9.0.3-i686-fix.patch
+  ];
 })
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index a36e29c6f087..ef9330a510bf 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-09-04";
+  version = "2015-09-11";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "8c17e0197481205f8726b06d57313ffe08fba2bf";
-    sha256 = "189l412m6x0f0mqzhgzwfa3sgm5xfxzb9synlvbfm3n1fgdhj5iy";
+    rev = "78de6fd61d5c0422f18c2f683b2cc489f3cbb4d3";
+    sha256 = "1kbrsr6vzvprcdq0hg7cgcmvqc61w3i1yzgrmjdmy3jcsmc979xi";
   };
 
   patches = [ ./fix-pythonpath.patch ];
diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix
deleted file mode 100644
index eb7977c71a3b..000000000000
--- a/pkgs/tools/filesystems/exfat-utils/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, scons }:
-
-let version = "1.1.1"; in
-stdenv.mkDerivation rec {
-  name = "exfat-utils-${version}";
-
-  src = fetchurl {
-    sha256 = "0ck2snhlhp965bb9a4y1g2lpl979sw1yznm79wbavyv174458i66";
-    url = "https://docs.google.com/uc?export=download&id=0B7CLI-REKbE3UzNtSkRvdHBpdjQ";
-    name = "${name}.tar.gz";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Free exFAT file system utilities";
-    longDescription = ''
-      Full-featured exFAT file system implementation for GNU/Linux and other
-      Unix-like systems.
-    '';
-    homepage = https://code.google.com/p/exfat;
-    license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
-  nativeBuildInputs = [ scons ];
-
-  buildPhase = ''
-    export CCFLAGS="-std=c99"
-    mkdir -pv $out/sbin
-    scons DESTDIR=$out/sbin install
-  '';
-
-  installPhase = ":";
-}
diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix
new file mode 100644
index 000000000000..a0a4223731c0
--- /dev/null
+++ b/pkgs/tools/filesystems/exfat/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
+
+let version = "1.2.0"; in
+stdenv.mkDerivation rec {
+  name = "exfat-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1fsm082g8phqcdg5md6yll06jijnbvqrdy0638psa8kr159h4dv8";
+    rev = "v${version}";
+    repo = "exfat";
+    owner = "relan";
+  };
+
+  buildInputs = [ fuse ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  meta = with stdenv.lib; {
+    inherit version;
+    inherit (src.meta) homepage;
+    description = "Free exFAT file system implementation";
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
+
diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix
deleted file mode 100644
index ef8bf5845dd6..000000000000
--- a/pkgs/tools/filesystems/fuse-exfat/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, fuse, scons }:
-
-stdenv.mkDerivation rec {
-  name = "fuse-exfat-1.1.0";
-
-  src = fetchurl {
-    sha256 = "0glmgwrf0nv09am54i6s35ksbvrywrwc51w6q32mv5by8475530r";
-    url = "https://docs.google.com/uc?export=download&id=0B7CLI-REKbE3VTdaa0EzTkhYdU0";
-    name = "${name}.tar.gz";
-  };
-
-  buildInputs = [ fuse ];
-  nativeBuildInputs = [ pkgconfig scons ];
-
-  buildPhase = ''
-    export CCFLAGS="-O2 -Wall -std=c99 -I${fuse}/include"
-    export LDFLAGS="-L${fuse}/lib"
-    mkdir -pv $out/sbin
-    scons DESTDIR=$out/sbin install
-  '';
-
-  installPhase = ":";
-
-  meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/exfat/;
-    description = "A FUSE-based filesystem that allows read and write access to exFAT devices";
-    platforms = with platforms; linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ nckx ];
-  };
-}
-
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index d9eed4df224a..a8ffc634d0e1 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -1,13 +1,20 @@
-{ stdenv, fetchurl, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
-, libXrender, libXext, libtiff, libjpeg, libXScrnSaver, writeText
-, libXdmcp, libXau, lib }:
-
+{ stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
+, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
+, libXdmcp, libXau, lib, openssl, zlib }:
+let
+  version = "1.8.2";
+ in
 stdenv.mkDerivation rec {
-  name = "argyllcms-1.4.0";
+  name = "argyllcms-${version}";
+
+  src = fetchzip {
+    # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
+    # while on me. It might be good to find a mirror
+    url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
+    sha256 = "0hnsciwak5chy4a421l8fz7amxzg8kbmy57a07dn460gdg6r63cy";
 
-  src = fetchurl {
-    url = "http://www.argyllcms.com/Argyll_V1.4.0_src.zip";
-    sha256 = "1a5i0972cjp6asmawmyzih2y4bv3i0qvf7p6z5lxnr199mq38cfk";
+    # The argyllcms web server doesn't like curl ...
+    curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 
   # The contents of this file comes from the Jamtop file from the
@@ -17,21 +24,30 @@ stdenv.mkDerivation rec {
   jamTop = writeText "argyllcms_jamtop" ''
     DESTDIR = "/" ;
     REFSUBDIR = "ref" ;
-    
+
     # Keep this DESTDIR anchored to Jamtop. PREFIX is used literally
     ANCHORED_PATH_VARS = DESTDIR ;
-    
+
     # Tell standalone libraries that they are part of Argyll:
     DEFINES += ARGYLLCMS ;
-    
-    # Use libusb1 rather than libusb0 & libusb0-win32
-    USE_LIBUSB1 = true ;
-    
-    # Make the USB V1 library static
-    LIBUSB_IS_DLL = false ;
-    
-    # Set the libubs1 library name.
-    LIBUSB1NAME = libusb-1A ;
+
+    # enable serial instruments & support
+    USE_SERIAL = true ;
+
+    # enable fast serial instruments & support
+    USE_FAST_SERIAL = true ;                # (Implicit in USE_SERIAL too)
+
+    # enable USB instruments & support
+    USE_USB = true ;
+
+    # enable dummy Demo Instrument (only if code is available)
+    USE_DEMOINST = true ;
+
+    # Use ArgyllCMS version of libusb (deprecated - don't use)
+    USE_LIBUSB = false ;
+
+    # For testing CCast
+    DEFINES += CCTEST_PATTERN ;
 
     JPEGLIB = ;
     JPEGINC = ;
@@ -41,10 +57,22 @@ stdenv.mkDerivation rec {
     TIFFINC = ;
     HAVE_TIFF = true ;
 
+    PNGLIB = ;
+    PNGINC = ;
+    HAVE_PNG = true ;
+
+    ZLIB = ;
+    ZINC = ;
+    HAVE_Z = true ;
+
+    SSLLIB = ;
+    SSLINC = ;
+    HAVE_SSL = true ;
+
     LINKFLAGS +=
       ${lib.concatStringsSep " " (map (x: "-L${x}/lib") buildInputs)}
       -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss
-      -ljpeg -ltiff ;
+      -ljpeg -ltiff -lpng -lssl ;
   '';
 
   nativeBuildInputs = [ jam unzip ];
@@ -52,27 +80,31 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     cp ${jamTop} Jamtop
     substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES"
-    # Remove tiff and jpg to be sure the nixpkgs-provided ones are used
-    rm -rf tiff jpg
+    # Remove tiff, jpg and png to be sure the nixpkgs-provided ones are used
+    rm -rf tiff jpg png
   '';
 
-  buildInputs = [ 
-    libtiff libjpeg libX11 libXxf86vm libXrandr libXinerama libXext
-    libXrender libXScrnSaver libXdmcp libXau
+  buildInputs = [
+    libtiff libjpeg libpng libX11 libXxf86vm libXrandr libXinerama libXext
+    libXrender libXScrnSaver libXdmcp libXau openssl
   ];
 
   buildFlags = "PREFIX=$(out) all";
 
   installFlags = "PREFIX=$(out)";
 
-  # Install udev rules, but remove lines that set up the udev-acl and plugdev
+  # Install udev rules, but remove lines that set up the udev-acl
   # stuff, since that is handled by udev's own rules (70-udev-acl.rules)
+  #
+  # Move ref to a better place (there must be a way to make the install target
+  # do that for us)
   postInstall = ''
     rm -v $out/bin/License.txt
     mkdir -p $out/etc/udev/rules.d
-    sed -i '/udev-acl/d' libusb1/55-Argyll.rules
-    sed -i '/plugdev/d' libusb1/55-Argyll.rules
-    cp -v libusb1/55-Argyll.rules $out/etc/udev/rules.d/
+    sed -i '/udev-acl/d' usb/55-Argyll.rules
+    cp -v usb/55-Argyll.rules $out/etc/udev/rules.d/
+    mkdir -p $out/share/
+    mv $out/ref $out/share/argyllcms
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index c5d9475850e3..138ae58da064 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { cmake, patchelf, imagemagick, ... } :
+let
   fetchurl = a.fetchurl;
 
   version = "1.1.0";
@@ -27,7 +27,7 @@ rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
     cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-      
+
   needLib64 = a.stdenv.system == "x86_64-linux";
 
   postInstall = a.fullDepEntry(''
diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix
index 22515a15d272..0b2382315a5d 100644
--- a/pkgs/tools/inputmethods/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ];
 
   postFixup = ''
+    substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
     for file in "$out"/libexec/*; do
       wrapProgram "$file" \
         --prefix PYTHONPATH : $PYTHONPATH \
diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index ca9a9453dbfc..4491905de4fc 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, python, perl }:
 
 stdenv.mkDerivation rec {
   name = "byobu-5.87";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  buildInputs = [ python perl ];
+
   meta = {
     homepage = https://launchpad.net/byobu/;
     description = "Text-based window manager and terminal multiplexer";
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index d0354a7bb6ed..c0593e5c0177 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a @ { intltool, perl, gettext, libusb, pkgconfig, bluez, readline, pcsclite, libical, gtk, glib, libXpm, ... } :
+let
   fetchurl = a.fetchurl;
 
-  s = import ./src-for-default.nix; 
+  s = import ./src-for-default.nix;
   buildInputs = with a; [
     perl intltool gettext libusb
     glib gtk pkgconfig bluez readline
diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix
index 081868589bc7..ab02c7dc3d1d 100644
--- a/pkgs/tools/misc/logstash/default.nix
+++ b/pkgs/tools/misc/logstash/default.nix
@@ -15,20 +15,17 @@ stdenv.mkDerivation rec {
   dontPatchShebangs = true;
 
   installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/vendor
-    mkdir -p $out/lib
-    cp -a bin $out
-    cp -a vendor $out
-    cp -a lib $out
-    cp Gemfile* $out
+    mkdir -p $out
+    cp -r {Gemfile*,vendor,lib} $out
+    cp bin/logstash $out/logstash
+    cp bin/plugin $out/logstash-plugin
   '';
 
-  meta = {
-    description = "Open Source, Distributed, RESTful Search Engine";
-    homepage    = http://www.elasticsearch.org;
-    license     = stdenv.lib.licenses.asl20;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.wjlroe ];
+  meta = with stdenv.lib; {
+    description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems.";
+    homepage    = https://www.elastic.co/products/logstash;
+    license     = licenses.asl20;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.wjlroe maintainers.offline ];
   };
 }
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index b731c0409f31..69af77e18677 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
  
 stdenv.mkDerivation rec {
-  name = "man-db-2.7.2";
+  name = "man-db-2.7.3";
   
   src = fetchurl {
     url = "mirror://savannah/man-db/${name}.tar.xz";
-    sha256 = "14p4sr57qc02gfnpybcnv33fb7gr266iqsyq7z4brs6wa6plwrr2";
+    sha256 = "1shl07w3251ih6g6zx3xa3p1193difxwdz4ysnmff1v0jp4l8iwx";
   };
   
   buildInputs = [ pkgconfig libpipeline db groff ];
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index d96ca1080d83..1d3d14d7e234 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/*
 
     wrapProgram $out/bin/parallel \
-      --prefix PATH : "${procps}/bin" \
+      ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \
       --prefix PATH : "${perl}/bin" \
   '';
 
diff --git a/pkgs/tools/misc/cv/default.nix b/pkgs/tools/misc/progress/default.nix
index a92bfcdb35d3..cf70b234b88a 100644
--- a/pkgs/tools/misc/cv/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "cv-${version}";
-  version = "0.8";
+  name = "progress-${version}";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
-    repo = "cv";
+    repo = "progress";
     rev = "v${version}";
-    sha256 = "17vfcv0n1ib4rh1hdl126aid7cnnk94avzlk9yp7y855iml8xzs4";
+    sha256 = "07bl5fsr538nk4l8vwj1kf5bivlh3a8cy8jliqfadxmhf1knn2mw";
   };
 
   buildInputs = [ ncurses ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/Xfennec/cv;
+    homepage = https://github.com/Xfennec/progress;
     description = "Tool that shows the progress of coreutils programs";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
new file mode 100644
index 000000000000..5fbb39431155
--- /dev/null
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoconf, automake110x, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "tmate-${version}";
+  version = "1.8.10";
+
+  src = fetchFromGitHub {
+    owner  = "nviennot";
+    repo   = "tmate";
+    rev    = version;
+    sha256 = "1bd9mi8fx40608zlady9dbv21kbdwc3kqrgz012m529f6cbysmzc";
+  };
+
+  buildInputs = [ autoconf automake110x pkgconfig libtool zlib openssl libevent ncurses cmake ruby ];
+
+  dontUseCmakeConfigure=true;
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    homepage = http://tmate.io/;
+    description = "Instant Terminal Sharing";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ DamienCassou ];
+  };
+}
diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix
new file mode 100644
index 000000000000..31c6cd20ec7a
--- /dev/null
+++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "zsh-navigation-tools-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "psprint";
+    repo = "zsh-navigation-tools";
+    rev = "v${version}";
+    sha256 = "1p3r8pra88sjcc8b5d7qlz1axsyyspl3835y6mqwia57b9g0fpy8";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/zsh/site-functions/
+    cp n-* $out/share/zsh/site-functions/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Curses-based tools for ZSH";
+    homepage = https://github.com/psprint/zsh-navigation-tools;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
new file mode 100644
index 000000000000..f443e5450482
--- /dev/null
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libsodium, libevent, pkgconfig, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "dnscrypt-wrapper-${version}";
+  version = "0.2";
+
+  src = fetchurl {
+    url = "https://github.com/Cofyc/dnscrypt-wrapper/releases/download/v0.2/dnscrypt-wrapper-v0.2.tar.bz2";
+    sha256 = "0kh52dc0v9lxwi39y88z0ab6bwa5bcw8b24psnz72fv555irsvyj";
+  };
+
+  buildInputs = [ pkgconfig autoreconfHook libsodium libevent ];
+
+  meta = {
+    description = "A tool for adding dnscrypt support to any name resolver";
+    homepage = http://dnscrypt.org/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index 952771318be6..1c83e08fc3e0 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { openssl, gmp, nettools, iproute, zlib, ... } :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     openssl gmp zlib
@@ -22,7 +22,7 @@ rec {
     sed -e 's@"/sbin/ifconfig.*"@"${a.iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
     sed -e 's@/sbin/ifconfig@${a.nettools}/sbin/ifconfig@g' -i src/device-*.C
   '') ["minInit" "doUnpack"];
-      
+
   meta = {
     description = "A proteted multinode virtual network";
     maintainers = [
diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index a0ec6a5513cb..9b1de33cf6d2 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, gettext, ncurses, openssl }:
+{ stdenv, fetchurl, gettext, ncurses, openssl
+, fftw ? null }:
 
 stdenv.mkDerivation rec {
   name = "httping-${version}";
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs";
   };
 
-  buildInputs = [ ncurses openssl ];
+  buildInputs = [ fftw ncurses openssl ];
   nativeBuildInputs = [ gettext ];
 
   makeFlags = [
@@ -22,7 +23,13 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = http://www.vanheusden.com/httping;
     description = "ping with HTTP requests";
+    longDescription = ''
+      Give httping an url, and it'll show you how long it takes to connect,
+      send a request and retrieve the reply (only the headers). Be aware that
+      the transmission across the network also takes time! So it measures the
+      latency of the webserver + network. It supports IPv6.
+    '';
     maintainers = with maintainers; [ nckx rickynils ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix
index 1418ad63385c..877f71bc37b4 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/pkgs/tools/networking/imapsync/default.nix
@@ -1,24 +1,30 @@
-{stdenv, fetchurl, perl, openssl, MailIMAPClient}:
+{stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "imapsync-1.267";
+  name = "imapsync-1.644";
   src = fetchurl {
-    url = http://www.linux-france.org/prj/imapsync/dist/imapsync-1.267.tgz;
-    sha256 = "0h9np2b4bdfnhn10cqkw66fki26480w0c8m3bxw0p76xkaggywdy";
+    url = "https://fedorahosted.org/released/imapsync/${name}.tgz";
+    sha256 = "1lni950qyp841277dnzb43pxpzqyfcl6sachd8j6a0j08826gfky";
   };
+
   patchPhase = ''
     sed -i -e s@/usr@$out@ Makefile
   '';
 
   postInstall = ''
-    # Add Mail::IMAPClient to the runtime search path.
-    substituteInPlace $out/bin/imapsync --replace '/bin/perl' '/bin/perl -I${MailIMAPClient}/lib/perl5/site_perl';
+    wrapProgram $out/bin/imapsync --set PERL5LIB $PERL5LIB
   '';
-  buildInputs = [perl openssl MailIMAPClient];
 
-  meta = {
-    homepage = "http://www.linux-france.org/prj/imapsync/";
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = with perlPackages; [ perl openssl MailIMAPClient TermReadKey
+    IOSocketSSL DigestHMAC URI FileCopyRecursive IOTee UnicodeString ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linux-france.org/prj/imapsync/;
     description = "Mail folder synchronizer between IMAP servers";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 098d6ef962fe..69f27ff37c23 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/bin/ifconfig,; s,/sbin/route,${nettools}/bin/route," src/tun.c'';
+  patchPhase = ''sed -i "s,/sbin/route,${nettools}/bin/route," src/tun.c'';
+
+  NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\"";
 
   installFlags = "prefix=\${out}";
 
diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix
new file mode 100644
index 000000000000..18fd2d12131d
--- /dev/null
+++ b/pkgs/tools/networking/ip2location/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+let version = "7.0.0"; in
+stdenv.mkDerivation {
+  name = "ip2location-${version}";
+
+  src = fetchurl {
+    sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l";
+    url = "http://www.ip2location.com/downloads/ip2location-${version}.tar.gz";
+  };
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Look up locations of host names and IP addresses";
+    longDescription = ''
+      A command-line tool to find the country, region, city,coordinates,
+      zip code, time zone, ISP, domain name, connection type, area code,
+      weather, MCC, MNC, mobile brand name, elevation and usage type of
+      any IP address or host name in the IP2Location databases.
+    '';
+    homepage = http://www.ip2location.com/free/applications;
+    license = with licenses; [ gpl3Plus lgpl3Plus ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index a4725e8140f6..a7c844932c96 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, geoip, geolite-legacy, getopt, openssl, perl }:
+{ stdenv, fetchurl, getopt, ip2location-c, openssl, perl
+, geoip ? null, geolite-legacy ? null
+, ip2location-database ? null }:
 
-let version = "0.99.0"; in
+let version = "0.99.1"; in
 stdenv.mkDerivation rec {
   name = "ipv6calc-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
-    sha256 = "1dgx6gji9dyz77jssk2ax5r0ycq4jcsks71bhvcpb79k02wkaxgw";
+    sha256 = "0a0xpai14y969hp6l10r2wcd16sqf3v40fq5h97m4a69hcpmvg5h";
   };
 
-  buildInputs = [ geoip geolite-legacy getopt openssl ];
+  buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ];
   nativeBuildInputs = [ perl ];
 
   patchPhase = ''
@@ -30,6 +32,8 @@ stdenv.mkDerivation rec {
     "--enable-geoip"
   ] ++ stdenv.lib.optional (geolite-legacy != null) [
     "--with-geoip-db=${geolite-legacy}/share/GeoIP"
+  ] ++ stdenv.lib.optional (ip2location-c != null ) [
+    "--enable-ip2location"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index 1bf009863936..c0944bb891ec 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
 
-let version = "1.1.4"; in
+let version = "1.1.5"; in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "minidlna-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz";
-    sha256 = "9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314";
+    sha256 = "16xb2nz8g1dwcail1zmpj8s426pygz0fdpd6ip6zaamv2q2asxw4";
   };
 
   preConfigure = ''
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Media server software";
     longDescription = ''
       MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully
       compliant with DLNA/UPnP-AV clients.
     '';
     homepage = http://sourceforge.net/projects/minidlna/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 3df3d114e453..f175157c92c8 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 = "0.5.9-88-ge5570a8"; in
+let version = "0.5.9-96-g4669e7a"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "e5570a84d16022dda6de7d5a55f7b7bd53d4a8de";
-    sha256 = "0w1l5a49xcwrp78djcs8d4737ndji9jp7x0v5q5yl5jfg0cdgmzc";
+    rev = "4669e7a1ac2112b0e9ba7c0b865fdedffbb86055";
+    sha256 = "0lnqw2afp2x8nwvvvcfdszxd825bfmhclyp2cvwddmkbwnzbligi";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 9bd1e7f48538..a131c567d89f 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p2";
+  name = "ntp-4.2.8p3";
 
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "0ccv9kh5asxpk7bjn73vwrqimbkbfl743bgx0km47bfajl7bqs8d";
+    sha256 = "13zkzcvjm5kbxl4xbcmaq07slplhmpkgahzcqnqlba3cxpra9341";
   };
 
   configureFlags = [
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index 132762c3b54f..421e0b205db6 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,23 +1,21 @@
 { stdenv, fetchurl, pkgconfig, openssl, libsigcxx, zlib }:
 
-let
-  version = "0.13.4";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libtorrent-${version}";
+  version = "0.13.6";
 
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz";
-    sha256 = "0ma910br5vxrfpm4f4w4942lpmhwvqjnnf9h8vpf52fw35qhjkkh";
+    url = "http://rtorrent.net/downloads/${name}.tar.gz";
+    sha256 = "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18";
   };
 
   buildInputs = [ pkgconfig openssl libsigcxx zlib ];
 
-  meta = {
-    homepage = "http://libtorrent.rakshasa.no/";
-    description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
+  meta = with stdenv.lib; {
+    homepage = https://github.com/rakshasa/libtorrent/;
+    description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ebzzry ];
   };
 }
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index 64d518355725..d702e3b9700f 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rtorrent-0.9.4";
+  name = "rtorrent-${version}";
+  version = "0.9.6";
 
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
-    sha256 = "113yrrac75vqi4g8r6bgs0ggjllj9bkg9shv08vqzdhkwqg2q2mw";
+    url = "http://rtorrent.net/downloads/${name}.tar.gz";
+    sha256 = "03jvzw9pi2mhcm913h8qg0qw9gwjqc6lhwynb1yz1y163x7w4s8y";
   };
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ];
@@ -19,11 +20,11 @@ stdenv.mkDerivation rec {
   #   mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
   # '';
 
-  meta = {
-    homepage = "http://libtorrent.rakshasa.no/";
-    description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
+  meta = with stdenv.lib; {
+    homepage = https://github.com/rakshasa/rtorrent/;
+    description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ebzzry ];
   };
 }
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
index fe7f98100262..fcbb5f63d825 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -1,10 +1,10 @@
-a :  
-let 
+a @ {ppp, ...} :
+let
   fetchurl = a.fetchurl;
 
   version = a.lib.attrByPath ["version"] "3.11" a;
   buildInputs = with a; [
-    ppp   
+    ppp
   ];
 in
 rec {
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 784ebb2bb7f7..1e8b1a1b299f 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
 , curl, trousers, sqlite, iptables, libxml2, openresolv
+, ldns, unbound, pcsclite, openssl
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   buildInputs =
-    [ gmp pkgconfig python autoreconfHook iptables ]
+    [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite ]
     ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ];
 
   patches = [
@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
       "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2"
       "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth"
       "--enable-forecast" "--enable-connmark" "--enable-acert"
+      "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound"
       "--enable-aesni" "--enable-af-alg" "--enable-rdrand" ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" 
     ++ stdenv.lib.optionals enableTNC [
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 5d8971e5c6f9..c62d5addb59f 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "vpnc-rev550";
+  name = "vpnc-0.5.3-post-r550";
   src = fetchsvn {
     url = "http://svn.unix-ag.uni-kl.de/vpnc";
     rev = "550";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     rm -r $sourceRoot/{trunk,branches,tags}
   '';
 
-  patches = [ ./makefile.patch ];
+  patches = [ ./makefile.patch ./no_default_route_when_netmask.patch ];
 
   # The `etc/vpnc/vpnc-script' script relies on `which' and on
   # `ifconfig' as found in net-tools (not GNU Inetutils).
diff --git a/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch b/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch
new file mode 100644
index 000000000000..fa12abe9b776
--- /dev/null
+++ b/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch
@@ -0,0 +1,12 @@
+diff -uNr a/vpnc-script b/vpnc-script
+--- a/vpnc-script	2015-09-06 13:19:11.408661526 +0200
++++ b/vpnc-script	2015-09-06 14:47:40.260871556 +0200
+@@ -647,7 +647,7 @@
+ 			echo "$i" | grep : >/dev/null || \
+ 				set_network_route "$i" "255.255.255.255" "32"
+ 		done
+-	elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then
++	elif [ -n "$INTERNAL_IP4_ADDRESS" -a -z "$INTERNAL_IP4_NETMASK" ]; then
+ 		set_default_route
+ 	fi
+ 	if [ -n "$CISCO_IPV6_SPLIT_INC" ]; then
diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index 9e8649537fdd..e8670770c5f4 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }:
 
-let rev = "57aeef0b6a3d3c9506e35f57f5b6db33019967e5"; in
+let rev = "8a2f5f0607540ffe56b56d52db544373e1efb980"; in
 
 stdenv.mkDerivation {
   name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     owner = "edolstra";
     repo = "nix-repl";
     inherit rev;
-    sha256 = "1p92zwkpy3iaglq23aydggbl6dbnw97f0v5gy2w74y8pi9d5mgh5";
+    sha256 = "0cjablz01i0g9smnavhf86imwx1f9mnh5flax75i615ml71gsr88";
   };
 
   buildInputs = [ nix readline ];
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index d193cfa438ed..7db46596eec7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -13,7 +13,8 @@ let
 
     nativeBuildInputs = [ perl pkgconfig ];
 
-    buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
+    buildInputs = [ curl openssl sqlite ] ++
+      lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
 
     propagatedBuildInputs = [ boehmgc ];
 
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 92a0e46b79dc..324371a7dce7 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.88b";
+  version = "1.93b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "10j0b4kzr4rmflcnxhb2r3klxc4sspx23bpgxjaqflp4z3zf5m1v";
+    sha256 = "1nin3rxidvfbafc5pm35wcmlx7yq07xwb29s5k1zzqdfflcnpi1m";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 5d6eaf551734..745f2a04cd37 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -1,5 +1,5 @@
-args :  
-let 
+args @ {unzip, ... } :
+let
   lib = args.lib;
   fetchurl = args.fetchurl;
   fullDepEntry = args.fullDepEntry;
diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix
index 73f7f8c9ae5e..36a203a7b507 100644
--- a/pkgs/tools/security/chkrootkit/default.nix
+++ b/pkgs/tools/security/chkrootkit/default.nix
@@ -1,16 +1,15 @@
 {stdenv, fetchurl}:
-  
+
 stdenv.mkDerivation {
-  name = "chkrootkit-0.48";
-  
+  name = "chkrootkit-0.50";
+
   src = fetchurl {
     url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit.tar.gz;
-    sha256 = "1yzid6bw092nf8k83y1119kc4ns7r0l3zsfah5xal8kh19ad7cxl";
+    sha256 = "1ivclp7ixndacjmf7xgj8lfa6h7ihx44mzzsapqdvf0c5f9gqj4m";
   };
 
   installPhase = "
     mkdir -p $out/sbin
     cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin
   ";
-  
 }
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 542baa95efe2..36c877620f19 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.28";
+  name = "gnupg-2.0.29";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0k2k399fnhfhhr4dvm8d6vs4ihq6gg06191lzfwikzaqmgj2w2ff";
+    sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8";
   };
 
   buildInputs
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 2a0f12545131..20d2eb15b978 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.7";
+  name = "gnupg-2.1.8";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0vl4wzraln0h4db0kfza4l5by5pgfijqplji5n4riv3zsiv3g2n1";
+    sha256 = "18w14xp0ynzzwpklyplkzbrncds1hly4k2gjx115swch8qgd1f53";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix
index e02ce1316ba9..c3aab9b709e3 100644
--- a/pkgs/tools/security/metasploit/3.1.nix
+++ b/pkgs/tools/security/metasploit/3.1.nix
@@ -1,4 +1,4 @@
-args : with args; 
+args @ { makeWrapper, ... }: with args;
 rec {
   src = fetchurl {
     url = http://www.packetstormsecurity.nl/UNIX/utilities/framework-3.1.tar.gz;
@@ -21,7 +21,7 @@ rec {
 
   /* doConfigure should be specified separately */
   phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
-      
+
   name = "metasploit-framework-3.1";
   meta = {
     description = "Metasploit Framework - a collection of exploits";
diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix
index c23d10d20ee5..0177eec9435e 100644
--- a/pkgs/tools/system/ansible/default.nix
+++ b/pkgs/tools/system/ansible/default.nix
@@ -1,13 +1,13 @@
 { windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "1.9.1";
+  version = "1.9.3";
   name = "ansible-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz";
-    sha256 = "a6f975d565723765a4d490ff40cede96833a745f38908def4950a0075f1973f5";
+    sha256 = "1vgfsjqb5gbs30ymqgq3q2kxzn3fvh8680n14yj5c040zm1gd515";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix
index 5b52e0feb597..c013c97cdbbd 100644
--- a/pkgs/tools/system/daemonize/default.nix
+++ b/pkgs/tools/system/daemonize/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "daemonize-${version}";
-  version = "1.7.5";
+  version = "1.7.6";
 
   src = fetchurl {
     url    = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz";
-    sha256 = "0sx0k05n8kyn0ma51nkjll8cs1xygmhv4qsyshxxj8apvjw20qk1";
+    sha256 = "07yv82mkhc57vnawwldqcy64c5yqyh817gksd3b4rgavbsp1fmwd";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index a164a26fbcd6..c33359eee881 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lzip }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.19";
+  name = "ddrescue-1.20";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.lz";
-    sha256 = "1f278w7i9sx45jk6fsw1kyzx743k3alx1c4w1q8sk05ckafhr3gd";
+    sha256 = "1gb0ak2c47nass7qdf9pnfrshcb38c318z1fx5v5v1k7l6qr7yc3";
   };
 
   buildInputs = [ lzip ];
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 5d6e322faccc..6e1d899d6b50 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, libaio, zlib }:
 
-let version = "2.2.7"; in
+let version = "2.2.10"; in
 
 stdenv.mkDerivation rec {
   name = "fio-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "axboe";
     repo = "fio";
     rev = "fio-${version}";
-    sha256 = "02k528n97xp1ly3d0mdn0lgwqlpn49b644696m75kcr0hn07382v";
+    sha256 = "0hg72k8cifw6lc46kyiic7ai4gqn2819d6g998vmx01jnlcixp8q";
   };
 
   buildInputs = [ libaio zlib ];
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configurePhase = ''
-    substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
+    substituteInPlace tools/plot/fio2gnuplot \
+      --replace /usr/share/fio $out/share/fio
     ./configure
   '';
 
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 023ceef40f23..2434889581ed 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -1,6 +1,7 @@
 source $stdenv/setup
 
 export PLAN9=$out/plan9
+export PLAN9_TARGET=$PLAN9
 
 configurePhase()
 {
@@ -15,12 +16,12 @@ configurePhase()
 buildPhase()
 {
     mkdir -p $PLAN9
-    ./INSTALL -b $PLAN9
+    ./INSTALL -b
 }
 
 installPhase()
 {
-    ./INSTALL -c -r $PLAN9
+    ./INSTALL -c
     # Copy sources
     cp -R * $PLAN9
 
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 86ce1f14a8c5..3a78cb2baf63 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,7 +1,9 @@
 {stdenv, fetchgit, which, libX11, libXt, fontconfig
 , xproto ? null
 , xextproto ? null
-, libXext ? null }:
+, libXext ? null
+  # For building web manuals
+, perl ? null }:
 
 stdenv.mkDerivation rec {
   name = "plan9port-2015-06-29";
@@ -23,7 +25,17 @@ stdenv.mkDerivation rec {
   builder = ./builder.sh;
 
   NIX_LDFLAGS="-lgcc_s";
-  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ];
+  buildInputs = stdenv.lib.optionals
+                  (!stdenv.isDarwin)
+                  [ which
+                    perl
+                    libX11
+                    fontconfig
+                    xproto
+                    libXt
+                    xextproto
+                    libXext
+                  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix
index 76bc24c27562..a35c0d249185 100644
--- a/pkgs/tools/system/setserial/default.nix
+++ b/pkgs/tools/system/setserial/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a @ { groff, ... } :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "2.17" a; 
+  version = a.lib.attrByPath ["version"] "2.17" a;
   buildInputs = with a; [
     groff
   ];
@@ -26,7 +26,7 @@ rec {
   '') ["minInit" "doUnpack" "doConfigure"];
 
   neededDirs = ["$out/bin" "$out/share/man/man8"];
-      
+
   name = "setserial-" + version;
   meta = {
     description = "Serial port configuration utility";
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 0f62fc4e360a..17bb3ac1ca94 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, attr, keyutils }:
 
-let version = "0.04.15"; in
-stdenv.mkDerivation rec {
+let
+  version = "0.04.18";
   name = "stress-ng-${version}";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    sha256 = "1jazcfviqx3pyhv2jzsp6y37ndsj1smfk6jacpxg9vrg5k3cm3wq";
+    sha256 = "04slzjpjv9kw0glzl3nr9p073shlcgs6aalc6ij9w3h4p7ibn0wh";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
     homepage = http://kernel.ubuntu.com/~cking/stress-ng;
     downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
     license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index c625f1b7813a..402f93ec8fba 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ {pciutils, libx86, zlib, ...} :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     libx86 pciutils zlib
@@ -19,13 +19,13 @@ rec {
     sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in
     export NIX_LDFLAGS="$NIX_LDFLAGS -lpci"
   '') ["doUnpack" "minInit"];
-      
+
   meta = {
     description = "Video BIOS execution tool";
     maintainers = [
       a.lib.maintainers.raskin
     ];
-    platforms = with a.lib.platforms; 
+    platforms = with a.lib.platforms;
       linux;
   };
 }
diff --git a/pkgs/tools/typesetting/patoline/default.nix b/pkgs/tools/typesetting/patoline/default.nix
index 9da588b934dc..a39105c83145 100644
--- a/pkgs/tools/typesetting/patoline/default.nix
+++ b/pkgs/tools/typesetting/patoline/default.nix
@@ -2,7 +2,7 @@
 { stdenv, fetchurl, ncurses, mesa, freeglut, libzip, 
    ocaml, findlib, camomile, 
    dypgen, ocaml_sqlite3, camlzip, 
-   lablgtk, camlimages, ocaml-cairo,
+   lablgtk, camlimages, ocaml_cairo,
    lablgl, ocamlnet, cryptokit,
    ocaml_pcre }:
 
@@ -21,13 +21,13 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
    
    buildInputs = [ ocaml findlib dypgen camomile ocaml_sqlite3 camlzip 
-   lablgtk camlimages ocaml-cairo
+   lablgtk camlimages ocaml_cairo
    lablgl ocamlnet cryptokit
    ocaml_pcre ncurses mesa freeglut libzip ];
 
   propagatedbuildInputs = [ camomile 
    dypgen ocaml_sqlite3 camlzip 
-   lablgtk camlimages ocaml-cairo
+   lablgtk camlimages ocaml_cairo
    lablgl ocamlnet cryptokit
    ocaml_pcre ncurses mesa freeglut libzip ];
 
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index fbafbaad27c7..eb8b30381ce2 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
+  version = "0.8.2";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "1sgqz7y4zn6xg0wicmyy83hbwbhv076vd81kigpcz3rjqk11lsvi";
+    sha256 = "1mlkprbq02yyaqfdziif79i48rvgg195kfwdpl24fdsgjlp83c20";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index 0846970662ff..56b093f921d1 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -1,4 +1,4 @@
-args : with args;
+args @ {poppler, perl, makeWrapper, ... }: with args;
 rec {
   name = "TeXLive-linkdir";
 
diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix
index f19d185572d3..7acecd66543e 100644
--- a/pkgs/tools/typesetting/tex/texlive/beamer.nix
+++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLiveLatexXColor, texLivePGF, texLive, ...}: with args;
 rec {
   name = "texlive-beamer-2013";
   src = fetchurl {
diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix
index 066796ed39c9..5c442fad27f4 100644
--- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix
+++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLive, ...}: with args;
 rec {
   name = "texlive-cm-super-2009";
   src = fetchurl {
@@ -29,7 +29,7 @@ rec {
     description = "Extra components for TeXLive: CM-Super fonts";
     maintainers = [ args.lib.maintainers.raskin ];
 
-    # Actually, arch-independent.. 
+    # Actually, arch-independent..
     hydraPlatforms = [];
   };
 }
diff --git a/pkgs/tools/typesetting/tex/texlive/context.nix b/pkgs/tools/typesetting/tex/texlive/context.nix
index 22e0991b5cc1..2cc62c334094 100644
--- a/pkgs/tools/typesetting/tex/texlive/context.nix
+++ b/pkgs/tools/typesetting/tex/texlive/context.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ { texLive, ... }: with args;
 rec {
   name = "context-2014.05.21";
   src = fetchurl {
@@ -22,4 +22,4 @@ rec {
   };
 
 }
- 
+
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index d676acd2f286..74b3829cf89f 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,4 +1,11 @@
-args : with args;
+args @ {
+builderDefs, zlib, bzip2, ncurses, libpng, ed, lesstif, ruby, potrace
+, gd, t1lib, freetype, icu, perl, expat, curl, xz, pkgconfig, zziplib, texinfo
+, libjpeg, bison, python, fontconfig, flex, poppler, libpaper, graphite2
+, makeWrapper, gmp, mpfr, xpdf, config
+, libXaw, libX11, xproto, libXt, libXpm
+, libXmu, libXext, xextproto, libSM, libICE
+, ... }: with args;
 
 rec {
   src = assert config.allowTexliveBuilds or true; fetchurl {
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 59c3389d750b..7f7ffbee7c29 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ { texLive, xz, ... }: with args;
 rec {
   name    = "texlive-extra-2014";
   version = "2014.20141024";
diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index f4db43f21f2b..9ec623a0f119 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLive, unzip, ...}: with args;
 rec {
   version = "1.5.1";
   name = "moderncv-${version}";
diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index e80e53f91284..6d57a659b63b 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLive, unzip, ...}: with args;
 rec {
   version = "0.9";
   name = "moderntimeline-${version}";
diff --git a/pkgs/tools/typesetting/tex/texlive/xcolor.nix b/pkgs/tools/typesetting/tex/texlive/xcolor.nix
index f02bf351c3f6..57351e069928 100644
--- a/pkgs/tools/typesetting/tex/texlive/xcolor.nix
+++ b/pkgs/tools/typesetting/tex/texlive/xcolor.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLive, ... }: with args;
 rec {
   name = "texlive-latex-xcolor-2007";
   src = fetchurl {
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 5732d4c9baf3..e37d1c6f11ff 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -1,10 +1,12 @@
-a :  
-let 
+a @ {imake, libX11, xproto, gccmakedep, libXt
+, libXmu, libXaw, libXext, xextproto, libSM, libICE, libXpm
+, libXp, ...} :
+let
   fetchurl = a.fetchurl;
 
   buildInputs = with a; [
     libX11 xproto imake gccmakedep libXt libXmu libXaw
-    libXext xextproto libSM libICE libXpm libXp 
+    libXext xextproto libSM libICE libXpm libXp
   ];
 in
 rec {
@@ -29,7 +31,7 @@ rec {
   doXMKMF = a.fullDepEntry (''
     xmkmf
   '') ["doUnpack" "minInit" "addInputs"];
-      
+
   name = "vncrec-0.2"; # version taken from Arch AUR
   meta = {
     description = "VNC recorder";