Merge branch 'master.upstream' into staging.upstream

61 files changed, 610 insertions, 493 deletions

diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix
new file mode 100644
index 000000000000..4bf62e53f55b
--- /dev/null
+++ b/pkgs/tools/X11/sct/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, libX11, libXrandr}:
+stdenv.mkDerivation rec {
+  name = "sct";
+  buildInputs = [libX11 libXrandr];
+  src = fetchurl {
+    url = http://www.tedunangst.com/flak/files/sct.c;
+    sha256 = "1bivy0sl5v1jsq4jbq6p9hplz6cvw4nx9rc96p2kxsg506rqllc5";
+  };
+  phases = ["patchPhase" "buildPhase" "installPhase"];
+  patchPhase = ''
+    sed -re "/Xlibint/d" ${src} > sct.c 
+  '';
+  buildPhase = "gcc -std=c99 sct.c -o sct -lX11 -lXrandr -lm";
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp sct "$out/bin"
+  '';
+  meta = {
+    description = ''A minimal utility to set display colour temperature'';
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd;
+  };
+}
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index ebcd2afd46f6..70e1b55984dd 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     description = "NX compression proxy";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 5f2c9b2a69d4..a861d4c8f77b 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.18.1";
+  version = "1.18.2";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "0ziwabd58hml0qziv94fhrffdn9wpaa4zh5cgnzdsv6fcahmjla5";
+    sha256 = "185pjd77lnq99x2sskpl7n6h25z0v069575l4qz206npsywbypnb";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 1fefc1dcc83a..0ce7e0e33436 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://code.google.com/p/lz4/;
     license = with licenses; [ bsd2 gpl2Plus ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix
index 3c442e221397..ff03b9b30c51 100644
--- a/pkgs/tools/compression/pbzip2/default.nix
+++ b/pkgs/tools/compression/pbzip2/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "A parallel implementation of bzip2 for multi-core machines";
     license = licenses.bsd2;
     maintainers = with maintainers; [viric];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 407b14a60999..6fdf555986b9 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     description = "Binary differential compression in VCDIFF (RFC 3284) format";
     homepage = http://xdelta.org/;
     license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index e82e720c11bd..30bb8d009a06 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
     '';
     homepage = https://github.com/drotiro/boxfs2;
     license = licenses.gpl3;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/filesystems/ceph/9.nix b/pkgs/tools/filesystems/ceph/9.nix
index f3d15a252cb8..a82867e59a21 100644
--- a/pkgs/tools/filesystems/ceph/9.nix
+++ b/pkgs/tools/filesystems/ceph/9.nix
@@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pa";
+    sha256 = "1lcal0jbpnm6y91s2v0g2zdnq7q0i5ql4bky294cz7g011di12vc";
   };
 
   patches = [ ./fix-pythonpath.patch ];
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index a82867e59a21..0f6f2dfda1d1 100644..120000
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,13 +1 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "9.2.0";
-
-  src = fetchgit {
-    url = "https://github.com/ceph/ceph.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "1lcal0jbpnm6y91s2v0g2zdnq7q0i5ql4bky294cz7g011di12vc";
-  };
-
-  patches = [ ./fix-pythonpath.patch ];
-})
+9.nix
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 8c169f131ed2..1673e69679b4 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -280,7 +280,7 @@ stdenv.mkDerivation {
     description = "Distributed storage system";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ ak wkennington ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 
   passthru.version = version;
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix
new file mode 100644
index 000000000000..551870342a92
--- /dev/null
+++ b/pkgs/tools/filesystems/gpart/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+let version = "0.2.2"; in
+stdenv.mkDerivation rec {
+  name = "gpart-${version}";
+
+  # GitHub repository 'collating patches for gpart from all distributions':
+  src = fetchFromGitHub {
+    sha256 = "09lp8m4241mxq7rlg70z66km7pq5bq48ydgkz55gakwqvnvd1mi3";
+    rev = "v${version}";
+    repo = "gpart";
+    owner = "baruch";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    inherit (src.meta) homepage;
+    description = "Guess PC-type hard disk partitions";
+    longDescription = ''
+      Gpart is a tool which tries to guess the primary partition table of a
+      PC-type hard disk in case the primary partition table in sector 0 is
+      damaged, incorrect or deleted. The guessed table can be written to a file
+      or device.
+    '';
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix
new file mode 100644
index 000000000000..bfd25247b86a
--- /dev/null
+++ b/pkgs/tools/filesystems/mhddfs/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, fuse, pkgconfig, attr, uthash }:
+
+stdenv.mkDerivation rec {
+  name = "mhddfs-${version}";
+  version = "0.1.39";
+
+  src = fetchurl {
+    url = "http://mhddfs.uvw.ru/downloads/mhddfs_${version}.tar.gz";
+    sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh";
+  };
+
+  buildInputs = [ fuse pkgconfig attr uthash ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp mhddfs $out/bin/
+  '';
+
+  meta = {
+    homepage = http://mhddfs.uvw.ru/;
+    description = "Combines a several mount points into the single one";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.makefu ];
+  };
+}
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix
index 8859aa003ebf..3b6b3c919cd7 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/pkgs/tools/filesystems/mp3fs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://khenriks.github.io/mp3fs/;
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
index bbddedf5077b..bcbafb613f1d 100644
--- a/pkgs/tools/filesystems/snapraid/default.nix
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "snapraid";
+  name = "snapraid-${version}";
   version = "8.1";
 
   src = fetchurl {
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index 0984d917e527..4404a8b6440c 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -2,22 +2,32 @@
 
 with stdenv.lib;
 
-stdenv.mkDerivation {
-  name = "gifsicle-1.87";
+stdenv.mkDerivation rec {
+  name = "gifsicle-${version}";
+  version = "1.88";
 
   src = fetchurl {
-    url = http://www.lcdf.org/gifsicle/gifsicle-1.87.tar.gz;
-    sha256 = "078rih7gq86ixjqbnn5z1jsh11qlfisw6k8dxaccsh5amhybw2j7";
+    url = "http://www.lcdf.org/gifsicle/${name}.tar.gz";
+    sha256 = "4585d2e683d7f68eb8fcb15504732d71d7ede48ab5963e61915201f9e68305be";
   };
 
   buildInputs = optional gifview [ xproto libXt libX11 ];
 
+  configureFlags = []
+    ++ optional (!gifview) [ "--disable-gifview" ];
+
   LDFLAGS = optional static "-static";
 
+  doCheck = true;
+  checkPhase = ''
+    ./src/gifsicle --info logo.gif
+  '';
+
   meta = {
     description = "Command-line tool for creating, editing, and getting information about GIF images and animations";
-    homepage = http://www.lcdf.org/gifsicle/;
+    homepage = https://www.lcdf.org/gifsicle/;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    platforms = platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu zimbatm ];
   };
 }
diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
index c4515fde5fc4..c9c526bc520f 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
         license = licenses.isc;
         description = "Allows programs to be run independently from its controlling terminal";
         maintainers = with maintainers; [ pSub ];
-        platforms = with platforms; linux;
+        platforms = platforms.linux;
     };
 
     src = fetchurl {
diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index 4491905de4fc..a536321fc74e 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, ncurses, python, perl }:
+{ stdenv, fetchurl, ncurses, python, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
-  name = "byobu-5.87";
+  version = "5.98";
+  name = "byobu-" + version;
 
   src = fetchurl {
-    url = "https://launchpad.net/byobu/trunk/5.87/+download/byobu_5.87.orig.tar.gz";
-    sha256 = "08v9y5hxb92caf5zp83fiq0jfwi167vw1ylf42s65x1ng8rvryqh";
+    url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
+    sha256 = "1s8nh4wbds1nh52i0d1hy1b308jjf4siwpq92lna1zh9ll4x71j5";
   };
 
   doCheck = true;
 
   buildInputs = [ python perl ];
+  propagatedBuildInputs = [ textual-window-manager ];
 
   meta = {
     homepage = https://launchpad.net/byobu/;
diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
index 47eacd9bdb09..996254a54a25 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/pkgs/tools/misc/clex/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.clex.sk;
     license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 84a021d2b32d..8e52adc76991 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -20,7 +20,7 @@ let
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.x-2015-10-13";
+  version = "2.x-2015-11-16";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromSavannah {
     repo = "grub";
-    rev = "a3645c1240a0b89c3b51593bd3efc14fe66d67cf";
-    sha256 = "0vxc2hi4qgv3hm90q6m3s5a9xi3j40fkc0wqv09hfkw25rabqk60";
+    rev = "50d6f38febe80d4d3088dae1ee639b341787ab71";
+    sha256 = "1pyn2qa8hwiabhgnzj86y4b69y4a37dh5n0j4csmm7xmgc13vvww";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];
diff --git a/pkgs/tools/misc/ttyrec/clang-fixes.patch b/pkgs/tools/misc/ttyrec/clang-fixes.patch
new file mode 100644
index 000000000000..126ab44090eb
--- /dev/null
+++ b/pkgs/tools/misc/ttyrec/clang-fixes.patch
@@ -0,0 +1,21 @@
+diff -ru ttyrec-1.0.8.orig/io.h ttyrec-1.0.8/io.h
+--- ttyrec-1.0.8.orig/io.h	2006-06-11 17:52:50.000000000 +0200
++++ ttyrec-1.0.8/io.h	2015-11-15 09:59:54.000000000 +0100
+@@ -9,5 +9,6 @@
+ int     edup            (int oldfd);
+ int     edup2           (int oldfd, int newfd);
+ FILE*   efdopen         (int fd, const char *mode);
++void    set_progname    (const char *name);
+ 
+ #endif
+diff -ru ttyrec-1.0.8.orig/ttyrec.c ttyrec-1.0.8/ttyrec.c
+--- ttyrec-1.0.8.orig/ttyrec.c	2006-06-11 17:52:50.000000000 +0200
++++ ttyrec-1.0.8/ttyrec.c	2015-11-15 09:59:41.000000000 +0100
+@@ -54,6 +54,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <signal.h>
+ 
+ #if defined(SVR4)
+ #include <fcntl.h>
diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix
new file mode 100644
index 000000000000..63b91adb4936
--- /dev/null
+++ b/pkgs/tools/misc/ttyrec/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "ttyrec-${version}";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "http://0xcc.net/ttyrec/${name}.tar.gz";
+    sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec";
+  };
+
+  patches = [ ./clang-fixes.patch ];
+
+  makeFlags = []
+    ++ stdenv.lib.optional stdenv.cc.isClang "CC=clang";
+
+  installPhase = ''
+    mkdir -p $out/{bin,man}
+    cp ttytime ttyplay ttyrec $out/bin
+    cp *.1 $out/man
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://0xcc.net/ttyrec/";
+    description = "Terminal interaction recorder and player";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1e8a8355ab28..0b88f3fc6115 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://yt-dl.org/downloads/${meta.version}/${name}.tar.gz";
-    sha256 = "c5a34ecbcf27ff34e1aae7c17732095309012e33ea9d1d4def613ca73f47e6be";
+    sha256 = "02140awgwvspnq226xpbc4clijmqkk8hlmfqhmmzzbihvs2b4xfx";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {
-    version = "2015.11.10";
+    version = "2015.11.13";
     homepage = http://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";
diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix
index aad3b769fe28..3c8e96547259 100644
--- a/pkgs/tools/networking/airfield/default.nix
+++ b/pkgs/tools/networking/airfield/default.nix
@@ -33,7 +33,7 @@ in nodePackages.buildNodePackage rec {
     license = licenses.mit;
     homepage = https://github.com/emblica/airfield;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     broken = true;
   };
 }
diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix
index 96003d85218e..46f923df4e9e 100644
--- a/pkgs/tools/networking/bud/default.nix
+++ b/pkgs/tools/networking/bud/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A TLS terminating proxy";
     license     = licenses.mit;
-    platforms   = with platforms; linux;
+    platforms   = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
   };
 }
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
index 4f0b68ce4bec..985cb0c3015a 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
     license = licenses.mit;
     homepage = https://github.com/Soulou/curl-unix-socket;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index cbc5a20997cc..c706984e8356 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -2,14 +2,14 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "5.4.3";
+  version = "5.5.2";
   name = "dd-agent-${version}";
 
   src = fetchFromGitHub {
     owner  = "datadog";
     repo   = "dd-agent";
     rev    = version;
-    sha256 = "07cign0ydxf1h6xsyi3iviywlm9x6d6rcaz46f3wipby6mv1s5dc";
+    sha256 = "0ga7h3rdg6q2pi4dxxkird5nf6s6hc13mj1xd9awwpli48gyvxn7";
   };
 
   buildInputs = [
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     pythonPackages.pyyaml
     pythonPackages.requests
     pythonPackages.pymongo
+    pythonPackages.docker
   ];
   propagatedBuildInputs = [ python tornado ];
 
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 432411c1460d..83a26f98d8b6 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display.";
     homepage = https://github.com/deiv/driftnet;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index 31a47d2e4414..aecc0bb63fa3 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://code.gerade.org/hans/;
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 5d05677bb29a..761dc01d2f98 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl }:
 
 stdenv.mkDerivation rec {
-  name = "isync-1.2.0";
+  name = "isync-1.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/isync/${name}.tar.gz";
-    sha256 = "0n8fwvv88h7ps7qs122kgh1yx5308765fiwqav5h7m272vg7hf43";
+    sha256 = "1bij6nm06ghkg98n2pdyacam2fyg5y8f7ajw0d5653m0r4ldw5p7";
   };
 
   buildInputs = [ openssl pkgconfig db cyrus_sasl ];
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 121f08c7e553..e39787a4fbb9 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://netsniff-ng.org/;
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 5b95dd159bff..e7176ba90b3b 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -12,12 +12,14 @@ stdenv.mkDerivation rec {
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;
 
-  buildInputs = [ iproute lzo openssl pam pkgconfig ] ++ optional stdenv.isLinux systemd;
+  buildInputs = [ lzo openssl pkgconfig ]
+                  ++ optionals stdenv.isLinux [ pam systemd iproute ];
 
   configureFlags = ''
     --enable-password-save
-    --enable-iproute2
+  '' + optionalString stdenv.isLinux ''
     --enable-systemd
+    --enable-iproute2
     IPROUTE=${iproute}/sbin/ip
   '';
 
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 81b143921379..b8a58db2d1e3 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-1.1pre-2015-09-25";
+  name = "tinc-1.1pre-2015-11-07";
 
   src = fetchgit {
     url = "git://tinc-vpn.org/tinc";
-    rev = "73068238436d8a22abb86e67b08f573b09fd04e1";
-    sha256 = "1j8bvvzvciy21s24jdpi089svy7wipg9pm84s98xjlp2plchj5dj";
+    rev = "bdd84660c756437cf3bc8f64adf612055acc84ea";
+    sha256 = "1vkpdn3gjlrrm0rfpbhz410mpcq16xy0ilvgkxsgifc9xgdgflmn";
   };
 
   nativeBuildInputs = [ autoreconfHook texinfo ];
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index f7fcfdf0f26e..6389234342fe 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -3,11 +3,11 @@
 , libiconv, libpsl, openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.16.3";
+  name = "wget-1.17";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.xz";
-    sha256 = "0dzv5xf9qxc2bp4cyifmaghh3h464wbm73xiwcrvckf1ynqbgxv7";
+    sha256 = "11xvs919a8xr595hs6hk323rkk7yshyfdfyfdhlahagkrcxdcsdx";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 07cbd99a10ba..abc409b29375 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, makeWrapper, git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused }:
-
+{ stdenv, makeWrapper,
+  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils
+}:
 stdenv.mkDerivation {
   name = "nix-prefetch-scripts";
 
@@ -22,7 +23,7 @@ stdenv.mkDerivation {
     }
 
     copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial}
-    copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git}
+    copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git} ${coreutils}
     copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion}
     copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar}
     copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs}
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index dd9dbed2995d..e35395b2b426 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -1,30 +1,18 @@
-{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem, writeScript
-, profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"])
-, dataDir ? (config.nixui.dataDir or "/tmp")
-, configurations ? (config.nixui.configurations or ["/etc/nixos/configuration.nix"])
-, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix") }:
+{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem
+, writeScript }:
 let
-  version = "0.1.2";
+  version = "0.2.1";
   src = fetchgit {
     url = "git://github.com/matejc/nixui.git";
-    rev = "refs/tags/${version}";
-    sha256 = "0rq8q867j4fx5j8mkidbwgbzqj4w4xi45xr8ya79m6v3iqqblhhj";
+    rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38";
+    sha256 = "15nypa4wm2ypfzy1nascxig9lj7l7p4vkrpbn1c807mil3k7xrs7";
   };
   nixui = (import ./node-default.nix { nixui = src; inherit pkgs; }).build;
   script = writeScript "nixui" ''
     #! ${stdenv.shell}
     export PATH="${nix}/bin:\$PATH"
-    export NIXUI_CONFIG="${config}"
     ${node_webkit}/bin/nw ${nixui}/lib/node_modules/nixui/
   '';
-  config = builtins.toFile "config.json" ''
-  {
-      "profilePaths": ${builtins.toJSON profilePaths},
-      "dataDir": "${dataDir}",
-      "configurations": ${builtins.toJSON configurations},
-      "NIX_PATH": "${NIX_PATH}"
-  }
-  '';
   desktop = makeDesktopItem {
     name = "nixui";
     exec = script;
@@ -46,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "NodeWebkit user interface for Nix";
     homepage = https://github.com/matejc/nixui;
-    license = stdenv.lib.licenses.bsd2;
+    license = stdenv.lib.licenses.asl20;
     maintainers = [ stdenv.lib.maintainers.matejc ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/package-management/nixui/node-default.nix b/pkgs/tools/package-management/nixui/node-default.nix
index 38a4cd4cfcc5..3c2c522cb750 100644
--- a/pkgs/tools/package-management/nixui/node-default.nix
+++ b/pkgs/tools/package-management/nixui/node-default.nix
@@ -17,7 +17,7 @@ in rec {
     name = "nixui";
     src = [ tarball ];
     buildInputs = nodePackages.nativeDeps."nixui" or [];
-    deps = [ nodePackages.underscore nodePackages.nedb ];
+    deps = [ nodePackages.underscore nodePackages.nedb nodePackages.isnumber ];
     peerDependencies = [];
     passthru.names = [ "nixui" ];
   };
diff --git a/pkgs/tools/package-management/nixui/node.nix b/pkgs/tools/package-management/nixui/node.nix
index fd2e34653c2e..38183c2dd9ff 100644
--- a/pkgs/tools/package-management/nixui/node.nix
+++ b/pkgs/tools/package-management/nixui/node.nix
@@ -3,432 +3,429 @@
 {
   by-spec."async"."0.2.10" =
     self.by-version."async"."0.2.10";
-  by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+  by-version."async"."0.2.10" = self.buildNodePackage {
     name = "async-0.2.10";
+    version = "0.2.10";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
-        name = "async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+      name = "async-0.2.10.tgz";
+      sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."binary-search-tree"."0.2.4" =
     self.by-version."binary-search-tree"."0.2.4";
-  by-version."binary-search-tree"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."binary-search-tree"."0.2.4" = self.buildNodePackage {
     name = "binary-search-tree-0.2.4";
+    version = "0.2.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz";
-        name = "binary-search-tree-0.2.4.tgz";
-        sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."binary-search-tree" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz";
+      name = "binary-search-tree-0.2.4.tgz";
+      sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510";
+    };
     deps = {
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "binary-search-tree" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."0.6.1" =
     self.by-version."commander"."0.6.1";
-  by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."0.6.1" = self.buildNodePackage {
     name = "commander-0.6.1";
+    version = "0.6.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
-        name = "commander-0.6.1.tgz";
-        sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+      name = "commander-0.6.1.tgz";
+      sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."commander"."2.3.0" =
     self.by-version."commander"."2.3.0";
-  by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."commander"."2.3.0" = self.buildNodePackage {
     name = "commander-2.3.0";
+    version = "2.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
-        name = "commander-2.3.0.tgz";
-        sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+      name = "commander-2.3.0.tgz";
+      sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."debug"."2.0.0" =
     self.by-version."debug"."2.0.0";
-  by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."debug"."2.0.0" = self.buildNodePackage {
     name = "debug-2.0.0";
+    version = "2.0.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
-        name = "debug-2.0.0.tgz";
-        sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+      name = "debug-2.0.0.tgz";
+      sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
+    };
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."diff"."1.0.8" =
     self.by-version."diff"."1.0.8";
-  by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."diff"."1.0.8" = self.buildNodePackage {
     name = "diff-1.0.8";
+    version = "1.0.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
-        name = "diff-1.0.8.tgz";
-        sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."diff" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
+      name = "diff-1.0.8.tgz";
+      sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "diff" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."escape-string-regexp"."1.0.2" =
     self.by-version."escape-string-regexp"."1.0.2";
-  by-version."escape-string-regexp"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage {
     name = "escape-string-regexp-1.0.2";
+    version = "1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
-        name = "escape-string-regexp-1.0.2.tgz";
-        sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."escape-string-regexp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
+      name = "escape-string-regexp-1.0.2.tgz";
+      sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "escape-string-regexp" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."expect.js"."~0.3.1" =
     self.by-version."expect.js"."0.3.1";
-  by-version."expect.js"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."expect.js"."0.3.1" = self.buildNodePackage {
     name = "expect.js-0.3.1";
+    version = "0.3.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz";
-        name = "expect.js-0.3.1.tgz";
-        sha1 = "b0a59a0d2eff5437544ebf0ceaa6015841d09b5b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."expect.js" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz";
+      name = "expect.js-0.3.1.tgz";
+      sha1 = "b0a59a0d2eff5437544ebf0ceaa6015841d09b5b";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "expect.js" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "expect.js" = self.by-version."expect.js"."0.3.1";
   by-spec."formatio"."~1.0" =
     self.by-version."formatio"."1.0.2";
-  by-version."formatio"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."formatio"."1.0.2" = self.buildNodePackage {
     name = "formatio-1.0.2";
+    version = "1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz";
-        name = "formatio-1.0.2.tgz";
-        sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."formatio" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz";
+      name = "formatio-1.0.2.tgz";
+      sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef";
+    };
     deps = {
-      "samsam-1.1.2" = self.by-version."samsam"."1.1.2";
+      "samsam-1.1.3" = self.by-version."samsam"."1.1.3";
+    };
+    optionalDependencies = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "formatio" ];
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."3.2.3" =
     self.by-version."glob"."3.2.3";
-  by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."glob"."3.2.3" = self.buildNodePackage {
     name = "glob-3.2.3";
+    version = "3.2.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
-        name = "glob-3.2.3.tgz";
-        sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+      name = "glob-3.2.3.tgz";
+      sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
+    };
     deps = {
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."graceful-fs"."~2.0.0" =
     self.by-version."graceful-fs"."2.0.3";
-  by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."graceful-fs"."2.0.3" = self.buildNodePackage {
     name = "graceful-fs-2.0.3";
+    version = "2.0.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
-        name = "graceful-fs-2.0.3.tgz";
-        sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."graceful-fs" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
+      name = "graceful-fs-2.0.3.tgz";
+      sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "graceful-fs" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."growl"."1.8.1" =
     self.by-version."growl"."1.8.1";
-  by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."growl"."1.8.1" = self.buildNodePackage {
     name = "growl-1.8.1";
+    version = "1.8.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
-        name = "growl-1.8.1.tgz";
-        sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."growl" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
+      name = "growl-1.8.1.tgz";
+      sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "growl" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inherits"."2" =
     self.by-version."inherits"."2.0.1";
-  by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+  by-version."inherits"."2.0.1" = self.buildNodePackage {
     name = "inherits-2.0.1";
+    version = "2.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
-        name = "inherits-2.0.1.tgz";
-        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inherits" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+      name = "inherits-2.0.1.tgz";
+      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "inherits" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inherits"."2.0.1" =
     self.by-version."inherits"."2.0.1";
+  by-spec."isnumber"."^1.0.0" =
+    self.by-version."isnumber"."1.0.0";
+  by-version."isnumber"."1.0.0" = self.buildNodePackage {
+    name = "isnumber-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz";
+      name = "isnumber-1.0.0.tgz";
+      sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "isnumber" = self.by-version."isnumber"."1.0.0";
   by-spec."jade"."0.26.3" =
     self.by-version."jade"."0.26.3";
-  by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."jade"."0.26.3" = self.buildNodePackage {
     name = "jade-0.26.3";
+    version = "0.26.3";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
-        name = "jade-0.26.3.tgz";
-        sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jade" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+      name = "jade-0.26.3.tgz";
+      sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
+    };
     deps = {
       "commander-0.6.1" = self.by-version."commander"."0.6.1";
       "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "jade" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."lru-cache"."2" =
-    self.by-version."lru-cache"."2.5.0";
-  by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lru-cache-2.5.0";
+    self.by-version."lru-cache"."2.7.0";
+  by-version."lru-cache"."2.7.0" = self.buildNodePackage {
+    name = "lru-cache-2.7.0";
+    version = "2.7.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
-        name = "lru-cache-2.5.0.tgz";
-        sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz";
+      name = "lru-cache-2.7.0.tgz";
+      sha1 = "aaa376a4cd970f9cebf5ec1909566ec034f07ee6";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimatch"."~0.2.11" =
     self.by-version."minimatch"."0.2.14";
-  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimatch"."0.2.14" = self.buildNodePackage {
     name = "minimatch-0.2.14";
+    version = "0.2.14";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
-        name = "minimatch-0.2.14.tgz";
-        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+      name = "minimatch-0.2.14.tgz";
+      sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+    };
     deps = {
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
-      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+      "lru-cache-2.7.0" = self.by-version."lru-cache"."2.7.0";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
+    };
+    optionalDependencies = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimist"."0.0.8" =
     self.by-version."minimist"."0.0.8";
-  by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+  by-version."minimist"."0.0.8" = self.buildNodePackage {
     name = "minimist-0.0.8";
+    version = "0.0.8";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        name = "minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimist" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+      name = "minimist-0.0.8.tgz";
+      sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimist" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."0.3.0" =
     self.by-version."mkdirp"."0.3.0";
-  by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkdirp"."0.3.0" = self.buildNodePackage {
     name = "mkdirp-0.3.0";
+    version = "0.3.0";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
-        name = "mkdirp-0.3.0.tgz";
-        sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+      name = "mkdirp-0.3.0.tgz";
+      sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."0.5.0" =
     self.by-version."mkdirp"."0.5.0";
-  by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkdirp"."0.5.0" = self.buildNodePackage {
     name = "mkdirp-0.5.0";
+    version = "0.5.0";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
-        name = "mkdirp-0.5.0.tgz";
-        sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+      name = "mkdirp-0.5.0.tgz";
+      sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
+    };
     deps = {
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."~0.3.5" =
     self.by-version."mkdirp"."0.3.5";
-  by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."mkdirp"."0.3.5" = self.buildNodePackage {
     name = "mkdirp-0.3.5";
+    version = "0.3.5";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-        name = "mkdirp-0.3.5.tgz";
-        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+      name = "mkdirp-0.3.5.tgz";
+      sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mocha"."~1.21.0" =
     self.by-version."mocha"."1.21.5";
-  by-version."mocha"."1.21.5" = lib.makeOverridable self.buildNodePackage {
+  by-version."mocha"."1.21.5" = self.buildNodePackage {
     name = "mocha-1.21.5";
+    version = "1.21.5";
     bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.21.5.tgz";
-        name = "mocha-1.21.5.tgz";
-        sha1 = "7c58b09174df976e434a23b1e8d639873fc529e9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mocha" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mocha/-/mocha-1.21.5.tgz";
+      name = "mocha-1.21.5.tgz";
+      sha1 = "7c58b09174df976e434a23b1e8d639873fc529e9";
+    };
     deps = {
       "commander-2.3.0" = self.by-version."commander"."2.3.0";
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
@@ -439,179 +436,173 @@
       "jade-0.26.3" = self.by-version."jade"."0.26.3";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mocha" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "mocha" = self.by-version."mocha"."1.21.5";
   by-spec."ms"."0.6.2" =
     self.by-version."ms"."0.6.2";
-  by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."ms"."0.6.2" = self.buildNodePackage {
     name = "ms-0.6.2";
+    version = "0.6.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
-        name = "ms-0.6.2.tgz";
-        sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ms" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+      name = "ms-0.6.2.tgz";
+      sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ms" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."nedb"."~1.0.0" =
     self.by-version."nedb"."1.0.2";
-  by-version."nedb"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+  by-version."nedb"."1.0.2" = self.buildNodePackage {
     name = "nedb-1.0.2";
+    version = "1.0.2";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz";
-        name = "nedb-1.0.2.tgz";
-        sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nedb" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz";
+      name = "nedb-1.0.2.tgz";
+      sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593";
+    };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
       "binary-search-tree-0.2.4" = self.by-version."binary-search-tree"."0.2.4";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nedb" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "nedb" = self.by-version."nedb"."1.0.2";
   by-spec."samsam"."~1.1" =
-    self.by-version."samsam"."1.1.2";
-  by-version."samsam"."1.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "samsam-1.1.2";
+    self.by-version."samsam"."1.1.3";
+  by-version."samsam"."1.1.3" = self.buildNodePackage {
+    name = "samsam-1.1.3";
+    version = "1.1.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
-        name = "samsam-1.1.2.tgz";
-        sha1 = "bec11fdc83a9fda063401210e40176c3024d1567";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."samsam" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz";
+      name = "samsam-1.1.3.tgz";
+      sha1 = "9f5087419b4d091f232571e7fa52e90b0f552621";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "samsam" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sigmund"."~1.0.0" =
-    self.by-version."sigmund"."1.0.0";
-  by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "sigmund-1.0.0";
+    self.by-version."sigmund"."1.0.1";
+  by-version."sigmund"."1.0.1" = self.buildNodePackage {
+    name = "sigmund-1.0.1";
+    version = "1.0.1";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
-        name = "sigmund-1.0.0.tgz";
-        sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sigmund" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+      name = "sigmund-1.0.1.tgz";
+      sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sigmund" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."sinon"."~1.10.3" =
     self.by-version."sinon"."1.10.3";
-  by-version."sinon"."1.10.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."sinon"."1.10.3" = self.buildNodePackage {
     name = "sinon-1.10.3";
+    version = "1.10.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz";
-        name = "sinon-1.10.3.tgz";
-        sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sinon" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz";
+      name = "sinon-1.10.3.tgz";
+      sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c";
+    };
     deps = {
       "formatio-1.0.2" = self.by-version."formatio"."1.0.2";
       "util-0.10.3" = self.by-version."util"."0.10.3";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sinon" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "sinon" = self.by-version."sinon"."1.10.3";
   by-spec."underscore"."^1.6.0" =
-    self.by-version."underscore"."1.7.0";
-  by-version."underscore"."1.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "underscore-1.7.0";
+    self.by-version."underscore"."1.8.3";
+  by-version."underscore"."1.8.3" = self.buildNodePackage {
+    name = "underscore-1.8.3";
+    version = "1.8.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
-        name = "underscore-1.7.0.tgz";
-        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+      name = "underscore-1.8.3.tgz";
+      sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "underscore" = self.by-version."underscore"."1.7.0";
+  "underscore" = self.by-version."underscore"."1.8.3";
   by-spec."underscore"."~1.4.4" =
     self.by-version."underscore"."1.4.4";
-  by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
+  by-version."underscore"."1.4.4" = self.buildNodePackage {
     name = "underscore-1.4.4";
+    version = "1.4.4";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-        name = "underscore-1.4.4.tgz";
-        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+      name = "underscore-1.4.4.tgz";
+      sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+    };
     deps = {
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."util".">=0.10.3 <1" =
     self.by-version."util"."0.10.3";
-  by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage {
+  by-version."util"."0.10.3" = self.buildNodePackage {
     name = "util-0.10.3";
+    version = "0.10.3";
     bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
-        name = "util-0.10.3.tgz";
-        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."util" or []);
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
+      name = "util-0.10.3.tgz";
+      sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+    };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
-    peerDependencies = [
-    ];
-    passthru.names = [ "util" ];
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
 }
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 02eee4d7e369..2d17c9e8ba68 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = http://pcsclite.alioth.debian.org/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ viric wkennington ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index ad33975a7d92..c96632537615 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -43,6 +43,6 @@ in stdenv.mkDerivation rec {
       which is required to actually use your eID for authentication or signing.
     '';
     maintainers = with maintainers; [ nckx ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix
index a04b87c8e313..480ef5bf3e7e 100644
--- a/pkgs/tools/security/gpgstats/default.nix
+++ b/pkgs/tools/security/gpgstats/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.vanheusden.com/gpgstats/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ davidak ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
 
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 24a6782c2065..2e99208fe114 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = https://github.com/magnumripper/JohnTheRipper/;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
index 7cf68d48e18d..6258f2315904 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     homepage    = "http://www.thoughtcrime.org/software/knockknock/";
     license     = licenses.gpl3;
     maintainers = with maintainers; [ copumpkin ];
-    platforms   = with platforms; linux;
+    platforms   = platforms.linux;
   };
 }
 
diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index ab1f2e01f5d8..ba875c04e2ba 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     homepage = https://github.com/kernc/logkeys;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix
index 9d92482f68f1..9a593907a533 100644
--- a/pkgs/tools/security/mfcuk/default.nix
+++ b/pkgs/tools/security/mfcuk/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = http://code.google.com/p/mfcuk/;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix
index f99db572b6c3..a223b3e835ae 100644
--- a/pkgs/tools/security/mfoc/default.nix
+++ b/pkgs/tools/security/mfoc/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = http://code.google.com/p/mfoc/;
     maintainers = with maintainers; [ offline ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix
index 5ed6c9ecdc4a..2f3101cffea8 100644
--- a/pkgs/tools/security/modsecurity/default.nix
+++ b/pkgs/tools/security/modsecurity/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     homepage = https://www.modsecurity.org/;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix
index 099547c2f321..35bbb3bae48d 100644
--- a/pkgs/tools/security/nasty/default.nix
+++ b/pkgs/tools/security/nasty/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.vanheusden.com/nasty/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ davidak ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
 
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index dd33e68c1526..4c96c947f57a 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://pcsclite.alioth.debian.org/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ viric wkennington ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index 59db6889a578..af0090cdf965 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -35,6 +35,6 @@ in stdenv.mkDerivation rec {
     homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 29c29d6b93af..c06636dc3677 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     license = licenses.agpl3;
     homepage = https://www.thc.org/thc-hydra/;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index 263690728d22..7f35551f2ee9 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl2;
     homepage = http://augeas.net/;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index d90b5d1d2f00..a6bbb48ecb27 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A tool to copy data from a damaged block device";
     maintainers = with maintainers; [ raskin iElectric ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/";
     inherit version;
     updateWalker = true;
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix
index ce29fc635531..d05e2986204c 100644
--- a/pkgs/tools/system/dog/default.nix
+++ b/pkgs/tools/system/dog/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "cat replacement";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ qknight ];
-    platforms = with platforms; all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
index d560fdad51bc..0e502edc2893 100644
--- a/pkgs/tools/system/foremost/default.nix
+++ b/pkgs/tools/system/foremost/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://foremost.sourceforge.net/;
     license = licenses.publicDomain;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 54721f7ce73d..bd01dc8377b9 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Disk I/O latency measuring tool";
     maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
     license = licenses.gpl3Plus;
     homepage = https://github.com/koct9i/ioping;
   };
diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
index 03c1c85ea84d..243325168706 100644
--- a/pkgs/tools/system/iops/default.nix
+++ b/pkgs/tools/system/iops/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.vanheusden.com/iops/;
     license = licenses.gpl2;
     maintainers = with maintainers; davidak;
-    platforms = with platforms; linux; # build problems on Darwin
+    platforms = platforms.linux; # build problems on Darwin
   };
 }
 
diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix
index c443dc148f13..58036af1a947 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/pkgs/tools/system/tm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     description = "terminal mixer - multiplexer for the i/o of terminal applications";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; all;
+    platforms = platforms.all;
   };
 
 }
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 3bf4cea09f53..ff2fdfefb059 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "task spooler - batch queue";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
-    platforms = with platforms; all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 386e80a13762..6e0c2da5c181 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     '';
     homepage = https://github.com/rpodgorny/uptimed/;
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 
   patches = [ ./no-var-spool-install.patch ];
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index d1c21e62a66a..60114b7b3f3a 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     '';
     homepage = https://github.com/theZiz/aha;
     license = with licenses; [ lgpl2Plus mpl11 ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 10822f1809fb..e68b819f59a1 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     description = "Cross-platform gettext catalogs (.po files) editor";
     homepage = http://www.poedit.net/;
     license = licenses.mit;
-    platforms = with platforms; unix;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ iElectric ];
   };
 }