From b4be4e5270b04c68be612d6c2f22a2f72107ca50 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 14 May 2014 11:31:37 +1000
Subject: [PATCH 001/221] pycrypto: fix build on darwin

---
 pkgs/development/python-modules/pycrypto/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 5da727a08db..3cf877259ec 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -11,9 +11,12 @@ buildPythonPackage rec {
 
   buildInputs = [ gmp ];
 
+  # error: AF_UNIX path too long
+  doCheck = !stdenv.isDarwin;
+
   meta = {
     homepage = "http://www.pycrypto.org/";
     description = "Python Cryptography Toolkit";
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 1e752993db06f7c3498cb14f0b0c875c87329152 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 14 May 2014 11:31:43 +1000
Subject: [PATCH 002/221] weechat: fix build on darwin

---
 pkgs/applications/networking/irc/weechat/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index b47018e0d97..7a6428fb285 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
   # then.
   patches = [ ./fix-gnutls-32.diff ];
 
+  NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7";
+
   postInstall = ''
        wrapProgram "$out/bin/weechat" \
          --prefix PYTHONPATH : "$PYTHONPATH" \
@@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.weechat.org/;
     description = "A fast, light and extensible chat client";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ];
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From fa7a3d47204aa163ee93529a194cca33b70a8d3b Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 14 May 2014 14:44:28 +1000
Subject: [PATCH 003/221] pythonPackages.pync: add expression

---
 pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e51bc9e9440..c3a99a8f746 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9173,4 +9173,33 @@ rec {
     };
   };
 
+  pync = buildPythonPackage rec {
+    version  = "1.4";
+    baseName = "pync";
+    name     = "${baseName}-${version}";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/${baseName}/${name}.tar.gz";
+      md5 = "5cc79077f386a17b539f1e51c05a3650";
+    };
+
+    buildInputs = [ pkgs.coreutils ];
+
+    propagatedBuildInputs = [ dateutil ];
+
+    preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.rubyLibs.terminal_notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Python Wrapper for Mac OS 10.8 Notification Center";
+      homepage    = https://pypi.python.org/pypi/pync/1.4;
+      license     = licenses.mit;
+      platforms   = platforms.darwin;
+      maintainers = [ maintainers.lovek323 ];
+    };
+  };
+
+
+
 }); in pythonPackages

From 1c1ce3868b1436fa34d529c77d55cebff71d372e Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 14 May 2014 14:46:39 +1000
Subject: [PATCH 004/221] weechat: support notification_center.py script

---
 .../networking/irc/weechat/default.nix             | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 7a6428fb285..78b497364a5 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   buildInputs = 
     [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
       libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
-      cacert cmake
-    ];
+      cacert cmake ]
+    ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
 
   # This patch is based on
   # weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes
@@ -27,9 +27,13 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7";
 
   postInstall = ''
-       wrapProgram "$out/bin/weechat" \
-         --prefix PYTHONPATH : "$PYTHONPATH" \
-         --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
+    NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages"
+  '' + ''
+     wrapProgram "$out/bin/weechat" \
+       --prefix PYTHONPATH : "$PYTHONPATH" \
+       --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
   '';
 
   meta = {

From 1048dbc33c399dbcc22b75eeca446add8c75f7d3 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 15 May 2014 08:26:24 +1000
Subject: [PATCH 005/221] weechatDevel: update to latest

---
 .../networking/irc/weechat/devel.nix          | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix
index cf52838b78c..7adfbb0f8e0 100644
--- a/pkgs/applications/networking/irc/weechat/devel.nix
+++ b/pkgs/applications/networking/irc/weechat/devel.nix
@@ -3,33 +3,39 @@
 , pythonPackages, cacert, cmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  rev = "6f64ee699ba46c90b55d3b99c60e4807819e2b7b";
+  rev = "85b8e0d82bf99ca2c55a87482ee40b3043df14db";
   version = "0.4.4-rev${rev}";
   name = "weechat-${version}";
 
   src = fetchgit {
     inherit rev;
-    url = "git://github.com/weechat/weechat.git";
-    sha256 = "1w58gir48kxvscf6njy3kmfxbjlnsf2byw3g3w6r47zjkgyxcf1z";
+    url    = "git://github.com/weechat/weechat.git";
+    sha256 = "0kzsar7gmw2sgkdzcspg65prii8skpaqxvdyvas2a29dr07j2gnl";
   };
 
   buildInputs = 
     [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
       libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
-      cacert cmake
-    ];
+      cacert cmake ]
+    ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
+
+  NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7";
 
   postInstall = ''
-       wrapProgram "$out/bin/weechat" \
-         --prefix PYTHONPATH : "$PYTHONPATH" \
-         --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
+    NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages"
+  '' + ''
+     wrapProgram "$out/bin/weechat" \
+       --prefix PYTHONPATH : "$PYTHONPATH" \
+       --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
   '';
 
   meta = {
-    homepage = http://www.weechat.org/;
+    homepage    = http://www.weechat.org/;
     description = "A fast, light and extensible chat client";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ];
-    platforms = stdenv.lib.platforms.linux;
+    license     = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ];
+    platforms   = stdenv.lib.platforms.unix;
   };
 }

From 4debe3c9276d03a0edc16aa41095053af955cd33 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 15 May 2014 08:27:40 +1000
Subject: [PATCH 006/221] weechat: do not hard code python prefix

---
 pkgs/applications/networking/irc/weechat/default.nix | 2 +-
 pkgs/applications/networking/irc/weechat/devel.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 78b497364a5..5e5cf8d9002 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   # then.
   patches = [ ./fix-gnutls-32.diff ];
 
-  NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7";
+  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
 
   postInstall = ''
     NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix
index 7adfbb0f8e0..b858203b0f8 100644
--- a/pkgs/applications/networking/irc/weechat/devel.nix
+++ b/pkgs/applications/networking/irc/weechat/devel.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       cacert cmake ]
     ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
 
-  NIX_CFLAGS_COMPILE = "-I${python}/include/python2.7";
+  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
 
   postInstall = ''
     NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"

From 71b923fa74c4f04abb3e60cf252867b62edeb26a Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 17 May 2014 12:10:07 +0200
Subject: [PATCH 007/221] systemd: fix python support

---
 pkgs/os-specific/linux/systemd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 522907e2aee..3445c3cd2dd 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -2,13 +2,13 @@
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
 , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
 , kexectools, libmicrohttpd, linuxHeaders
-, python ? null, pythonSupport ? false
+, pythonPackages ? null, pythonSupport ? false
 , autoreconfHook
 }:
 
 assert stdenv.isLinux;
 
-assert pythonSupport -> python != null;
+assert pythonSupport -> pythonPackages != null;
 
 stdenv.mkDerivation rec {
   version = "212";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
       libmicrohttpd linuxHeaders
       autoreconfHook
-    ] ++ stdenv.lib.optional pythonSupport python;
+    ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml];
 
   configureFlags =
     [ "--localstatedir=/var"

From 9b080f87e417a388bca8fc9826765491ec1c826c Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Thu, 15 May 2014 08:30:25 +1000
Subject: [PATCH 008/221] weechat: fix pythonpath

---
 .../networking/irc/weechat/default.nix             |  2 +-
 pkgs/applications/networking/irc/weechat/devel.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 5e5cf8d9002..954651d79e9 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '' + ''
      wrapProgram "$out/bin/weechat" \
        --prefix PYTHONPATH : "$PYTHONPATH" \
-       --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
+       --prefix PYTHONPATH : "$NIX_PYTHONPATH"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix
index b858203b0f8..25cc8dd7660 100644
--- a/pkgs/applications/networking/irc/weechat/devel.nix
+++ b/pkgs/applications/networking/irc/weechat/devel.nix
@@ -3,14 +3,14 @@
 , pythonPackages, cacert, cmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  rev = "85b8e0d82bf99ca2c55a87482ee40b3043df14db";
-  version = "0.4.4-rev${rev}";
+  rev = "70d2b0ad8eb7854932d24c007a05b8627f751205";
+  version = "1.0-rev${rev}";
   name = "weechat-${version}";
 
   src = fetchgit {
     inherit rev;
-    url    = "git://github.com/weechat/weechat.git";
-    sha256 = "0kzsar7gmw2sgkdzcspg65prii8skpaqxvdyvas2a29dr07j2gnl";
+    url = "git://github.com/weechat/weechat.git";
+    sha256 = "1k7kcrq46anq87r14sq3vrhij8acn6id7zxyhn0qnjj2wqgrjp5i";
   };
 
   buildInputs = 
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
 
   postInstall = ''
-    NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
+    NIX_PYTHON_PATH="$out/lib/${python.libPrefix}/site-packages"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages"
+    NIX_PYTHON_PATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages"
   '' + ''
      wrapProgram "$out/bin/weechat" \
        --prefix PYTHONPATH : "$PYTHONPATH" \
-       --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
+       --prefix PYTHONPATH : "$NIX_PYTHONPATH"
   '';
 
   meta = {

From 58ade1d1db6b175ca9ff0d3b09e7f093ac3980f8 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 5 May 2014 10:21:16 +1000
Subject: [PATCH 009/221] sup: update to 0.18.0

---
 .../networking/mailreaders/sup/default.nix    | 42 +++++++++++--------
 pkgs/top-level/all-packages.nix               | 10 ++++-
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index 70aeb000981..8efda554d73 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,32 +1,40 @@
-{ stdenv, fetchgit, ruby, rake, rubygems, makeWrapper, ncursesw_sup
+{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
 , xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile
-, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }:
+, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which
+, bundler, git }:
 
 stdenv.mkDerivation rec {
-  version = "20140312";
+  version = "0.18.0";
   name    = "sup-${version}";
-  
+
   meta = {
-    homepage = http://supmua.org;
     description = "A curses threads-with-tags style email client";
+    homepage    = http://supmua.org;
+    license     = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    platforms   = stdenv.lib.platforms.unix;
   };
 
   dontStrip = true;
 
-  src = fetchgit {
-    url = git://github.com/sup-heliotrope/sup.git;
-    rev = "0cad7b308237c07b8a46149908b2ad4806ac3d1d";
-    sha256 = "83534b6ad9fb6aa883d630c927e3a71bd09a646e3254b4eb0cc7a09f69a525bc";
+  src = fetchurl {
+    url    = "https://github.com/sup-heliotrope/sup/archive/release-${version}.tar.gz";
+    sha256 = "1dhg0i2v0ddhwi32ih5lc56x00kbaikd2wdplgzlshq0nljr9xy0";
   };
 
   buildInputs =
-    [ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_ruby
-      libiconvOrEmpty ];
+    [ rake ruby rubygems makeWrapper gpgme ncursesw_sup xapian_ruby
+      libiconvOrEmpty git ];
 
-  buildPhase = "rake gem";
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    # the builder uses git to get a listing of the files
+    git init >/dev/null
+    git add .
+    git commit -m "message" >/dev/null
+    gem build sup.gemspec
+  '';
 
   installPhase = ''
     export HOME=$TMP/home; mkdir -pv "$HOME"
@@ -50,13 +58,13 @@ stdenv.mkDerivation rec {
     # Don't install some dependencies -- we have already installed
     # the dependencies but gem doesn't acknowledge this
     gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri pkg/sup-999.gem \
-        --ignore-dependencies
+        --bindir "$out/bin" --no-rdoc --no-ri sup-${version}.gem \
+        --ignore-dependencies >/dev/null
 
     # specify ruby interpreter explicitly
     sed -i '1 s|^.*$|#!${ruby}/bin/ruby|' bin/sup-sync-back-maildir
 
-    cp bin/sup-sync-back-maildir "$out"/bin
+    cp bin/sup-sync-back-maildir "$out/bin"
 
     for prog in $out/bin/*; do
       wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" --prefix PATH : "${gnupg}/bin:${which}/bin"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f7841daa05..7f98d23a8e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8891,11 +8891,19 @@ let
     inherit gettext highline iconv locale lockfile rmail_sup
       text trollop unicode xapian_ruby which;
 
+    # See https://github.com/NixOS/nixpkgs/issues/1804 and
+    # https://github.com/NixOS/nixpkgs/issues/2146
+    bundler = pkgs.lib.overrideDerivation pkgs.rubyLibs.bundler (
+      oldAttrs: {
+        dontPatchShebangs = 1;
+      }
+    );
+
     chronic      = chronic_0_9_1;
     gpgme        = ruby_gpgme;
     mime_types   = mime_types_1_25;
     ncursesw_sup = ruby_ncursesw_sup;
-    rake         = rake_10_1_0;
+    rake         = rubyLibs.rake_10_1_0;
   };
 
   synfigstudio = callPackage ../applications/graphics/synfigstudio { };

From 29b1a9d2959cc2c1af679a1d1307ba1c3c8274cf Mon Sep 17 00:00:00 2001
From: letac <stralep@gmail.com>
Date: Mon, 2 Jun 2014 16:30:10 +0200
Subject: [PATCH 010/221] raco pkg install ... is not throwing ssl error
 anymore

---
 pkgs/development/interpreters/racket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 586c0a0acb9..8c6778a6bc6 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cairo, file, pango, glib, gtk
 , which, libtool, makeWrapper, libjpeg, libpng
-, fontconfig, liberation_ttf, sqlite } :
+, fontconfig, liberation_ttf, sqlite, openssl } :
 
 stdenv.mkDerivation rec {
   pname = "racket";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   # Various racket executables do run-time searches for these.
-  ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib";
+  ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib:${openssl}/lib";
 
   buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ];
 

From f412b73f4931943e7a948d7eb1ef7044b3f46e8b Mon Sep 17 00:00:00 2001
From: letac <stralep@gmail.com>
Date: Mon, 2 Jun 2014 19:36:08 +0200
Subject: [PATCH 011/221] Upgrade rocket to 6.0.1

---
 pkgs/development/interpreters/racket/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 8c6778a6bc6..469ef118310 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "5.3.6";
+  version = "6.0.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z";
+    url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
+    sha256 = "e2bc0d4d0fcdfc3327a58c931f203c07a06d4724703f9708ba2e4c8ea0f9694d";
   };
 
   # Various racket executables do run-time searches for these.

From bb82a4d171a58b7194a2bb40cbb4d2dcf0415a94 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Mon, 2 Jun 2014 20:41:35 -0600
Subject: [PATCH 012/221] Added typespeed package.

---
 pkgs/games/typespeed/builder.sh  |  2 ++
 pkgs/games/typespeed/default.nix | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/games/typespeed/builder.sh
 create mode 100644 pkgs/games/typespeed/default.nix

diff --git a/pkgs/games/typespeed/builder.sh b/pkgs/games/typespeed/builder.sh
new file mode 100644
index 00000000000..273fc55c755
--- /dev/null
+++ b/pkgs/games/typespeed/builder.sh
@@ -0,0 +1,2 @@
+source $stdenv/setup
+genericBuild
diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
new file mode 100644
index 00000000000..8acb4de62b4
--- /dev/null
+++ b/pkgs/games/typespeed/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation {
+  name = "typespeed-0.6.5";
+  builder = ./builder.sh;
+  buildInputs = [ ncurses ];
+  configureFlags = "--with-highscoredir=/tmp";
+  src = fetchurl {
+    url = http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz;
+    sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961";
+  };
+}

From 833b4276e8fa553fb921c6c91252b7d98ead6375 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Tue, 3 Jun 2014 21:55:32 -0600
Subject: [PATCH 013/221] Working on adding typespeed.

---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0b35e55d47..6b0988207f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1599,6 +1599,8 @@ let
 
   nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
 
+  nitrogen = callPackage ../tools/X11/nitrogen {};
+
   nlopt = callPackage ../development/libraries/nlopt {};
 
   npapi_sdk = callPackage ../development/libraries/npapi-sdk {};
@@ -10089,6 +10091,8 @@ let
 
   trigger = callPackage ../games/trigger { };
 
+  typespeed = callPackage ../games/typespeed { };
+
   ufoai = callPackage ../games/ufoai { };
 
   ultimatestunts = callPackage ../games/ultimatestunts { };

From 49fe134cb011d66bdfea77579970f23d583911a4 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Tue, 3 Jun 2014 21:56:34 -0600
Subject: [PATCH 014/221] Working on a package for nitrogen.

---
 pkgs/tools/X11/nitrogen/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 pkgs/tools/X11/nitrogen/default.nix

diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
new file mode 100644
index 00000000000..e9e6587179a
--- /dev/null
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "nitrogen-1.5.2";
+
+  src = fetchurl {
+    url = "http://projects.l3ib.org/nitrogen/files/nitrogen-1.5.2.tar.gz";
+    sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
+  };
+
+  meta = {
+    description = "A background browser and setter for X windows";
+    homepage = http://projects.l3ib.org/nitrogen/;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

From 66ddb1c3229e5e85b0596bca6a4d730b3247cd76 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 5 Jun 2014 18:43:26 +0200
Subject: [PATCH 015/221] Add system.replaceRuntimeDependencies to quickly
 replace system dependencies

---
 nixos/modules/system/activation/top-level.nix | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index b739ef693ce..62999dceee3 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -95,7 +95,7 @@ let
   # kernel, systemd units, init scripts, etc.) as well as a script
   # `switch-to-configuration' that activates the configuration and
   # makes it bootable.
-  system = showWarnings (
+  baseSystem = showWarnings (
     if [] == failed then pkgs.stdenv.mkDerivation {
       name = "nixos-${config.system.nixosVersion}";
       preferLocalBuild = true;
@@ -118,6 +118,10 @@ let
       perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
   } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
 
+  # Replace runtime dependencies
+  system = fold ({ oldDependency, newDependency }: drv:
+      pkgs.replaceDependency { inherit oldDependency newDependency drv; }
+    ) baseSystem config.system.replaceRuntimeDependencies;
 
 in
 
@@ -184,6 +188,33 @@ in
       '';
     };
 
+    system.replaceRuntimeDependencies = mkOption {
+      default = [];
+      example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { ... }; }) ]";
+      type = types.listOf (types.submodule (
+        { options, ... }: {
+          options.original = mkOption {
+            type = types.package;
+            description = "The original package to override.";
+          };
+
+          options.replacement = mkOption {
+            type = types.package;
+            description = "The replacement package.";
+          };
+        })
+      );
+      apply = map ({ original, replacement, ... }: {
+        oldDependency = original;
+        newDependency = replacement;
+      });
+      description = ''
+        List of packages to override without doing a full rebuild.
+        The original derivation and replacement derivation must have the same
+        name length, and ideally should have close-to-identical directory layout.
+      '';
+    };
+
   };
 
 

From 905081c0291bc18fb8754fa6a80bf75e1ea7f0c9 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 7 Jun 2014 12:45:33 +0200
Subject: [PATCH 016/221] Add github atom, a hackable text editor for the 21st
 Century

---
 pkgs/applications/editors/atom/default.nix | 68 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 ++
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/editors/atom/default.nix

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
new file mode 100644
index 00000000000..725b4520e69
--- /dev/null
+++ b/pkgs/applications/editors/atom/default.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
+, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
+, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs
+}:
+
+let
+  atomEnv = buildEnv {
+    name = "env-atom";
+    paths = [
+      stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
+      fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
+      xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
+      xlibs.libXcomposite xlibs.libXi xlibs.libXfixes
+    ];
+  };
+in stdenv.mkDerivation rec {
+  name = "atom-${version}";
+  version = "0.99.0";
+
+  src = fetchurl {
+      url = https://github.com/hotice/webupd8/raw/master/atom-linux64-0.99.0~git20140525.tar.xz;
+      sha256 = "55c2415c96e1182ae1517751cbea1db64e9962683b384cfe5e182aec10aebecd";
+      name = "${name}.tar.xz";
+  };
+
+  iconsrc = fetchurl {
+    url = https://raw.githubusercontent.com/atom/atom/master/resources/atom.png;
+    sha256 = "66dc0b432eed7bcd738b7c1b194e539178a83d427c78f103041981f2b840e030";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "atom";
+    exec = "atom";
+    icon = iconsrc;
+    comment = "A hackable text editor for the 21st Century";
+    desktopName = "Atom";
+    genericName = "Text editor";
+    categories = "Development;TextEditor";
+  };
+
+  buildInputs = [ atomEnv makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    ensureDir $out/share/atom
+    ensureDir $out/bin
+    tar -C $out/share/atom -xvf $src
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      $out/share/atom/atom
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node
+    makeWrapper $out/share/atom/atom $out/bin/atom \
+      --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
+
+    # Create a desktop item.
+    mkdir -p "$out/share/applications"
+    cp "${desktopItem}"/share/applications/* "$out/share/applications/"  
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A hackable text editor for the 21st Century";
+    homepage = https://atom.io/;
+    license = [ licenses.mit ];
+    maintainers = [ maintainers.offline ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce0f7593f2c..5a1953446cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7940,6 +7940,10 @@ let
 
   arora = callPackage ../applications/networking/browsers/arora { };
 
+  atom = callPackage ../applications/editors/atom {
+    gconf = gnome.GConf;
+  };
+
   aseprite = callPackage ../applications/editors/aseprite {
     giflib = giflib_4_1;
   };

From 0b62bef7f1174afd1f21aff2643a8c6b9fe0b4c4 Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Sat, 7 Jun 2014 14:58:41 +0200
Subject: [PATCH 017/221] sabnzbd: fixed typo in url and updated to 0.7.17

---
 pkgs/servers/sabnzbd/builder.sh  |  2 +-
 pkgs/servers/sabnzbd/default.nix | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh
index c263500cde4..c0408f89009 100644
--- a/pkgs/servers/sabnzbd/builder.sh
+++ b/pkgs/servers/sabnzbd/builder.sh
@@ -9,7 +9,7 @@ echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd
 chmod +x $out/bin/sabnzbd
 
 for i in $(cd $out/bin && ls); do
-  wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate)" \
+	wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \
   			  --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
 done
 
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index ace96fbed63..09c0de9c74f 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -1,15 +1,16 @@
-{stdenv, fetchurl, python, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}:
+{stdenv, fetchurl, python, pythonPackages, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}:
 
-stdenv.mkDerivation {
-  name = "sabnzbd-0.4.12";
+stdenv.mkDerivation rec {
+  name = "sabnzbd-0.7.17";
   
   src = fetchurl {
-    url = mirro://sourceforge/sabnzbdplus/SABnzbd-0.4.12-src.tar.gz;
-    sha256 = "35ce4172688925ef608fba433ff676357dab7d2abdc1cf83112a1c99682fdd32";
+    url = mirror://sourceforge/sabnzbdplus/SABnzbd-0.7.17-src.tar.gz;
+    sha256 = "02gbh3q3qnbwy4xn1hw4i4fyw4j5nkrqy4ak46mxwqgip9ym20d5";
   };
 
-  buildInputs = [makeWrapper python cheetahTemplate];
+  buildInputs = [makeWrapper python sqlite3 cheetahTemplate];
   inherit stdenv python cheetahTemplate par2cmdline unzip unrar; 
+  inherit (pythonPackages) sqlite3;
 
   builder = ./builder.sh;
   

From c841db2aff47b54f0e7449dcca1f9bd019f6c812 Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Sat, 7 Jun 2014 15:00:19 +0200
Subject: [PATCH 018/221] whitespace

---
 pkgs/servers/sabnzbd/builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh
index c0408f89009..3a5c8adb421 100644
--- a/pkgs/servers/sabnzbd/builder.sh
+++ b/pkgs/servers/sabnzbd/builder.sh
@@ -9,8 +9,8 @@ echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd
 chmod +x $out/bin/sabnzbd
 
 for i in $(cd $out/bin && ls); do
-	wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \
-  			  --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
+  wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \
+                          --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
 done
 
 echo $out

From a91a4e9db20611920728982975282670598bd719 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 7 Jun 2014 21:04:16 +0200
Subject: [PATCH 019/221] yi: improve expression

Disable Haddock docs so that it actually builds (bug in GHC 7.6.3), make
pango optional (OSX people often complain), tell the binary where to
find various libraries needed at runtime (currently it could not find
even its own library).
---
 pkgs/applications/editors/yi/yi.nix | 38 +++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix
index 96e4a06965c..e689bdff4f6 100644
--- a/pkgs/applications/editors/yi/yi.nix
+++ b/pkgs/applications/editors/yi/yi.nix
@@ -5,6 +5,12 @@
 , split, tasty, tastyHunit, tastyQuickcheck, time, transformersBase
 , uniplate, unixCompat, unorderedContainers, utf8String, vty
 , xdgBasedir
+, withPango ? true
+
+# User may need extra dependencies for their configuration file so we
+# want to specify it here to have them available when wrapping the
+# produced binary.
+, extraDepends ? [ ]
 }:
 
 cabal.mkDerivation (self: {
@@ -15,21 +21,43 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [
     binary Cabal cautiousFile concreteTyperep dataDefault derive Diff
-    dlist dyre filepath fingertree glib gtk hashable hint lens mtl
-    pango parsec pointedlist QuickCheck random regexBase regexTdfa safe
+    dlist dyre filepath fingertree hashable hint lens mtl
+    parsec pointedlist QuickCheck random regexBase regexTdfa safe
     split time transformersBase uniplate unixCompat unorderedContainers
     utf8String vty xdgBasedir
-  ];
+  ] ++ (if withPango then [ pango gtk glib ] else [ ]) ++ extraDepends;
   testDepends = [
     filepath HUnit QuickCheck tasty tastyHunit tastyQuickcheck
   ];
   buildTools = [ alex ];
-  configureFlags = "-fpango";
+  configureFlags = if withPango then "-fpango" else "-f-pango";
   doCheck = false;
+
+  # https://ghc.haskell.org/trac/ghc/ticket/9170
+  noHaddock = self.ghc.version == "7.6.3";
+
+  # Allows Yi to find the libraries it needs at runtime.
+  postInstall = ''
+    mv $out/bin/yi $out/bin/.yi-wrapped
+    cat - > $out/bin/yi <<EOF
+    #! ${self.stdenv.shell}
+    # Trailing : is necessary for it to pick up Prelude &c.
+    export GHC_PACKAGE_PATH=$(${self.ghc.GHCGetPackages} ${self.ghc.version} \
+                              | sed 's/-package-db\ //g' \
+                              | sed 's/^\ //g' \
+                              | sed 's/\ /:/g')\
+    :$out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf:
+
+    eval exec $out/bin/.yi-wrapped "\$@"
+    EOF
+    chmod +x $out/bin/yi
+  '';
+
   meta = {
     homepage = "http://haskell.org/haskellwiki/Yi";
     description = "The Haskell-Scriptable Editor";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.fuuzetsu ];
   };
 })

From a0efad6861275258862f093ba890c2a235eb7527 Mon Sep 17 00:00:00 2001
From: Sterling Stein <scubed2@gmail.com>
Date: Sat, 7 Jun 2014 15:08:57 -0700
Subject: [PATCH 020/221] fceux: Add package for a NES emulator.

---
 pkgs/misc/emulators/fceux/default.nix | 34 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/misc/emulators/fceux/default.nix

diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
new file mode 100644
index 00000000000..48860f17aaf
--- /dev/null
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, scons, zlib, SDL, lua5, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "fceux-2.2.2";
+
+  src = fetchurl {
+    url = mirror://sourceforge/fceultra/Source%20Code/2.2.2%20src/fceux-2.2.2.src.tar.gz;
+    sha256 = "1qg5bygla8ka30b7wqvq6dv84xc7pq0jspffh2jz75d1njyi2kc0";
+  };
+
+  buildInputs = [
+    scons zlib SDL lua5 pkgconfig
+  ];
+
+  phases = "unpackPhase buildPhase";
+
+  # sed allows scons to find libraries in nix.
+  # mkdir is a hack to make scons succeed.  It still doesn't
+  # actually put the files in there due to a bug in the SConstruct file.
+  # OPENGL doesn't work because fceux dlopens the library.
+  buildPhase = ''
+    sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct
+    export CC="gcc"
+    export CXX="g++"
+    mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
+    scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false SYSTEM_LUA=false install
+  '';
+
+  meta = {
+    description = "A Nintendo Entertainment System (NES) Emulator";
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://www.fceux.com/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e785945815d..2e157b01d9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10784,6 +10784,8 @@ let
 
   fakenes = callPackage ../misc/emulators/fakenes { };
 
+  fceux = callPackage ../misc/emulators/fceux { };
+
   foldingathome = callPackage ../misc/foldingathome { };
 
   foo2zjs = callPackage ../misc/drivers/foo2zjs {};

From 74bc6252a3dfd5aa1b24d518a1a54e9410e68ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 8 Jun 2014 22:10:53 +0200
Subject: [PATCH 021/221] pypy: 2.2.1 -> 2.3.1

---
 pkgs/development/interpreters/pypy/2.2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix
index 427e06eca13..b2b4157dcf6 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null;
 
 let
 
-  majorVersion = "2.2";
+  majorVersion = "2.3";
   version = "${majorVersion}.1";
   pythonVersion = "2.7";
   libPrefix = "pypy${majorVersion}";
@@ -16,8 +16,8 @@ let
     inherit majorVersion version;
 
     src = fetchurl {
-      url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
-      sha256 = "0pq36n6bap96smpacx8gvgl8yvi9r7ddl4mlpsi5cdj4gqc4a815";
+      url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2";
+      sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z";
     };
 
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]

From ab29b6527f8339068838416c5d75fc8f28933512 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 5 Jun 2014 15:51:43 -0500
Subject: [PATCH 022/221] nixos-iso: Use a simpler disk label

When formatting a nixos usb using my windows machine I noticed that the
disk labeling using periods was not compatible with my linux kernel /
udev recognition. When labeling a volume NIXOS_14.10 under Windows, it would
show up as NIXOS_14_10 on NixOS. This meant that /dev/root would never come
up at boot time, preventing the livecd from starting.

This patch works around this issue by eliminating any special characters
other than underscores. The previous versioning didn't seem all that
useful, especially when consdering there are many different version of
the year.month named iso.
---
 nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index eb7c4026857..4d87c20559d 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -19,7 +19,7 @@ with lib;
   # ISO naming.
   isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
 
-  isoImage.volumeID = substring 0 11 "NIXOS_${config.system.nixosVersion}";
+  isoImage.volumeID = substring 0 11 "NIXOS_ISO";
 
   # Make the installer more likely to succeed in low memory
   # environments.  The kernel's overcommit heustistics bite us

From 4b144de36774b4e740948ec2cbc61677b2fb7456 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 9 Jun 2014 00:53:25 +0400
Subject: [PATCH 023/221] Allow to keep visudo. Useful for checking sudoers
 syntax

---
 pkgs/tools/security/sudo/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 6d82744e1f9..6ed94da10ba 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coreutils, pam, groff }:
+{ stdenv, fetchurl, coreutils, pam, groff, keepVisudo ? false }:
 
 stdenv.mkDerivation rec {
   name = "sudo-1.8.9p4";
@@ -32,8 +32,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    # ‘visudo’ does not make sense on NixOS.
-    rm $out/sbin/visudo $out/share/man/man8/visudo.8
+    # ‘visudo’ does not make sense on NixOS - except for checking sudoers
+    # file syntax
+    rm ${if keepVisudo then "" else "$out/sbin/visudo"} \
+        $out/share/man/man8/visudo.8
 
     rm $out/share/doc/sudo/ChangeLog
   '';

From e68a5b265a96134243a1572f43dfc4ff75dd082b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 9 Jun 2014 00:54:13 +0400
Subject: [PATCH 024/221] Enable checking sudoers syntax. Fixes #2850,
 probably.

---
 nixos/modules/security/sudo.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 6cfeac0d7dc..cce1e785563 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -81,10 +81,13 @@ in
     security.pam.services.sudo = { sshAgentAuth = true; };
 
     environment.etc = singleton
-      { source = pkgs.writeText "sudoers-in" cfg.configFile;
+      { source =
+          pkgs.runCommand "sudoers"
+	  {src = pkgs.writeText "sudoers-in" cfg.configFile; }
           # Make sure that the sudoers file is syntactically valid.
           # (currently disabled - NIXOS-66)
-          #"${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
+          "${pkgs.sudo.override {keepVisudo = true;}}/sbin/visudo -f $src -c &&
+	      cp $src $out";
         target = "sudoers";
         mode = "0440";
       };

From c2fb8b1364b292dc26949c9a577fc893491a1493 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 9 Jun 2014 01:11:03 +0400
Subject: [PATCH 025/221] Addnig a package to copy nix-prefetch-* to bin/.
 Hopefully fixes #1130

---
 .../nix-prefetch-tools/default.nix            | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/build-support/nix-prefetch-tools/default.nix

diff --git a/pkgs/build-support/nix-prefetch-tools/default.nix b/pkgs/build-support/nix-prefetch-tools/default.nix
new file mode 100644
index 00000000000..de47b23925f
--- /dev/null
+++ b/pkgs/build-support/nix-prefetch-tools/default.nix
@@ -0,0 +1,28 @@
+{stdenv}:
+stdenv.mkDerivation {
+  name = "nix-prefetch-tools";
+  src = "";
+  srcRoot=".";
+  prePhases = "undefUnpack";
+  undefUnpack = ''
+    unpackPhase () { :; };
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${../fetchbzr/nix-prefetch-bzr} $out/bin
+    cp ${../fetchcvs/nix-prefetch-cvs} $out/bin
+    cp ${../fetchgit/nix-prefetch-git} $out/bin
+    cp ${../fetchhg/nix-prefetch-hg} $out/bin
+    cp ${../fetchsvn/nix-prefetch-svn} $out/bin
+    chmod a+x $out/bin/*
+  '';
+  meta = {
+    description = ''
+      A package to include all the NixPkgs prefetchers
+    '';
+    maintainers = with stdenv.lib.maintainers; [raskin];
+    platforms = with stdenv.lib.platforms; unix;
+    # Quicker to build than to download, I hope
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30baddfb24c..29a77a9e7fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10868,6 +10868,8 @@ let
 
   nixops = callPackage ../tools/package-management/nixops { };
 
+  nix-prefetch-tools = callPackage ../build-support/nix-prefetch-tools {};
+
   nix-repl = callPackage ../tools/package-management/nix-repl { };
 
   nut = callPackage ../applications/misc/nut { };

From 8bb2313915dcf5dff9cf2fcf5b0acaee6adf30bd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 8 Jun 2014 15:07:54 -0500
Subject: [PATCH 026/221] kernel: Add 3.15

---
 pkgs/os-specific/linux/kernel/linux-3.15.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix              | 14 ++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-3.15.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix
new file mode 100644
index 00000000000..69721292b5b
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.15";
+  extraMeta.branch = "3.15";
+  modDirVersion = "3.15.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "153pn0zjzgi3ls4gy12n900ayskpq0yncn0vra5glh20ps3px4n3";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30baddfb24c..aa9e7c102a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7198,6 +7198,15 @@ let
       ];
   };
 
+  linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@@ -7337,8 +7346,8 @@ let
   linuxPackages = linuxPackages_3_12;
 
   # Update this when adding the newest kernel major version!
-  linux_latest = pkgs.linux_3_14;
-  linuxPackages_latest = pkgs.linuxPackages_3_14;
+  linux_latest = pkgs.linux_3_15;
+  linuxPackages_latest = pkgs.linuxPackages_3_15;
 
   # Build the kernel modules for the some of the kernels.
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
@@ -7350,6 +7359,7 @@ let
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
   linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
   linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
+  linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
 
   # grsecurity flavors

From 5a8457d25e5093e0a145db11349272fcdc1cab60 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Sun, 8 Jun 2014 17:37:28 -0600
Subject: [PATCH 027/221] Oops, got nitrogen and typespeed branches mixed up.

---
 pkgs/tools/X11/nitrogen/default.nix | 16 ----------------
 pkgs/top-level/all-packages.nix     |  2 --
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/tools/X11/nitrogen/default.nix

diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
deleted file mode 100644
index e9e6587179a..00000000000
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "nitrogen-1.5.2";
-
-  src = fetchurl {
-    url = "http://projects.l3ib.org/nitrogen/files/nitrogen-1.5.2.tar.gz";
-    sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
-  };
-
-  meta = {
-    description = "A background browser and setter for X windows";
-    homepage = http://projects.l3ib.org/nitrogen/;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ac66ede5b6..20864b95628 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1609,8 +1609,6 @@ let
 
   nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
 
-  nitrogen = callPackage ../tools/X11/nitrogen {};
-
   nlopt = callPackage ../development/libraries/nlopt {};
 
   npapi_sdk = callPackage ../development/libraries/npapi-sdk {};

From 150f6f9ee6734dc9534d022766670b0ee046d952 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Sun, 8 Jun 2014 17:40:16 -0600
Subject: [PATCH 028/221] Removed unneeded builder.sh.

---
 pkgs/games/typespeed/builder.sh  | 2 --
 pkgs/games/typespeed/default.nix | 1 -
 2 files changed, 3 deletions(-)
 delete mode 100644 pkgs/games/typespeed/builder.sh

diff --git a/pkgs/games/typespeed/builder.sh b/pkgs/games/typespeed/builder.sh
deleted file mode 100644
index 273fc55c755..00000000000
--- a/pkgs/games/typespeed/builder.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-source $stdenv/setup
-genericBuild
diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
index 8acb4de62b4..edb91e164fe 100644
--- a/pkgs/games/typespeed/default.nix
+++ b/pkgs/games/typespeed/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation {
   name = "typespeed-0.6.5";
-  builder = ./builder.sh;
   buildInputs = [ ncurses ];
   configureFlags = "--with-highscoredir=/tmp";
   src = fetchurl {

From 666478789fb31c342fa34715fdb24f3ac4740dcb Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tom@copilotlabs.com>
Date: Sun, 8 Jun 2014 23:19:52 -0400
Subject: [PATCH 029/221] hdevtools compiles

---
 pkgs/development/tools/haskell/hdevtools/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/hdevtools/default.nix b/pkgs/development/tools/haskell/hdevtools/default.nix
index da5eb778803..9565478d11b 100644
--- a/pkgs/development/tools/haskell/hdevtools/default.nix
+++ b/pkgs/development/tools/haskell/hdevtools/default.nix
@@ -1,4 +1,4 @@
-{ cabal, cmdargs, ghcPaths, network, syb, time }:
+{ cabal, cmdargs, ghcPaths, network, syb, time, fetchpatch }:
 
 cabal.mkDerivation (self: {
   pname = "hdevtools";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7";
   isLibrary = false;
   isExecutable = true;
+  patches = [ (fetchpatch { url = "https://github.com/bitc/hdevtools/pull/28.patch"; sha256 = "1rlv5zskg4ns9ba791x72gycxrr52lhy8x164q38gpq600gh5n40"; }) ];
   buildDepends = [ cmdargs ghcPaths network syb time ];
   meta = {
     homepage = "https://github.com/bitc/hdevtools/";

From cd4041b9059e85c073dc7854762044f4a7a1b0b4 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tom@copilotlabs.com>
Date: Sun, 8 Jun 2014 23:44:11 -0400
Subject: [PATCH 030/221] Add MFlow and dependencies

---
 .../libraries/haskell/MFlow/default.nix       | 23 +++++++++++++++++++
 .../haskell/RefSerialize/default.nix          | 14 +++++++++++
 .../libraries/haskell/TCache/default.nix      | 14 +++++++++++
 .../libraries/haskell/Workflow/default.nix    | 19 +++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  8 +++++++
 5 files changed, 78 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/MFlow/default.nix
 create mode 100644 pkgs/development/libraries/haskell/RefSerialize/default.nix
 create mode 100644 pkgs/development/libraries/haskell/TCache/default.nix
 create mode 100644 pkgs/development/libraries/haskell/Workflow/default.nix

diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix
new file mode 100644
index 00000000000..def50e8e7db
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MFlow/default.nix
@@ -0,0 +1,23 @@
+{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession
+, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes, monadloc
+, mtl, parsec, random, RefSerialize, stm, TCache, text, time
+, transformers, utf8String, vector, wai, warp, warpTls, Workflow
+}:
+
+cabal.mkDerivation (self: {
+  pname = "MFlow";
+  version = "0.4.5.4";
+  sha256 = "1ih9ni14xmqvcfvayjkggmpmw3s9yzp17gf4xzygldmjcs35j4n3";
+  buildDepends = [
+    blazeHtml blazeMarkup caseInsensitive clientsession conduit
+    conduitExtra cpphs extensibleExceptions httpTypes monadloc mtl parsec
+    random RefSerialize stm TCache text time transformers utf8String
+    vector wai warp warpTls Workflow
+  ];
+  meta = {
+    description = "stateful, RESTful web framework";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.tomberek ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/RefSerialize/default.nix b/pkgs/development/libraries/haskell/RefSerialize/default.nix
new file mode 100644
index 00000000000..a16ce1332ed
--- /dev/null
+++ b/pkgs/development/libraries/haskell/RefSerialize/default.nix
@@ -0,0 +1,14 @@
+{ cabal, binary, hashtables, stringsearch }:
+
+cabal.mkDerivation (self: {
+  pname = "RefSerialize";
+  version = "0.3.1.3";
+  sha256 = "0qrca0jismpvjy7i4xx19ljrj72gqcmwqg47a51ykncsvci0fjrm";
+  buildDepends = [ binary hashtables stringsearch ];
+  meta = {
+    description = "Write to and read from ByteStrings maintaining internal memory references";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.tomberek ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/TCache/default.nix b/pkgs/development/libraries/haskell/TCache/default.nix
new file mode 100644
index 00000000000..cec80a16d30
--- /dev/null
+++ b/pkgs/development/libraries/haskell/TCache/default.nix
@@ -0,0 +1,14 @@
+{ cabal, hashtables, mtl, RefSerialize, stm, text }:
+
+cabal.mkDerivation (self: {
+  pname = "TCache";
+  version = "0.12.0";
+  sha256 = "0marslz5jg66r3i2d0yjjrj11bpywpadcxs5k4j6782iczxybd7s";
+  buildDepends = [ hashtables mtl RefSerialize stm text ];
+  meta = {
+    description = "A Transactional cache with user-defined persistence";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.tomberek ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/Workflow/default.nix b/pkgs/development/libraries/haskell/Workflow/default.nix
new file mode 100644
index 00000000000..20a30438681
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Workflow/default.nix
@@ -0,0 +1,19 @@
+{ cabal, binary, exceptions, extensibleExceptions, mtl
+, RefSerialize, stm, TCache, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Workflow";
+  version = "0.8.1";
+  sha256 = "0z23g68gcbbn43i78cql4is9js3m4z16rm2x8s57f73n0hx7f00l";
+  buildDepends = [
+    binary exceptions extensibleExceptions mtl RefSerialize stm TCache
+    vector
+  ];
+  meta = {
+    description = "Workflow patterns over a monad for thread state logging & recovery";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.tomberek ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index db364b9a58d..9765dc29c3b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1399,6 +1399,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};
 
+  MFlow = callPackage ../development/libraries/haskell/MFlow {};
+
   midi = callPackage ../development/libraries/haskell/midi {};
 
   mime = callPackage ../development/libraries/haskell/mime {};
@@ -1837,6 +1839,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   reflection = callPackage ../development/libraries/haskell/reflection {};
 
+  RefSerialize = callPackage ../development/libraries/haskell/RefSerialize {};
+
   regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {};
 
   regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {};
@@ -2157,6 +2161,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   tastyTh = callPackage ../development/libraries/haskell/tasty-th {};
 
+  TCache = callPackage ../development/libraries/haskell/TCache {};
+
   templateDefault = callPackage ../development/libraries/haskell/template-default {};
 
   temporary = callPackage ../development/libraries/haskell/temporary {};
@@ -2443,6 +2449,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   word8 = callPackage ../development/libraries/haskell/word8 {};
 
+  Workflow = callPackage ../development/libraries/haskell/Workflow {};
+
   wreq = callPackage ../development/libraries/haskell/wreq {};
 
   wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};

From 54ba3c7ff4855a1e82dc4cede94c9fc5979d8f88 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Sun, 8 Jun 2014 22:44:06 -0600
Subject: [PATCH 031/221] Fixed problem with worddir and ruledir path.

---
 pkgs/games/typespeed/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
index edb91e164fe..1282dec2a8f 100644
--- a/pkgs/games/typespeed/default.nix
+++ b/pkgs/games/typespeed/default.nix
@@ -3,9 +3,12 @@
 stdenv.mkDerivation {
   name = "typespeed-0.6.5";
   buildInputs = [ ncurses ];
-  configureFlags = "--with-highscoredir=/tmp";
   src = fetchurl {
     url = http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz;
     sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961";
   };
+
+  patches = [ ./typespeed-config-in-home.patch ];
+
+  configureFlags = "--datadir=\${out}/share/";
 }

From 9d04c9021b0b8da15e5a77981721c43886cc9438 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Sun, 8 Jun 2014 22:46:02 -0600
Subject: [PATCH 032/221] Oops, forgot to add patch.

---
 .../typespeed/typespeed-config-in-home.patch  | 159 ++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 pkgs/games/typespeed/typespeed-config-in-home.patch

diff --git a/pkgs/games/typespeed/typespeed-config-in-home.patch b/pkgs/games/typespeed/typespeed-config-in-home.patch
new file mode 100644
index 00000000000..52d9338775b
--- /dev/null
+++ b/pkgs/games/typespeed/typespeed-config-in-home.patch
@@ -0,0 +1,159 @@
+diff --git a/src/file.c b/src/file.c
+index d1d1982..dc679a2 100644
+--- a/src/file.c
++++ b/src/file.c
+@@ -125,6 +125,8 @@ int			 hcompar(const void *, const void *);
+ int			 loadscores(char *);
+ static int		 parseline(char *, char **, char **);
+ void			 readconfig(void);
++void			 mkconfig(char *filename);
++void			 mkscore(char *filename);
+ static void		 readfile(char *, int);
+ static void		 setoptions(char *, char *, int);
+ 
+@@ -1071,7 +1073,10 @@ parseline(char *line, char **option, char **value)
+ 	 * let's drop it completely.
+ 	 */
+ 	if ((p = strchr(line, '\n')) == NULL)
++	{
++		printf("yes, we died here\n");
+ 		return 1;
++	}
+ 	*p = '\0';
+ 	if ((p = strchr(line, '\r')) != NULL)
+ 		*p = '\0';
+@@ -1125,7 +1130,7 @@ void
+ readconfig(void)
+ {
+ 	char *envhome;
+-	char userhigh[MAXPATHLEN], userconf[MAXPATHLEN];
++	char userhigh[MAXPATHLEN], userconf[MAXPATHLEN], confdir[MAXPATHLEN];
+ 	struct stat sb;
+ 
+ 	if (xsnprintf(ruledir, sizeof(ruledir), "%s", RULEDIR)) {
+@@ -1140,18 +1145,33 @@ readconfig(void)
+ 	readfile(CONFIGFILE, 1);
+ 
+ 	if ((envhome = getenv("HOME")) == NULL)
+-		return;
++		xerr(1, "readconfig: environment variable HOME not set");
+ 
+ 	if (xsnprintf(userconf, sizeof(userconf), "%s/.typespeed/config",
+-	    envhome))
+-		return;
++				envhome))
++		xerr(1, "readconfig: string error");
++	if (xsnprintf(userhigh, sizeof(userhigh), "%s/.typespeed/score",
++				envhome))
++		xerr(1, "readconfig: string error");
+ 
+ 	if (stat(userconf, &sb) || (sb.st_mode & S_IFMT) != S_IFREG)
+-		return;
+-
+-	if (xsnprintf(userhigh, sizeof(userhigh), "%s/.typespeed/score",
+-	    envhome))
+-		return;
++	{
++		if (xsnprintf(confdir, sizeof(confdir), "%s/.typespeed",
++					envhome))
++			xerr(1, "readconfig: string error");
++		if(stat(confdir, &sb) == -1)
++			if(mkdir(confdir, S_IRWXU | S_IRWXG | S_IRWXO))
++				xerr(1, "readconfig: could not create config directory %s",
++					confdir);
++		/* create the user configuration with default values */
++		mkconfig(userconf);
++	}
++  /* check for the high score file */
++	if (stat(userhigh, &sb) || (sb.st_mode & S_IFMT) != S_IFREG)
++	{
++		/* create a blank high score file */
++		mkscore(userhigh);
++	}
+ 
+ 	/*
+ 	 * Open a user writable high score.
+@@ -1159,14 +1179,48 @@ readconfig(void)
+ 	 * file. Protect system-wide high score file with group
+ 	 * write permissions: privileged gid already dropped.
+ 	 */
+-	if (close(hfd) == -1)
+-		xerr(1, "readconfig: close");
+-	if ((hfd = open(userhigh, O_RDWR, 0)) == -1)
++	if ((hfd = open(userhigh, O_RDWR)) == -1)
+ 		xerr(1, "readconfig: open: %s", userhigh);
+ 
+ 	readfile(userconf, 1);
+ }
+ 
++#define DEFAULT_CONFIG	"cheat = no\n" \
++			"highorder = score cps tcps\n" \
++			"ruledir = " RULEDIR "\n" \
++			"worddir = " WORDDIR "\n"
++
++/*
++ * Create the user configuration, with default values, at the given path.
++ */
++void
++mkconfig(char *filename)
++{
++	int cfd;
++
++	if((cfd = open(filename, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO)) == -1)
++		xerr(1, "mkconfig: open: %s", filename);
++	if(write(cfd, DEFAULT_CONFIG, sizeof(DEFAULT_CONFIG)/sizeof(DEFAULT_CONFIG[0]) - 1) == -1)
++		xerr(1, "mkconfig: write: %s", filename);
++	if(close(cfd) == -1)
++		xerr(1, "mkconfig: close: %s", filename);
++}
++
++/*
++ * Create the user high score file, which is just a blank file.
++ */
++void
++mkscore(char *filename)
++{
++	int sfd;
++	if((sfd = open(filename, O_WRONLY | O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO)) == -1)
++		xerr(1, "mkscore: open: %s", filename);
++	if(write(sfd, "", 0) == -1)
++		xerr(1, "mkconfig: write: %s", filename);
++	if(close(sfd) == -1)
++		xerr(1, "mkconfig: close: %s", filename);
++}
++
+ /*
+  * Function used to open configuration and game rule files and to
+  * set options with function setoptions.
+diff --git a/src/typespeed.c b/src/typespeed.c
+index 7ac5ee2..77e9acb 100644
+--- a/src/typespeed.c
++++ b/src/typespeed.c
+@@ -319,8 +319,13 @@ main(int argc, char **argv)
+ 		progname++;
+ 
+ 	/* just open high score file while being setgid games */
+-	if ((hfd = open(HIGHFILE, O_RDWR, 0)) == -1)
+-		xerr(1, "main: open: %s", HIGHFILE);
++  /*
++   * For NixOS, a global high score file doesn't make sense, so we just comment
++   * this out. A high score file in the user's home directory will be opened
++   * later in readconfig().
++   */
++/*	if ((hfd = open(HIGHFILE, O_RDWR, 0)) == -1)
++		xerr(1, "main: open: %s", HIGHFILE);  */
+ 
+ #ifndef WIN32
+ 	/* drop privileges */
+@@ -348,9 +353,9 @@ main(int argc, char **argv)
+ #endif /* WIN32 */
+ 
+ 	/* check file descriptors for consistency */
+-	if (hfd == STDIN_FILENO || hfd == STDOUT_FILENO ||
++/*	if (hfd == STDIN_FILENO || hfd == STDOUT_FILENO ||
+ 	    hfd == STDERR_FILENO)
+-		exit(1);
++		exit(1);  */
+ 	if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO) ||
+ 	    !isatty(STDERR_FILENO))
+ 		xerrx(1, "not fully connected to a terminal");

From 0806afad5a8466653cb8fb9b304d9faf5d143f91 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Sun, 8 Jun 2014 23:19:06 -0600
Subject: [PATCH 033/221] Added metadata for typespeed.

---
 pkgs/games/typespeed/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
index 1282dec2a8f..57fd8f7dfc5 100644
--- a/pkgs/games/typespeed/default.nix
+++ b/pkgs/games/typespeed/default.nix
@@ -11,4 +11,10 @@ stdenv.mkDerivation {
   patches = [ ./typespeed-config-in-home.patch ];
 
   configureFlags = "--datadir=\${out}/share/";
+
+  meta = {
+    description = "A curses based typing game.";
+    homepage = http://typespeed.sourceforge.net/;
+    license = "GLPv2";
+  };
 }

From b690f36d6f92c47303b80f9c887ac79923be4f1c Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Sun, 8 Jun 2014 23:43:28 -0600
Subject: [PATCH 034/221] Oops, removed a printf debug line we don't need.

---
 pkgs/games/typespeed/default.nix              |  2 +-
 .../typespeed/typespeed-config-in-home.patch  | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
index 57fd8f7dfc5..24ace16adc7 100644
--- a/pkgs/games/typespeed/default.nix
+++ b/pkgs/games/typespeed/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A curses based typing game.";
     homepage = http://typespeed.sourceforge.net/;
-    license = "GLPv2";
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/games/typespeed/typespeed-config-in-home.patch b/pkgs/games/typespeed/typespeed-config-in-home.patch
index 52d9338775b..fe313a4392e 100644
--- a/pkgs/games/typespeed/typespeed-config-in-home.patch
+++ b/pkgs/games/typespeed/typespeed-config-in-home.patch
@@ -1,5 +1,5 @@
 diff --git a/src/file.c b/src/file.c
-index d1d1982..dc679a2 100644
+index d1d1982..1655f6f 100644
 --- a/src/file.c
 +++ b/src/file.c
 @@ -125,6 +125,8 @@ int			 hcompar(const void *, const void *);
@@ -11,18 +11,7 @@ index d1d1982..dc679a2 100644
  static void		 readfile(char *, int);
  static void		 setoptions(char *, char *, int);
  
-@@ -1071,7 +1073,10 @@ parseline(char *line, char **option, char **value)
- 	 * let's drop it completely.
- 	 */
- 	if ((p = strchr(line, '\n')) == NULL)
-+	{
-+		printf("yes, we died here\n");
- 		return 1;
-+	}
- 	*p = '\0';
- 	if ((p = strchr(line, '\r')) != NULL)
- 		*p = '\0';
-@@ -1125,7 +1130,7 @@ void
+@@ -1125,7 +1127,7 @@ void
  readconfig(void)
  {
  	char *envhome;
@@ -31,7 +20,7 @@ index d1d1982..dc679a2 100644
  	struct stat sb;
  
  	if (xsnprintf(ruledir, sizeof(ruledir), "%s", RULEDIR)) {
-@@ -1140,18 +1145,33 @@ readconfig(void)
+@@ -1140,18 +1142,33 @@ readconfig(void)
  	readfile(CONFIGFILE, 1);
  
  	if ((envhome = getenv("HOME")) == NULL)
@@ -73,7 +62,7 @@ index d1d1982..dc679a2 100644
  
  	/*
  	 * Open a user writable high score.
-@@ -1159,14 +1179,48 @@ readconfig(void)
+@@ -1159,14 +1176,48 @@ readconfig(void)
  	 * file. Protect system-wide high score file with group
  	 * write permissions: privileged gid already dropped.
  	 */

From 8e2556bd7fcc77583ded78e8e2d4db65cbf9f414 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Sun, 8 Jun 2014 23:47:59 -0600
Subject: [PATCH 035/221] Added auntie as a maintainer, and set license
 properly.

---
 lib/maintainers.nix              | 1 +
 pkgs/games/typespeed/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8a98cb14651..a0aae2f3b59 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -17,6 +17,7 @@
   arobyn = "Alexei Robyn <shados@shados.net>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
+  auntie = "Jonathan Glines <auntieNeo@gmail.com>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";
   bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
   berdario = "Dario Bertini <berdario@gmail.com>";
diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix
index 24ace16adc7..169c74621d7 100644
--- a/pkgs/games/typespeed/default.nix
+++ b/pkgs/games/typespeed/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A curses based typing game.";
     homepage = http://typespeed.sourceforge.net/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.auntie ];
   };
 }

From 8155e5d11916e56d5fcaa88534cb6461a9c1f042 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 8 Jun 2014 07:49:27 -0500
Subject: [PATCH 036/221] compcert: fix build by adding menhir dependency

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/compcert/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index f5e66b8ac10..859c55662dc 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coq, ocaml, gcc }:
+{ stdenv, fetchurl, coq, ocaml, ocamlPackages, gcc }:
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8";
   };
 
-  buildInputs = [ coq ocaml ];
+  buildInputs = [ coq ocaml ocamlPackages.menhir ];
 
   enableParallelBuilding = true;
   configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ ia32-linux";

From 3f6197cafe32cad4f2254be0197ceda5a841f387 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 9 Jun 2014 01:25:20 -0500
Subject: [PATCH 037/221] arcanist: Fix this because how did it work

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/misc/arcanist/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 02fe572edab..a8e779347d8 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -22,16 +22,16 @@ stdenv.mkDerivation rec {
   unpackPhase = "true";
   buildPhase = ''
     ORIG=`pwd`
-    chmod +w -R ${libphutil}
-    cd ${libphutil}/support/xhpast
-    ls
+    cp -R ${libphutil} libphutil
+    cp -R ${arcanist} arcanist
+    cd libphutil/support/xhpast
     make clean all install
     cd $ORIG
   '';
   installPhase = ''
     mkdir -p $out/bin $out/libexec
-    cp -R ${libphutil} $out/libexec/libphutil
-    cp -R ${arcanist}  $out/libexec/arcanist
+    cp -R libphutil $out/libexec/libphutil
+    cp -R arcanist  $out/libexec/arcanist
 
     ln -s $out/libexec/arcanist/bin/arc $out/bin
     wrapProgram $out/bin/arc \

From 678def6d30cebdc93fafb3f086c30a1877f0baee Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 9 Jun 2014 01:29:53 -0500
Subject: [PATCH 038/221] Fix again, thx to @CodeBlock

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/misc/arcanist/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index a8e779347d8..e55faaa1e63 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     ORIG=`pwd`
     cp -R ${libphutil} libphutil
     cp -R ${arcanist} arcanist
+    chmod +w -R libphutil arcanist
     cd libphutil/support/xhpast
     make clean all install
     cd $ORIG

From 8c144969879ef1e1560331fc20c8d9c78fd5426a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:18 +0200
Subject: [PATCH 039/221] haskell-git-annex: update to version 5.20140529

---
 .../git-and-tools/git-annex/default.nix       | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 191b24304bf..24f993b8812 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -1,37 +1,37 @@
 { cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
 , caseInsensitive, clientsession, cryptoApi, cryptohash, curl
 , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
-, extensibleExceptions, fdoNotify, feed, filepath, git, gnupg1
-, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
+, exceptions, extensibleExceptions, fdoNotify, feed, filepath, git
+, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
 , httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
-, MonadCatchIOTransformers, monadControl, mtl, network
-, networkConduit, networkInfo, networkMulticast
-, networkProtocolXmpp, openssh, optparseApplicative, perl
-, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem
-, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
-, tastyRerun, text, time, transformers, unixCompat, utf8String
-, uuid, wai, waiLogger, warp, warpTls, which, xmlTypes, yesod
-, yesodCore, yesodDefault, yesodForm, yesodStatic
+, monadControl, mtl, network, networkConduit, networkInfo
+, networkMulticast, networkProtocolXmpp, openssh
+, optparseApplicative, perl, QuickCheck, random, regexTdfa, rsync
+, SafeSemaphore, securemem, SHA, shakespeare, stm, tasty
+, tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers
+, unixCompat, utf8String, uuid, wai, waiLogger, warp, warpTls
+, which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
+, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140517";
-  sha256 = "150xf6664rfdljswc270m2pqvia4sywph4rrrbky6izy6a0vq680";
+  version = "5.20140529";
+  sha256 = "18fb0gb38wcdbdz2rlg5vn99gfi1c8hflgcpz96lx4rg2pl8jpf8";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter byteable caseInsensitive
     clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
-    dlist dns editDistance extensibleExceptions fdoNotify feed filepath
-    gnutls hamlet hinotify hS3 hslogger HTTP httpClient httpConduit
-    httpTypes IfElse json liftedBase MissingH MonadCatchIOTransformers
-    monadControl mtl network networkConduit networkInfo
-    networkMulticast networkProtocolXmpp optparseApplicative QuickCheck
-    random regexTdfa SafeSemaphore securemem SHA shakespeare stm tasty
-    tastyHunit tastyQuickcheck tastyRerun text time transformers
-    unixCompat utf8String uuid wai waiLogger warp warpTls xmlTypes
-    yesod yesodCore yesodDefault yesodForm yesodStatic
+    dlist dns editDistance exceptions extensibleExceptions fdoNotify
+    feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient
+    httpConduit httpTypes IfElse json liftedBase MissingH monadControl
+    mtl network networkConduit networkInfo networkMulticast
+    networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
+    SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit
+    tastyQuickcheck tastyRerun text time transformers unixCompat
+    utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore
+    yesodDefault yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3

From 9528d4caf3b28163c80f736e5d0740abf0f19a82 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:25 +0200
Subject: [PATCH 040/221] haskell-SVGFonts: update to version 1.4.0.3

---
 pkgs/development/libraries/haskell/SVGFonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix
index 509efd61968..e617190b761 100644
--- a/pkgs/development/libraries/haskell/SVGFonts/default.nix
+++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SVGFonts";
-  version = "1.4.0.2";
-  sha256 = "1a1f0jdz36zpj1196zv5qwg35rm4ra0b4z5spr1m3696292nj8ph";
+  version = "1.4.0.3";
+  sha256 = "0jkjcf27xqjzv9lny7j181kcma26wngrq3vzw2sp2hwkdcjryyin";
   buildDepends = [
     attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec
     split text tuple vector vectorSpace xml

From 3bae0ae4f65e087c3f47370cc56c8104c39696e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:27 +0200
Subject: [PATCH 041/221] haskell-Shellac: update to version 0.9.5.2

---
 pkgs/development/libraries/haskell/Shellac/Shellac.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
index d896eab923d..e6f3caac45b 100644
--- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix
+++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "Shellac";
-  version = "0.9.5.1";
-  sha256 = "19fpbh5ijy9xc3rhl9qwyan8jfnz9nsqvnsjxb7kkb7l2bpz4qfp";
+  version = "0.9.5.2";
+  sha256 = "1js9la0hziqsmb56q9kzfycda2sw3xm4kv2y5q2h3zlw5gzc5xli";
   buildDepends = [ mtl ];
   meta = {
-    homepage = "http://www.cs.princeton.edu/~rdockins/shellac/home/";
+    homepage = "http://rwd.rdockins.name/shellac/home/";
     description = "A framework for creating shell envinronments";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From cd5b26ab9d085d00b2d4227a69adc488fe2b320b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:29 +0200
Subject: [PATCH 042/221] haskell-active: update to version 0.1.0.16

---
 pkgs/development/libraries/haskell/active/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index b9488bbcf61..01441a39ce7 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "active";
-  version = "0.1.0.14";
-  sha256 = "0ibigflx3krmf7gw0zqmqx73rw1p62cwjyl26rxbj5vzbl3bdb4g";
+  version = "0.1.0.16";
+  sha256 = "0x4z9n0avk9pr9v64vfmbbpxx2n6cl32d8sw8y2w61345s2z628k";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace

From ba7e1f1b6eaf3cc3298869939f16dd9c02795f0b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:32 +0200
Subject: [PATCH 043/221] haskell-attoparsec-enumerator: update to version
 0.3.3

---
 .../libraries/haskell/attoparsec-enumerator/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
index cf40601d044..98f8f426ba3 100644
--- a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-enumerator";
-  version = "0.3.2";
-  sha256 = "1jrrdhzqjfb78bhnjpy0j0qywqd2j67an41pcn8y6331nzmzsrl8";
+  version = "0.3.3";
+  sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w";
   buildDepends = [ attoparsec enumerator text ];
   meta = {
     homepage = "https://john-millikin.com/software/attoparsec-enumerator/";

From 5cdcc65be16297424c6c65e3ec9345466f6c18a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:34 +0200
Subject: [PATCH 044/221] haskell-cassava: update to version 0.4.1.0

---
 pkgs/development/libraries/haskell/cassava/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix
index 604cd9b3ed6..745969058f0 100644
--- a/pkgs/development/libraries/haskell/cassava/default.nix
+++ b/pkgs/development/libraries/haskell/cassava/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cassava";
-  version = "0.4.0.0";
-  sha256 = "0w3npv3403n9rl9nmn8ngp04js28bvsb5c4js17sy1gqgsakqdrl";
+  version = "0.4.1.0";
+  sha256 = "0whky3mavmprr8cgnzlg2ich99w09bdlks8rg6z9m1x86q66ivw2";
   buildDepends = [
     attoparsec blazeBuilder deepseq text unorderedContainers vector
   ];

From eb33887bda68947b546f4555a9c7c013a61d3bcb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:36 +0200
Subject: [PATCH 045/221] haskell-concurrent-extra: update to version 0.7.0.8

---
 .../libraries/haskell/concurrent-extra/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
index 5fe73a33964..29520fddd0c 100644
--- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix
+++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
@@ -1,15 +1,15 @@
-{ cabal, baseUnicodeSymbols, HUnit, stm, testFramework
-, testFrameworkHunit, unboundedDelays
+{ cabal, async, baseUnicodeSymbols, HUnit, random, stm
+, testFramework, testFrameworkHunit, unboundedDelays
 }:
 
 cabal.mkDerivation (self: {
   pname = "concurrent-extra";
-  version = "0.7.0.7";
-  sha256 = "1736y8am24x29qq1016f2dvb6adavl1h46bsjfwnkw40a9djd5cr";
+  version = "0.7.0.8";
+  sha256 = "0q6n7wlakvnvfrjr3zmxbn9i0dxq96071j565vffp0r5abxkn83q";
   buildDepends = [ baseUnicodeSymbols stm unboundedDelays ];
   testDepends = [
-    baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit
-    unboundedDelays
+    async baseUnicodeSymbols HUnit random stm testFramework
+    testFrameworkHunit unboundedDelays
   ];
   meta = {
     homepage = "https://github.com/basvandijk/concurrent-extra";

From 82a37144a91b140ba0c82e01f6a2b7f13f59c252 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:38 +0200
Subject: [PATCH 046/221] haskell-conduit-extra: update to version 1.1.0.4

---
 pkgs/development/libraries/haskell/conduit-extra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index eb07ffc480f..084f9f38ca2 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.0.3";
-  sha256 = "117lirx05pgpmys6dlknkcni3znrvqyhmj6djqxnqbjcn3ynhqdk";
+  version = "1.1.0.4";
+  sha256 = "0l1cv65p8nvvb9qgcj87a682wh9xim0rbk2xzhdkd0r123csb118";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet streamingCommons text transformers

From 53e2945e3c40ec56309369337fab7c33b424186e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:40 +0200
Subject: [PATCH 047/221] haskell-conduit: update to version 1.1.4

---
 pkgs/development/libraries/haskell/conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 94423cc41ef..48422e602b2 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.3";
-  sha256 = "14fc7v00zmrcwba2rdnh7c6sx0rv5mmbwlgq5p8p7nlald1dcr6z";
+  version = "1.1.4";
+  sha256 = "1fw55rmmhznkpbblc7gqy463lza7fi9yr0n27g38afdfql8mz5mm";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void

From b10b94b53419ea53d28f90d702502330d2774b4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:42 +0200
Subject: [PATCH 048/221] haskell-cryptohash: update to version 0.11.5

---
 .../libraries/haskell/cryptohash/default.nix          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index cefa8fbbdf8..894d317336d 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -1,15 +1,14 @@
-{ cabal, byteable, HUnit, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
+{ cabal, byteable, HUnit, QuickCheck, tasty, tastyHunit
+, tastyQuickcheck
 }:
 
 cabal.mkDerivation (self: {
   pname = "cryptohash";
-  version = "0.11.4";
-  sha256 = "1laakkc1xzp2bmai0sfi86784wharqbyanlp1d1f1q6nj318by3y";
+  version = "0.11.5";
+  sha256 = "0vxnwnjch2r9d54q5f5bfz60npjc7s7x6a5233md7fa756822b9d";
   buildDepends = [ byteable ];
   testDepends = [
-    byteable HUnit QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
+    byteable HUnit QuickCheck tasty tastyHunit tastyQuickcheck
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cryptohash";

From 54a78f4e211dfc8bdb8bef7ef4db47369a77efa7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:44 +0200
Subject: [PATCH 049/221] haskell-diagrams-cairo: update to version 1.2

---
 pkgs/development/libraries/haskell/diagrams/cairo.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index bd09b67196b..33e27cd9ff8 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -1,16 +1,16 @@
 { cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib
 , filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative
-, split, statestack, time, vector
+, pango, split, statestack, time, transformers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.1.0.2";
-  sha256 = "0y36cx89rlbmj470a6g11wlzkwzznjkjmkcpm7dzbxvfxw4pp70z";
+  version = "1.2";
+  sha256 = "0vzjp1i5hk971r7f55gpdl0jibrjg9j4ny7p408kb8zl2ynlxv6l";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
-    hashable JuicyPixels lens mtl optparseApplicative split statestack
-    time vector
+    hashable JuicyPixels lens mtl optparseApplicative pango split
+    statestack time transformers vector
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams";

From c4e8694a24dae425538f8ab382cb29407fa2b7f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:47 +0200
Subject: [PATCH 050/221] haskell-diagrams-contrib: update to version 1.1.2

---
 pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 4cbe8b7c193..a433284ef7a 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "1.1.1.5";
-  sha256 = "1165qq5pzj3vr8f6545hpa5ri8jy43r1ydmimzy7xg9iynjgxass";
+  version = "1.1.2";
+  sha256 = "1gljmzlhc6vck5lcsq9lhf2k4dik5pp62k85y2kkxgq0mxnmqf0g";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec

From 951296da65d3fe32faf3539c26047f4790dae9cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:49 +0200
Subject: [PATCH 051/221] haskell-diagrams-core: update to version 1.2

---
 pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index 8c6a87b7e05..dbbc3c030b5 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "1.1.0.3";
-  sha256 = "0kl4bc5mvly227rzalzy9q6ki321drcdfsjqriv3ac70qmcfqyma";
+  version = "1.2";
+  sha256 = "0qlkick9ppwaignh179w65gmiq5as1nsi1ymficdw1p0jldi5f51";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints

From cc3dc36517a6571977246e234171ba3d59affa52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:51 +0200
Subject: [PATCH 052/221] haskell-diagrams: update to version 1.2

---
 pkgs/development/libraries/haskell/diagrams/diagrams.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 6159270379e..5f94e2922a1 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "1.1.0.1";
-  sha256 = "0cxmrikcxgnrki9z8i33z7fbjpkx0vw849zj1cbq1zh8ry8xhhvg";
+  version = "1.2";
+  sha256 = "17j7hyd86h9msc8ni19agb0yhixga76q9kh4i109iyiyqizdnfhg";
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];

From 412ae6b48ab31ce30e07959dd5cad65289e1b75d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:53 +0200
Subject: [PATCH 053/221] haskell-diagrams-lib: update to version 1.2

---
 .../libraries/haskell/diagrams/lib.nix        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 775553bc2a4..26470c21515 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -1,17 +1,18 @@
-{ cabal, active, colour, dataDefaultClass, diagramsCore, filepath
-, fingertree, hashable, intervals, lens, MemoTrie, monoidExtras
-, optparseApplicative, safe, semigroups, tagged, vectorSpace
-, vectorSpacePoints
+{ cabal, active, colour, dataDefaultClass, diagramsCore, dualTree
+, filepath, fingertree, hashable, intervals, JuicyPixels, lens
+, MemoTrie, monoidExtras, optparseApplicative, safe, semigroups
+, tagged, vectorSpace, vectorSpacePoints
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.1.0.7";
-  sha256 = "0ad5105aa2ds0hrx0184jhvzw1mw5l659hx745rsyl8wyi5yrcy7";
+  version = "1.2";
+  sha256 = "1gdc2k1dmqfv6pcznzngfv0gqsm7pd7ga65xjmd0rzyl8nqk4k3n";
   buildDepends = [
-    active colour dataDefaultClass diagramsCore filepath fingertree
-    hashable intervals lens MemoTrie monoidExtras optparseApplicative
-    safe semigroups tagged vectorSpace vectorSpacePoints
+    active colour dataDefaultClass diagramsCore dualTree filepath
+    fingertree hashable intervals JuicyPixels lens MemoTrie
+    monoidExtras optparseApplicative safe semigroups tagged vectorSpace
+    vectorSpacePoints
   ];
   jailbreak = true;
   meta = {

From 684bbb66c9b9e554ec487d876bdd29521f7c86f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:55 +0200
Subject: [PATCH 054/221] haskell-diagrams-postscript: update to version 1.1

---
 pkgs/development/libraries/haskell/diagrams/postscript.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index 55e2c975b0e..29dbafb890f 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.0.2.4";
-  sha256 = "0vjzvjyrbmnjgl8ln58a44nhh4abq5q2c6fvlpxpfhxh2ligsmas";
+  version = "1.1";
+  sha256 = "0l077libp6h8ka9ygkmajvzdymndlhx60nb5f6jaqvp7yx80hz3m";
   buildDepends = [
     dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
     lens monoidExtras mtl semigroups split vectorSpace

From 322a9328980db0b23cc48452f0538730cc162d11 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:57 +0200
Subject: [PATCH 055/221] haskell-diagrams-svg: update to version 1.1

---
 .../libraries/haskell/diagrams/svg.nix            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 663a6287c62..dbc148abaee 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -1,15 +1,16 @@
-{ cabal, blazeMarkup, blazeSvg, colour, diagramsCore, diagramsLib
-, filepath, hashable, lens, monoidExtras, mtl, split, time
-, vectorSpace
+{ cabal, base64Bytestring, blazeMarkup, blazeSvg, colour
+, diagramsCore, diagramsLib, filepath, hashable, JuicyPixels, lens
+, monoidExtras, mtl, split, time, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.0.2.1";
-  sha256 = "1qm4vk67knl4bpp84kwm95blshf7slarpl620m8irslsq3yag507";
+  version = "1.1";
+  sha256 = "0b34rh35pay4x8dg0i06xvr3d865hbxzj2x77jly9l1j7sa1qaj1";
   buildDepends = [
-    blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
-    hashable lens monoidExtras mtl split time vectorSpace
+    base64Bytestring blazeMarkup blazeSvg colour diagramsCore
+    diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl
+    split time vectorSpace
   ];
   jailbreak = true;
   meta = {

From bb7641619b59b987567e6110463a22008bfd8c67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:34:59 +0200
Subject: [PATCH 056/221] haskell-dns: update to version 1.3.0

---
 .../libraries/haskell/dns/default.nix           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index badc718f32b..d563348c371 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -1,19 +1,18 @@
-{ cabal, attoparsec, attoparsecConduit, binary, blazeBuilder
-, conduit, conduitExtra, doctest, hspec, iproute, mtl, network
-, random, resourcet
+{ cabal, attoparsec, binary, blazeBuilder, conduit, conduitExtra
+, doctest, hspec, iproute, mtl, network, random, resourcet
 }:
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "1.2.3";
-  sha256 = "0h03zh75yzrx08p99ll123qd9a7a2ccj9gad1f8y3340dz3pa7ld";
+  version = "1.3.0";
+  sha256 = "1zd639d69ha3g1yz7ssvwarwiwyi975ps4i5y8vrarcq2jnnsb6n";
   buildDepends = [
-    attoparsec attoparsecConduit binary blazeBuilder conduit
-    conduitExtra iproute mtl network random resourcet
+    attoparsec binary blazeBuilder conduit conduitExtra iproute mtl
+    network random resourcet
   ];
   testDepends = [
-    attoparsec attoparsecConduit binary blazeBuilder conduit
-    conduitExtra doctest hspec iproute mtl network random resourcet
+    attoparsec binary blazeBuilder conduit conduitExtra doctest hspec
+    iproute mtl network random resourcet
   ];
   testTarget = "spec";
   meta = {

From 6108f65cde9326141f6d6e9887d5eac2e9a8e12f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:01 +0200
Subject: [PATCH 057/221] haskell-dual-tree: update to version 0.2.0.4

---
 pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index 120fac409f0..2f47a96b853 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dual-tree";
-  version = "0.2.0.3";
-  sha256 = "17l0jjxi8lj17hbn73wg252gdpbnp81aay7xlmx42g99pj377bmb";
+  version = "0.2.0.4";
+  sha256 = "0visavx0zqgmcjcq07vfhk6dn867269w2gxa8nvc79gya56c6wdp";
   buildDepends = [ monoidExtras newtype semigroups ];
   jailbreak = true;
   meta = {

From d95c25dbc00f7c59cb73be1904fa7d82ecf4d456 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:03 +0200
Subject: [PATCH 058/221] haskell-either: update to version 4.3.0.1

---
 .../development/libraries/haskell/either/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 75e29603e5e..e7bbb47a47f 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -1,14 +1,14 @@
-{ cabal, monadControl, MonadRandom, mtl, semigroupoids, semigroups
-, transformers, transformersBase
+{ cabal, exceptions, free, monadControl, MonadRandom, mtl
+, semigroupoids, semigroups, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "4.1.2";
-  sha256 = "1c2dp22al9qq2w1xks5s3n8dcan9wpashvn24i4g8avs8yfrr5v4";
+  version = "4.3.0.1";
+  sha256 = "1ib6288gxzqfm2y198dzhhq588mlwqxm07pcrj4h66g1mcy54q1f";
   buildDepends = [
-    monadControl MonadRandom mtl semigroupoids semigroups transformers
-    transformersBase
+    exceptions free monadControl MonadRandom mtl semigroupoids
+    semigroups transformers transformersBase
   ];
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
   meta = {

From f06269c9dc117636faa4796e9454fb3c3f932522 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:05 +0200
Subject: [PATCH 059/221] haskell-enclosed-exceptions: update to version
 1.0.0.2

---
 .../libraries/haskell/enclosed-exceptions/default.nix    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
index 113c454d6db..5def0b895f0 100644
--- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
+++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
@@ -1,16 +1,17 @@
 { cabal, async, deepseq, hspec, liftedBase, monadControl
-, QuickCheck, transformers
+, QuickCheck, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "enclosed-exceptions";
-  version = "1.0.0.1";
-  sha256 = "0imq5kp45yfkhkz51ld869pf9hnlkbh92nk0aig1z8cc6akjnjw0";
+  version = "1.0.0.2";
+  sha256 = "1jbgqqavkhz2x5br17bdhv17rcmyi7a5mxplakhgyyg73wkjq04h";
   buildDepends = [
-    async deepseq liftedBase monadControl transformers
+    async deepseq liftedBase monadControl transformers transformersBase
   ];
   testDepends = [
     async deepseq hspec liftedBase monadControl QuickCheck transformers
+    transformersBase
   ];
   meta = {
     homepage = "https://github.com/jcristovao/enclosed-exceptions";

From a9ee3e1b16c44f62b6458ebcc279b323cbf3c171 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:07 +0200
Subject: [PATCH 060/221] haskell-encoding: update to version 0.7.0.1

---
 pkgs/development/libraries/haskell/encoding/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix
index 030e2da8364..d9f8710f7c5 100644
--- a/pkgs/development/libraries/haskell/encoding/default.nix
+++ b/pkgs/development/libraries/haskell/encoding/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "encoding";
-  version = "0.7";
-  sha256 = "1h6yki4d3912sr8nsk1cff2pdvzw8ys6xnzi97b5ay1f8i28bmi5";
+  version = "0.7.0.1";
+  sha256 = "18s6cfcjwjx5dja14rf35rx71cbpr8ylg4x29ffx2blsk8ib9zxh";
   buildDepends = [
     binary extensibleExceptions HaXml mtl regexCompat
   ];

From 33f2613c4c8f97f2a2d0ac1beb0c56c5749ba348 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:10 +0200
Subject: [PATCH 061/221] haskell-entropy: update to version 0.3

---
 pkgs/development/libraries/haskell/entropy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix
index f2154ddddf7..c92fc584aaf 100644
--- a/pkgs/development/libraries/haskell/entropy/default.nix
+++ b/pkgs/development/libraries/haskell/entropy/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "entropy";
-  version = "0.2.2.4";
-  sha256 = "1cjmpb0rh1ib4j9mwmf1irn401vmjawxkshxdmmb4643rmcgx1gm";
+  version = "0.3";
+  sha256 = "0b1yx7409xw8jz2rj8695xscjnw4p7y80niq9cbkqrmnqbqnwj2q";
   meta = {
     homepage = "https://github.com/TomMD/entropy";
     description = "A platform independent entropy source";

From d1b20968786c1f8a9c9287b2dc0b131026e906e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:12 +0200
Subject: [PATCH 062/221] haskell-exception-mtl: update to version 0.3.0.4

---
 pkgs/development/libraries/haskell/exception-mtl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix
index 2c64598d1d0..5799a94334e 100644
--- a/pkgs/development/libraries/haskell/exception-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "exception-mtl";
-  version = "0.3.0.3";
-  sha256 = "1mmkp16c5ixknhm69a2zjrs9q0dd5ragmljnjjd6lxpakdlw64ww";
+  version = "0.3.0.4";
+  sha256 = "16airfs3z1qmx42qww22m21fryr8210m7ji5rgkl2amjvj4lllvc";
   buildDepends = [ exceptionTransformers mtl transformers ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";

From 5d3457539189801e8b2252dd07e227bbb57c9250 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:14 +0200
Subject: [PATCH 063/221] haskell-extensible-effects: update to version 1.7.1

---
 .../libraries/haskell/extensible-effects/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix
index ba511f0b6a2..eb52756ce3b 100644
--- a/pkgs/development/libraries/haskell/extensible-effects/default.nix
+++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "extensible-effects";
-  version = "1.6.0";
-  sha256 = "08g2py6iywwpsr09v6hfhq6ihjp1yq3aibz8jlqhsmagjjjxgfsq";
+  version = "1.7.1";
+  sha256 = "1i7bmyga63svnky03f5xvz63795pjsqp3x7rn9amj55yj11fmp05";
   buildDepends = [ transformers transformersBase ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit

From 4ac91314ccf9da0a3417d3411ea1d4b52c9045bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:16 +0200
Subject: [PATCH 064/221] haskell-force-layout: update to version 0.3.0.4

---
 pkgs/development/libraries/haskell/force-layout/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index a336c2a7e2b..40a610f2b11 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.3.0.3";
-  sha256 = "0xix9syfiya5wx0iwzs7sp3ksqyp15vjlpir71x8md8v0hkrnh5a";
+  version = "0.3.0.4";
+  sha256 = "1zgqcz9b86qax1hyl32a1giapvn2wpnb4gcfn8czkcr0m7c2iwdg";
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];

From ce1c5de10807bef81ace6d39d9145668b448e1ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:18 +0200
Subject: [PATCH 065/221] haskell-free: update to version 4.9

---
 pkgs/development/libraries/haskell/free/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index 9d84bf87435..b445bf49448 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.7.1";
-  sha256 = "14qvc153g7n8fkl2giyyya8l7fs4limgnm18hdw5dpj841kwxgzm";
+  version = "4.9";
+  sha256 = "01pa9ax9i4pkh9a5achndx5s7sxvhnk6rm57g8rzav79hzsr4cnx";
   buildDepends = [
     bifunctors comonad distributive mtl preludeExtras profunctors
     semigroupoids semigroups transformers

From e221343937e3366f60b7f92c561ff5c289d8a519 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:20 +0200
Subject: [PATCH 066/221] haskell-haskell-packages: update to version 0.2.4

---
 .../libraries/haskell/haskell-packages/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix
index 4081e246a34..168c6babb3d 100644
--- a/pkgs/development/libraries/haskell/haskell-packages/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-packages";
-  version = "0.2.3.4";
-  sha256 = "0qj5n1yc481n5c8gi5dgk22pxj58gf7z30621spr7gwlv001sk1y";
+  version = "0.2.4";
+  sha256 = "1ygpa2k0hyx2xwny33kr0h847zvvsp4z1pwqrd92sf7vzpyz5nch";
   buildDepends = [
     aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl
     optparseApplicative tagged

From cfe39f293fea6649791bae95c399a836aeb3341e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:23 +0200
Subject: [PATCH 067/221] haskell-heist: update to version 0.13.1.2

---
 pkgs/development/libraries/haskell/heist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index faf5212a794..77128310d52 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "heist";
-  version = "0.13.1";
-  sha256 = "0v9c5hhybn617nmjswqkjrf7bjb5073achfi05ivw1gblbvsj0ir";
+  version = "0.13.1.2";
+  sha256 = "0c80lf00n3iv55mw4p61bjx14gildvxnvfdaa755ghkg1wcd59s5";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
     filepath hashable MonadCatchIOTransformers mtl random text time

From 3e5cf9c4dcbc57badd9bb813b5f9c3ddd8a2a2da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:25 +0200
Subject: [PATCH 068/221] haskell-highlighting-kate: update to version 0.5.8.2

---
 .../libraries/haskell/highlighting-kate/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 0f984c50e5f..6418c7f0326 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.8.1";
-  sha256 = "10hbsra6ifjj765shf6x4c8kgb5bmv3zcgya3lcswvwa9xn78h9p";
+  version = "0.5.8.2";
+  sha256 = "1c85yfzi3ri3j1fmqvd4pc4pp95jpm62a2nbbibpybl2h88dsjsb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 3ce206a7f0048555e8be6f9934acd4546cd09390 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:27 +0200
Subject: [PATCH 069/221] haskell-hoauth2: update to version 0.3.7

---
 pkgs/development/libraries/haskell/hoauth2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix
index 77e84842723..949e1bdfc59 100644
--- a/pkgs/development/libraries/haskell/hoauth2/default.nix
+++ b/pkgs/development/libraries/haskell/hoauth2/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoauth2";
-  version = "0.3.6.1";
-  sha256 = "0nfh77fxyl8vbdnrrp28hsl1zhxhmg8mjn0gfvc2i3w5rd6j0lda";
+  version = "0.3.7";
+  sha256 = "0v43hr7vw2iikhx2bldkb0fa5j95msgn7s7k09vkxz3qwqh9maz7";
   buildDepends = [
     aeson bytestringShow conduit httpConduit httpTypes monadControl mtl
     random resourcet text transformers

From 186f86b3c746176ac9bde7248f62e38c15da0e0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:29 +0200
Subject: [PATCH 070/221] haskell-io-streams: update to version 1.1.4.5

---
 pkgs/development/libraries/haskell/io-streams/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix
index 4813771cb53..1fc49e1c068 100644
--- a/pkgs/development/libraries/haskell/io-streams/default.nix
+++ b/pkgs/development/libraries/haskell/io-streams/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-streams";
-  version = "1.1.4.4";
-  sha256 = "07kmmjn1bsjzfi27fk6fx56pchks866qwrxkyvwihfvd96wgqggd";
+  version = "1.1.4.5";
+  sha256 = "1w76p9hb83x2fjlldcnbk3zddaph4cccka2g13b1rcjssqgnbk8h";
   buildDepends = [
     attoparsec blazeBuilder network primitive text time transformers
     vector zlibBindings

From 2dacb6ed0e6e68ce471597aadb59ea90e8c16be9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:31 +0200
Subject: [PATCH 071/221] haskell-kan-extensions: update to version 4.0.3

---
 pkgs/development/libraries/haskell/kan-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix
index d4b5c5752e0..fae884b2922 100644
--- a/pkgs/development/libraries/haskell/kan-extensions/default.nix
+++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "kan-extensions";
-  version = "4.0.2";
-  sha256 = "05invi86i2a115jdy2nzdkc0i6g170j0xcxycw2z2qjigvjsaizi";
+  version = "4.0.3";
+  sha256 = "05zqlxm6i66d996jcpjhnmij28a4zwc0l0nc9cyxamfwmyd9754b";
   buildDepends = [
     adjunctions comonad contravariant distributive free mtl pointed
     semigroupoids speculation transformers

From 3aba64bd86327bdbdd6d45ab5c554a31a587daab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:33 +0200
Subject: [PATCH 072/221] haskell-keys: update to version 3.10.1

---
 pkgs/development/libraries/haskell/keys/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix
index 570c88b1fbd..d97066e57c7 100644
--- a/pkgs/development/libraries/haskell/keys/default.nix
+++ b/pkgs/development/libraries/haskell/keys/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "keys";
-  version = "3.10";
-  sha256 = "1s2xkzvaqk507wrgabpxli8g8n83arflmdhxq40f7qkvyflhhmyh";
+  version = "3.10.1";
+  sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n";
   buildDepends = [
     comonad free semigroupoids semigroups transformers
   ];

From a2393999ce6a78384b9756a47da9b42a4d5deee7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:36 +0200
Subject: [PATCH 073/221] haskell-language-c-inline: update to version 0.6.0.0

---
 .../libraries/haskell/language-c-inline/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
index 691c1e70662..1aef92fe678 100644
--- a/pkgs/development/libraries/haskell/language-c-inline/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-inline";
-  version = "0.5.0.0";
-  sha256 = "1cyl45bi2d38yyd1ybxippl8mv3hsl1chzn7rqm40fds97h07j2z";
+  version = "0.6.0.0";
+  sha256 = "08a22sr01kch365p5536fv32rxsfmdd6hkhcq1j7vhchjrsy3f6w";
   buildDepends = [ filepath languageCQuote mainlandPretty ];
   testDepends = [ languageCQuote ];
   doCheck = false;

From c7282f84a9549474443b4db08517a92b4cc4b89e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:38 +0200
Subject: [PATCH 074/221] haskell-lens: update to version 4.2

---
 .../libraries/haskell/lens/default.nix         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 8576ed1d804..f6f91da7083 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -1,22 +1,22 @@
-{ cabal, aeson, bifunctors, comonad, contravariant, deepseq
-, distributive, doctest, exceptions, filepath, free
+{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant
+, deepseq, distributive, doctest, exceptions, filepath, free
 , genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
 , primitive, profunctors, QuickCheck, reflection, scientific
 , semigroupoids, semigroups, simpleReflect, split, tagged
 , testFramework, testFrameworkHunit, testFrameworkQuickcheck2
 , testFrameworkTh, text, transformers, transformersCompat
-, unorderedContainers, utf8String, vector, void, zlib
+, unorderedContainers, vector, void, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.1.2.1";
-  sha256 = "1fi6960m2rvr538mwhrxavvrj8pvjnyw3akcbgaaph5p8f214alw";
+  version = "4.2";
+  sha256 = "0aqhr8akb7wg270jxi1ns3mrpv42cfssi3g2kzyhkjmb39qxpp2w";
   buildDepends = [
-    aeson bifunctors comonad contravariant distributive exceptions
-    filepath free hashable mtl parallel primitive profunctors
-    reflection scientific semigroupoids semigroups split tagged text
-    transformers transformersCompat unorderedContainers utf8String
+    aeson attoparsec bifunctors comonad contravariant distributive
+    exceptions filepath free hashable mtl parallel primitive
+    profunctors reflection scientific semigroupoids semigroups split
+    tagged text transformers transformersCompat unorderedContainers
     vector void zlib
   ];
   testDepends = [

From 912e33adb2576c444a63e86ab103d959c3c8fddc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:40 +0200
Subject: [PATCH 075/221] haskell-libmpd: update to version 0.8.0.4

---
 pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index 2c31b2efea8..54f358547bd 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "libmpd";
-  version = "0.8.0.3";
-  sha256 = "0xbbk2rg6awfz5ak20956nriifga81ndk7n58lbbf5i86380akwz";
+  version = "0.8.0.4";
+  sha256 = "0dk723zly9dkwpgp4157d3a559g9j0ndxfdyp85yqcsr987wplqb";
   buildDepends = [
     attoparsec dataDefault filepath mtl network text time utf8String
   ];

From e49f8f6e4b2ee0e5a0cf9ef54420ac98ab1652be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:42 +0200
Subject: [PATCH 076/221] haskell-monoid-extras: update to version 0.3.3.4

---
 pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index e3be47f16a0..dc4bb6dbb66 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.3.3.3";
-  sha256 = "0i4c2yn0kbkqi478x93r2xvl05l4r3x7nyjd47zy3r4bb38qwj89";
+  version = "0.3.3.4";
+  sha256 = "0jbly9zxnsm15a5d3xg7i6w1mpqi4irdc76996xm5slg8bh0cji6";
   buildDepends = [ groups semigroupoids semigroups ];
   jailbreak = true;
   meta = {

From e017e4cad65ec63f9b9abd48c8056dc753b05d84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:44 +0200
Subject: [PATCH 077/221] haskell-process-conduit: update to version 1.1.0.0

---
 pkgs/development/libraries/haskell/process-conduit/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix
index 8ed966cd05b..aea29a4d02b 100644
--- a/pkgs/development/libraries/haskell/process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/process-conduit/default.nix
@@ -11,8 +11,6 @@ cabal.mkDerivation (self: {
     text
   ];
   testDepends = [ conduit hspec ];
-  # This check is being disabled until process-conduit is updated to properly
-  # support conduit 1.1.x
   doCheck = false;
   meta = {
     homepage = "http://github.com/tanakh/process-conduit";

From 938ac2949f5fe12cfbfc13f53e8a3cb200432e79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:46 +0200
Subject: [PATCH 078/221] haskell-reducers: update to version 3.10.2.1

---
 pkgs/development/libraries/haskell/reducers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
index 7d7ad6d4917..ac00a1ca5c1 100644
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ b/pkgs/development/libraries/haskell/reducers/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reducers";
-  version = "3.10.2";
-  sha256 = "159srk8v6zmfprq80mx3rpqrxzgzvf7xiwm8ywfaxrqyfcwkkjmg";
+  version = "3.10.2.1";
+  sha256 = "1wn6q6cw9is1gan9y5n3fzjkhmpjpria4p13zp4kqxmj881067vy";
   buildDepends = [
     comonad fingertree hashable keys pointed semigroupoids semigroups
     text transformers unorderedContainers

From 08910c93a9b9043fae9dede38266cd069a107a1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:48 +0200
Subject: [PATCH 079/221] haskell-scotty: update to version 0.7.3

---
 pkgs/development/libraries/haskell/scotty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix
index cc5ae260477..601ecfb223d 100644
--- a/pkgs/development/libraries/haskell/scotty/default.nix
+++ b/pkgs/development/libraries/haskell/scotty/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "scotty";
-  version = "0.7.2";
-  sha256 = "1y14af3qciwycgaxzx6rjan2jgfchjzs4zbxzh8p8s1d0l4gsqlb";
+  version = "0.7.3";
+  sha256 = "1cksnsaghcliwpbigs7fjb2qcxsnrqmjcjwndmf3vbfkn43w2prb";
   buildDepends = [
     aeson blazeBuilder caseInsensitive conduit conduitExtra dataDefault
     httpTypes mtl regexCompat text transformers wai waiExtra warp

From e4e95884f86850cd8a69d5d5cc61b9f5ce6e93f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:50 +0200
Subject: [PATCH 080/221] haskell-semigroups: update to version 0.15

---
 pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index 7b68d75c906..21cbc893e22 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.14";
-  sha256 = "07jmfb3h4kz3a2ysrkhzzpfdhxglszq6qqsmg2011f0hdzm24ay7";
+  version = "0.15";
+  sha256 = "1fkinmjyx7r39c8hf8f6n9zgn6m7c2y7l0san43s4g2cfg8pxn5s";
   buildDepends = [ hashable nats text unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";

From 29742effa474bfd5ea4a8a0538548109ba6467ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:55 +0200
Subject: [PATCH 081/221] haskell-shelly: update to version 1.5.4

---
 pkgs/development/libraries/haskell/shelly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 4549adaf43e..a37fb044bc0 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.5.3.2";
-  sha256 = "0ilqg7mffw8cnl3w175if74xwfij7460qqqsp6hzml7gzjdb0rky";
+  version = "1.5.4";
+  sha256 = "1jxw3c25n7azvfyj9vark9149sk36d01pfij6lgamhjs28mb860d";
   buildDepends = [
     async enclosedExceptions exceptions liftedAsync liftedBase
     monadControl mtl systemFileio systemFilepath text time transformers

From 303806b1823c086ac6e6670056c4ca7cf65c7d81 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:57 +0200
Subject: [PATCH 082/221] haskell-smtps-gmail: update to version 1.2.1

---
 pkgs/development/libraries/haskell/smtps-gmail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
index 6361c9bd79a..2618b77be28 100644
--- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix
+++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smtps-gmail";
-  version = "1.2.0";
-  sha256 = "1gg3cglfsyfffh3b5cyrk3pnb8jg5s8s4yjzykdnfyjrdp1080xz";
+  version = "1.2.1";
+  sha256 = "04sancbfbbszajgb1jp613qp43qxvzz9b14c0v3sgfva7fdhaw9q";
   buildDepends = [
     base64Bytestring cprngAes dataDefault filepath mimeMail network
     stringsearch text tls

From b453628e52ba729ead5e5993c62a7653da268997 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:35:59 +0200
Subject: [PATCH 083/221] haskell-snap: update to version 0.13.2.6

---
 pkgs/development/libraries/haskell/snap/snap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 26533c8ce0e..ecbb5da37a7 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.13.2.5";
-  sha256 = "1xvwx4zg2b78fdyb2yvqd5i5g195di7rzzpn3va43vkq2lk5vcqj";
+  version = "0.13.2.6";
+  sha256 = "0f9m8rvciis16w211hfrablh3xzxwcqqsgvfc34j70lazj3kigs3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 4268d5c635d6a4556728811718b5024b39d79c76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:01 +0200
Subject: [PATCH 084/221] haskell-sqlite-simple: update to version 0.4.8.0

---
 pkgs/development/libraries/haskell/sqlite-simple/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
index d8a76210d08..515f22834ae 100644
--- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix
+++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sqlite-simple";
-  version = "0.4.7.0";
-  sha256 = "128b8n66j729g9mwndv5m3plww6av7hin7dmwsbs19v8klcaf4f5";
+  version = "0.4.8.0";
+  sha256 = "098d1s80wlvsp307422f79bm3a9knvgw5ni6jap62fl4rpa7fsmz";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual directSqlite text time
     transformers

From 7f9484967c47fa3d87a66a3f72b3c9da53124812 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:04 +0200
Subject: [PATCH 085/221] haskell-statestack: update to version 0.2.0.3

---
 pkgs/development/libraries/haskell/statestack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/statestack/default.nix b/pkgs/development/libraries/haskell/statestack/default.nix
index 4275c5fc457..c073e00be17 100644
--- a/pkgs/development/libraries/haskell/statestack/default.nix
+++ b/pkgs/development/libraries/haskell/statestack/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "statestack";
-  version = "0.2";
-  sha256 = "0j1axjwlh270qy6nlvm0hbc8nbd1ggm7klkjv553qf1rprz4zc2d";
+  version = "0.2.0.3";
+  sha256 = "0w5vw8jmnwbfyma4a3ggdm9jvxf3c18kpwbvcmvr5szifaqv9sgx";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "Simple State-like monad transformer with saveable and restorable state";

From 868c6a96646d6eca0a38ff21bae2b94e2d10e5f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:06 +0200
Subject: [PATCH 086/221] haskell-statistics: update to version 0.11.0.3

---
 pkgs/development/libraries/haskell/statistics/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index 58a9c835696..485a5fe0c30 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "statistics";
-  version = "0.11.0.1";
-  sha256 = "17p4dj7wimnl5fcwxpmcmgcmwpypfkk3gzmgmx9qvxl8p38lwacc";
+  version = "0.11.0.3";
+  sha256 = "184lzivqjjj69pxcnr5ibxjqikypfl5nd63i44qgwdhwyvcaqdh3";
   buildDepends = [
     binary deepseq erf mathFunctions monadPar mwcRandom primitive
     vector vectorAlgorithms vectorBinaryInstances

From 92aa75475c3ec1a5a8823ec22d8a1fdde16b0988 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:08 +0200
Subject: [PATCH 087/221] haskell-stm-conduit: update to version 2.5.0

---
 pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 201a2ea02f9..deb76355f4a 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.4.0";
-  sha256 = "03ifxr3pspwmzf0xdh7mj3q1wiz13d86w9pdhiqa6b1d1qw6rvha";
+  version = "2.5.0";
+  sha256 = "1pxs1ggyyjm4x06cirdcjaqzvz3964spv34fcf0q9ddhxm5kb30q";
   buildDepends = [
     async cereal cerealConduit conduit conduitExtra liftedAsync
     liftedBase monadControl monadLoops resourcet stm stmChans

From fbfbaea156ad6606313fba3e392b98a4a06a7935 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:10 +0200
Subject: [PATCH 088/221] haskell-system-fileio: update to version 0.3.14

---
 .../libraries/haskell/system-fileio/default.nix        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index f9cf911678a..bd0654f728a 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -1,10 +1,14 @@
-{ cabal, systemFilepath, text, time }:
+{ cabal, chell, systemFilepath, temporary, text, time, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "system-fileio";
-  version = "0.3.13";
-  sha256 = "12xsxcg2jk63x8aiikj5gx1an794zdfxzkx1sjnr2qyqyirk311v";
+  version = "0.3.14";
+  sha256 = "1x5cricx2n1wwvdad4i3q8s3gb28a129v3kkj9rn9803xh43zh29";
   buildDepends = [ systemFilepath text time ];
+  testDepends = [
+    chell systemFilepath temporary text time transformers
+  ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";
     description = "Consistent filesystem interaction across GHC versions";

From 4e60fd568766dea60837ec21812c2afc0ecdd383 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:12 +0200
Subject: [PATCH 089/221] haskell-system-filepath: update to version 0.4.12

---
 .../libraries/haskell/system-filepath/default.nix          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix
index fba75d7b847..6bc7805cef6 100644
--- a/pkgs/development/libraries/haskell/system-filepath/default.nix
+++ b/pkgs/development/libraries/haskell/system-filepath/default.nix
@@ -1,10 +1,11 @@
-{ cabal, deepseq, text }:
+{ cabal, chell, chellQuickcheck, deepseq, QuickCheck, text }:
 
 cabal.mkDerivation (self: {
   pname = "system-filepath";
-  version = "0.4.10";
-  sha256 = "176g5jm1gd6lrkmhfz9qh5aqwfbpwyr30yknfcc49wl7jkfhisiq";
+  version = "0.4.12";
+  sha256 = "0sfralwgd5b9hfqmp20v31sq96s0v7j9g920qdj3n9i5mhslhwd2";
   buildDepends = [ deepseq text ];
+  testDepends = [ chell chellQuickcheck QuickCheck text ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";
     description = "High-level, byte-based file and directory path manipulations";

From e8acfc5d65ef7dba1f4fa7423a54c8846f95f905 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:15 +0200
Subject: [PATCH 090/221] haskell-tasty-ant-xml: update to version 1.0.0.8

---
 pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
index 9ad4b2de747..2551b642fb1 100644
--- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-ant-xml";
-  version = "1.0.0.7";
-  sha256 = "0jjh2lyr33l5mps123azszwnk0h61ar99zlqbc4h04a8vkd9x813";
+  version = "1.0.0.8";
+  sha256 = "0khjx3anxp63ch6wkdhqnsk5miavkq014ab30rpir97gdqw0vykm";
   buildDepends = [
     genericDeriving mtl reducers stm tagged tasty transformers xml
   ];

From 5bf659263ef9bd117d69c9dc7884ae4700737eb0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:17 +0200
Subject: [PATCH 091/221] haskell-tasty-golden: update to version 2.2.1.2

---
 pkgs/development/libraries/haskell/tasty-golden/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix
index 159a5fd9eb8..d6d8f2d625d 100644
--- a/pkgs/development/libraries/haskell/tasty-golden/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-golden";
-  version = "2.2.1.1";
-  sha256 = "0a265l7fwc0sxzdy9b0jf8f5w4nws6pwhhaw1pa7qx3c8fm9v54i";
+  version = "2.2.1.2";
+  sha256 = "107c6i1abw6dsd3cx1bgiyk8dnih7i9x4bl4kw6dfnva2kjkp4d1";
   buildDepends = [
     deepseq filepath mtl optparseApplicative tagged tasty temporaryRc
   ];

From 08198d47717c53cc22b93f3099b763124ad74877 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:19 +0200
Subject: [PATCH 092/221] haskell-texmath: update to version 0.6.6.2

---
 pkgs/development/libraries/haskell/texmath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 7c97f5b8e3f..d7e60bf4aed 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.6.1";
-  sha256 = "0s6rh4frjc76g1nmwhnnpnsszrnhpi9zx478zqiln1fg0yc9fhxq";
+  version = "0.6.6.2";
+  sha256 = "0lwkbniw7nn19gaw5bl1fsbl5q54n111zpiwz8b49d03vmmvd3hs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ pandocTypes parsec syb xml ];

From b4a3a61285a3b5e75368b7e6dbf44a9c92943d5b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:23 +0200
Subject: [PATCH 093/221] haskell-unlambda: update to version 0.1.3

---
 pkgs/development/libraries/haskell/unlambda/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
index a9e0def2bc7..474bb1a8b09 100644
--- a/pkgs/development/libraries/haskell/unlambda/default.nix
+++ b/pkgs/development/libraries/haskell/unlambda/default.nix
@@ -7,7 +7,6 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl ];
-  hyperlinkSource = false;
   meta = {
     description = "Unlambda interpreter";
     license = "GPL";

From 145bcc77e78b62e518c27c5318d7b8f45861efce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:26 +0200
Subject: [PATCH 094/221] haskell-utf8-string: update to version 0.3.8

---
 pkgs/development/libraries/haskell/utf8-string/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
index e627c77bda2..ec946dcdbdf 100644
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "utf8-string";
-  version = "0.3.7";
-  sha256 = "1s59xsw1i311rpxb7arnd280pjqab5mrlfjmxbabknka8wqlnnvq";
+  version = "0.3.8";
+  sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0";
   meta = {
     homepage = "http://github.com/glguy/utf8-string/";
     description = "Support for reading and writing UTF8 Strings";

From 7d3603ae4a7f6f121366e5753ae5a3d5002ae1f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:28 +0200
Subject: [PATCH 095/221] haskell-wai-middleware-static: update to version
 0.5.0.1

---
 .../libraries/haskell/wai-middleware-static/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
index 8c0540ee101..18b251a8aed 100644
--- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-middleware-static";
-  version = "0.5.0.0";
-  sha256 = "0mvsm1ff7i2v09gchkc60r8klin1lb0w690m2kwhf9q6y7fxphdf";
+  version = "0.5.0.1";
+  sha256 = "1pwyy6lsvi7kaxf6x3ghy5013yq4ryjp01c4rrd4isx4jh1ynl31";
   buildDepends = [ filepath httpTypes mtl text wai ];
   jailbreak = true;
   meta = {

From b23dcddd234a6fb95d038a7ee89952b49ec6eded Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:30 +0200
Subject: [PATCH 096/221] haskell-yesod-bin: update to version 1.2.9.4

---
 .../libraries/haskell/yesod-bin/default.nix      | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index d722d5cd608..3bca09f4fb6 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.9.3";
-  sha256 = "1gjcg798d7xpd8hgz8s1napgxm9dnbsks1g1s5hgx8ml5xkp2la7";
+  version = "1.2.9.4";
+  sha256 = "0ir77hmg3avkm4x7pgmjx3fijisncpwklg4v1glqx4vqbjjrzk5g";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -23,18 +23,6 @@ cabal.mkDerivation (self: {
     systemFileio systemFilepath tar text time transformers unixCompat
     unorderedContainers wai waiExtra warp yaml zlib
   ];
-
-  postInstall = ''
-    mv $out/bin/yesod $out/bin/.yesod-wrapped
-    cat - > $out/bin/yesod <<EOF
-    #! ${self.stdenv.shell}
-    export HSENV=1
-    export PACKAGE_DB_FOR_GHC='$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ")'
-    eval exec $out/bin/.yesod-wrapped "\$@"
-    EOF
-    chmod +x $out/bin/yesod
-  '';
-
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "The yesod helper executable";

From 71ecdfba71245c8d50b51af727068c5b09a227bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:36:32 +0200
Subject: [PATCH 097/221] haskell-yst: update to version 0.4.1

---
 pkgs/development/libraries/haskell/yst/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
index ee9bb33cdba..8b381bd214e 100644
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@@ -1,17 +1,17 @@
 { cabal, aeson, csv, filepath, HDBC, HDBCSqlite3, HStringTemplate
-, pandoc, parsec, split, text, time, unorderedContainers, xhtml
-, yaml
+, pandoc, parsec, scientific, split, text, time
+, unorderedContainers, xhtml, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "yst";
-  version = "0.4.0.1";
-  sha256 = "0j260lvprgsi9qgjwji2cc25k0dzrw94h2527rwghik8baa1ha3r";
+  version = "0.4.1";
+  sha256 = "199awgpxn9131a7ijxvvbc4mi1yasnllbpj77k27brx00j87v3nq";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson csv filepath HDBC HDBCSqlite3 HStringTemplate pandoc parsec
-    split text time unorderedContainers xhtml yaml
+    scientific split text time unorderedContainers xhtml yaml
   ];
   meta = {
     homepage = "http://github.com/jgm/yst";

From c9672d767f4635076ed5ee98ebd79aa9bceafd55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:38:15 +0200
Subject: [PATCH 098/221] haskell-Cabal: update to version 1.20.0.1

---
 .../libraries/haskell/Cabal/{1.20.0.0.nix => 1.20.0.1.nix}    | 4 ++--
 pkgs/top-level/haskell-defaults.nix                           | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/haskell/Cabal/{1.20.0.0.nix => 1.20.0.1.nix} (89%)

diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix
similarity index 89%
rename from pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix
rename to pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix
index 0dbd2acdd92..ee7f363318e 100644
--- a/pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix
+++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Cabal";
-  version = "1.20.0.0";
-  sha256 = "1m2lp6v1959mdm9zfg6fg1xw2iv749r4rzj576lqvn66slwsjpw1";
+  version = "1.20.0.1";
+  sha256 = "0vcpw4rskqlg2swsxk93p77svb007qvpwlpj2ia55avpi4c3xf8m";
   buildDepends = [ deepseq filepath time ];
   testDepends = [
     extensibleExceptions filepath HUnit QuickCheck regexPosix
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index d803883413d..d07544691e6 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -20,8 +20,8 @@
   };
 
   ghc782Prefs = self : super : ghcHEADPrefs self super // {
-    cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_0; };
-    codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; };
+    cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_1; };
+    codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; };
   };
 
   ghc763Prefs = self : super : ghc782Prefs self super // {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9765dc29c3b..bcead18f621 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -324,7 +324,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {};
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {};
   Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {};
-  Cabal_1_20_0_0 = callPackage ../development/libraries/haskell/Cabal/1.20.0.0.nix {};
+  Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {};
   Cabal = null;                 # core package since forever
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
@@ -2740,7 +2740,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; };
   cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; };
-  cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; };
+  cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_1; };
   cabalInstall = self.cabalInstall_1_20_0_2;
 
   codex = callPackage ../development/tools/haskell/codex {};

From 66044974b4e8447bb1d78c688e798be0685a0660 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:39:11 +0200
Subject: [PATCH 099/221] haskell-QuickCheck: update to version 2.7.5

---
 .../haskell/QuickCheck/{2.7.3.nix => 2.7.5.nix}        | 10 +++++-----
 pkgs/top-level/haskell-packages.nix                    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/libraries/haskell/QuickCheck/{2.7.3.nix => 2.7.5.nix} (60%)

diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix
similarity index 60%
rename from pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix
rename to pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix
index fafea2eb7d1..8dff2162c2d 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix
@@ -1,14 +1,14 @@
-{ cabal, random, testFramework, tfRandom }:
+{ cabal, random, testFramework, tfRandom, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
-  version = "2.7.3";
-  sha256 = "196pz0b32m84ydwm4wk7m8512bmsxw7nsqpxbyfxsyi3ykq220yh";
-  buildDepends = [ random tfRandom ];
+  version = "2.7.5";
+  sha256 = "1bak50yxf8qfwfw1f5bd2p1ynx1ndjv24yp6gd2a2a1fag34x0rb";
+  buildDepends = [ random tfRandom transformers ];
   testDepends = [ testFramework ];
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
   meta = {
-    homepage = "http://code.haskell.org/QuickCheck";
+    homepage = "https://github.com/nick8325/quickcheck";
     description = "Automatic testing of Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bcead18f621..13fa322f567 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1789,8 +1789,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {};
   QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {};
   QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {};
-  QuickCheck_2_7_3 = callPackage ../development/libraries/haskell/QuickCheck/2.7.3.nix {};
-  QuickCheck = self.QuickCheck_2_7_3;
+  QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {};
+  QuickCheck = self.QuickCheck_2_7_5;
 
   quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {};
 

From 1a29d1bc3ca305463e67452339f5017b441145f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:40:06 +0200
Subject: [PATCH 100/221] haskell-HTTP: update to version 4000.2.17

---
 .../libraries/haskell/HTTP/{4000.2.15.nix => 4000.2.17.nix}   | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/HTTP/{4000.2.15.nix => 4000.2.17.nix} (89%)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix
similarity index 89%
rename from pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.17.nix
index 8e51ad6d2b5..583517260ac 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.15";
-  sha256 = "1bw79hq5nzx1gab9p3d3szr0wkiv9zvf2ld9d4i48z6fnmil4qwj";
+  version = "4000.2.17";
+  sha256 = "1701mgf1gw00nxd70kkr86yl80qxy63rpqky2g9m2nfr6y4y5b59";
   buildDepends = [ mtl network parsec ];
   testDepends = [
     caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 13fa322f567..ba01ab139f5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1024,8 +1024,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
   HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; };
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
-  HTTP_4000_2_15 = callPackage ../development/libraries/haskell/HTTP/4000.2.15.nix {};
-  HTTP = self.HTTP_4000_2_15;
+  HTTP_4000_2_17 = callPackage ../development/libraries/haskell/HTTP/4000.2.17.nix {};
+  HTTP = self.HTTP_4000_2_17;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 

From 64f41867352dfb66352f7bd6868a8ab7be6063d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:41:03 +0200
Subject: [PATCH 101/221] haskell-vector: update version to 0.10.9.3

---
 .../libraries/haskell/vector/{0.10.9.2.nix => 0.10.9.3.nix}   | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/vector/{0.10.9.2.nix => 0.10.9.3.nix} (81%)

diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.2.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
similarity index 81%
rename from pkgs/development/libraries/haskell/vector/0.10.9.2.nix
rename to pkgs/development/libraries/haskell/vector/0.10.9.3.nix
index 57c924aff48..b9a7df50ba6 100644
--- a/pkgs/development/libraries/haskell/vector/0.10.9.2.nix
+++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector";
-  version = "0.10.9.2";
-  sha256 = "046w4w5dr5136smfxzhzkhzcx6jgpnqrc2x5lzy4vrlxhb8za6c1";
+  version = "0.10.9.3";
+  sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
   buildDepends = [ deepseq primitive ];
   meta = {
     homepage = "https://github.com/haskell/vector";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ba01ab139f5..724dffd69ef 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2378,8 +2378,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   vect = callPackage ../development/libraries/haskell/vect {};
 
   vector_0_10_0_1  = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {};
-  vector_0_10_9_2  = callPackage ../development/libraries/haskell/vector/0.10.9.2.nix {};
-  vector = self.vector_0_10_9_2;
+  vector_0_10_9_3  = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {};
+  vector = self.vector_0_10_9_3;
 
   vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
 

From 6358b1598538ca268f76b24c976089cc48b34765 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:45:18 +0200
Subject: [PATCH 102/221] haskell-mtl: update to version 2.2.1 (and delete
 unused versions 1.1.1.1 and 2.1.3.1)

---
 pkgs/development/libraries/haskell/mtl/1.1.1.1.nix  | 13 -------------
 .../haskell/mtl/{2.1.3.1.nix => 2.2.1.nix}          |  4 ++--
 pkgs/top-level/haskell-defaults.nix                 |  2 +-
 pkgs/top-level/haskell-packages.nix                 |  4 +---
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
 rename pkgs/development/libraries/haskell/mtl/{2.1.3.1.nix => 2.2.1.nix} (81%)

diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
deleted file mode 100644
index d7e6029a4ed..00000000000
--- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "mtl";
-  version = "1.1.1.1";
-  sha256 = "157gbrgrg0l9r72nq45dkach53yncysif4qglsaql28g37djc4x6";
-  meta = {
-    description = "Monad transformer library";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.1.nix
similarity index 81%
rename from pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
rename to pkgs/development/libraries/haskell/mtl/2.2.1.nix
index e9fa49510c1..e7147b28767 100644
--- a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix
+++ b/pkgs/development/libraries/haskell/mtl/2.2.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mtl";
-  version = "2.1.3.1";
-  sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
+  version = "2.2.1";
+  sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://github.com/ekmett/mtl";
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index d07544691e6..697004c02fb 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -15,7 +15,7 @@
   # Older compilers inherit the overrides from newer ones.
 
   ghcHEADPrefs = self : super : super // {
-    mtl = self.mtl_2_1_3_1;
+    mtl = self.mtl_2_2_1;
     cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; };
   };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 724dffd69ef..ceeee5caeab 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1482,12 +1482,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   msgpack = callPackage ../development/libraries/haskell/msgpack {};
 
   mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
-  mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {};
   mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {};
   mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {};
   mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {};
-  mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {};
-  mtl_2_2_0_1 = callPackage ../development/libraries/haskell/mtl/2.2.0.1.nix {};
+  mtl_2_2_1 = callPackage ../development/libraries/haskell/mtl/2.2.1.nix {};
   mtl = null; # tightly coupled with 'transformers' which is a core package
 
   mtlparse = callPackage ../development/libraries/haskell/mtlparse {};

From 3376d02e3135cc47819aab358fd91a84fa256724 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:48:52 +0200
Subject: [PATCH 103/221] haskell-text: add version 1.1.1.3 (and delete unused
 versions 0.11.1.13 and 0.1.1.2)

---
 .../libraries/haskell/text/0.11.1.13.nix      | 22 -------------------
 .../haskell/text/{1.1.1.2.nix => 1.1.1.3.nix} |  4 ++--
 pkgs/top-level/haskell-packages.nix           |  5 ++---
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/text/0.11.1.13.nix
 rename pkgs/development/libraries/haskell/text/{1.1.1.2.nix => 1.1.1.3.nix} (87%)

diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix
deleted file mode 100644
index 71d0c28e48d..00000000000
--- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "text";
-  version = "0.11.1.13";
-  sha256 = "0lbc4yfqpydps0rd1qjymnnhp87sl9w7n1f5vd5lsixby93zjv2f";
-  buildDepends = [ deepseq ];
-  testDepends = [
-    deepseq HUnit QuickCheck random testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/text";
-    description = "An efficient packed Unicode text type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/text/1.1.1.2.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/text/1.1.1.2.nix
rename to pkgs/development/libraries/haskell/text/1.1.1.3.nix
index 6054e3c6471..0df511231c8 100644
--- a/pkgs/development/libraries/haskell/text/1.1.1.2.nix
+++ b/pkgs/development/libraries/haskell/text/1.1.1.3.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "text";
-  version = "1.1.1.2";
-  sha256 = "11kj0pf0v24a0xg61caaqz5d8w3s8i4nbgl416xgdvrbfd39ssj8";
+  version = "1.1.1.3";
+  sha256 = "1yrzg449nbbzh2fb9mdmf2jjfhk2g87kr9m2ibssbsqx53p98z0c";
   buildDepends = [ deepseq ];
   testDepends = [
     deepseq HUnit QuickCheck random testFramework testFrameworkHunit
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ceeee5caeab..57cb164866b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2198,12 +2198,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {};
   text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {};
   text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {};
-  text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {};
   text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {};
   text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {};
   text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {};
-  text_1_1_1_2 = callPackage ../development/libraries/haskell/text/1.1.1.2.nix {};
-  text = self.text_1_1_1_2;
+  text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {};
+  text = self.text_1_1_1_3;
 
   textFormat = callPackage ../development/libraries/haskell/text-format {};
 

From 5190b18caa197added83d044a21c2d2371d013a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 11:51:30 +0200
Subject: [PATCH 104/221] haskell-attoparsec: update to version 0.12.0.0

---
 .../libraries/haskell/attoparsec/0.12.0.0.nix | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix

diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix
new file mode 100644
index 00000000000..6fd32736c4d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix
@@ -0,0 +1,21 @@
+{ cabal, deepseq, QuickCheck, scientific, testFramework
+, testFrameworkQuickcheck2, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "attoparsec";
+  version = "0.12.0.0";
+  sha256 = "04wdb2i2yqybkfnjs3f25nf7xz1nq5sn8z23klbm4xnqaiajmkmr";
+  buildDepends = [ deepseq scientific text ];
+  testDepends = [
+    deepseq QuickCheck scientific testFramework
+    testFrameworkQuickcheck2 text
+  ];
+  meta = {
+    homepage = "https://github.com/bos/attoparsec";
+    description = "Fast combinator parsing for bytestrings and text";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 57cb164866b..a9ed05451fb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -195,7 +195,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {};
   attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {};
   attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {};
-  attoparsec = self.attoparsec_0_11_3_4;
+  attoparsec_0_12_0_0 = callPackage ../development/libraries/haskell/attoparsec/0.12.0.0.nix {};
+  attoparsec = self.attoparsec_0_12_0_0;
 
   attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {};
 

From 1d392a56ae371bf30835bb044b7c3148712be6dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jun 2014 14:49:15 +0200
Subject: [PATCH 105/221] Update the default version of transformers to 0.4.1
 on older compilers.

---
 pkgs/top-level/haskell-defaults.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 697004c02fb..6341b9a36dd 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -15,7 +15,7 @@
   # Older compilers inherit the overrides from newer ones.
 
   ghcHEADPrefs = self : super : super // {
-    mtl = self.mtl_2_2_1;
+    mtl = self.mtl_2_1_2;
     cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; };
   };
 
@@ -41,8 +41,9 @@
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
     modularArithmetic = null;           # requires base >= 4.7
+    mtl = self.mtl_2_2_1;
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; };
-    transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
+    transformers = self.transformers_0_4_1_0; # core packagen in ghc > 7.6.x
     zipArchive = super.zipArchive_0_2_2_1;    # works without binary 0.7.x
   };
 

From 73e92d263454b90c377fd6e6be6ffaa3e6698452 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Jun 2014 10:38:02 +0200
Subject: [PATCH 106/221] haskell-hsini: jailbreak to fix build with recent
 versions of mtl

---
 pkgs/development/libraries/haskell/hsini/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix
index 73368a1dd6c..52d8a26c92a 100644
--- a/pkgs/development/libraries/haskell/hsini/default.nix
+++ b/pkgs/development/libraries/haskell/hsini/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     HUnit mtl parsec QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 testFrameworkTh
   ];
+  jailbreak = true;
   meta = {
     description = "Package for user configuration files (INI)";
     license = self.stdenv.lib.licenses.bsd3;

From 782d937dc471c01b7e79de707d277aa72459f617 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 10:52:01 +0200
Subject: [PATCH 107/221] haskell-MonadCatchIO-transformers: jailbreak to fix
 build with transformers 0.4.x

---
 .../libraries/haskell/MonadCatchIO-transformers/default.nix      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
index 838c92fff3f..b6402f63abb 100644
--- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.3.1.0";
   sha256 = "1r5syyalk8a81byhk39yp0j7vdrvlrpppbg52dql1fx6kfhysaxn";
   buildDepends = [ extensibleExceptions monadsTf transformers ];
+  jailbreak = true;
   meta = {
     description = "Monad-transformer compatible version of the Control.Exception module";
     license = self.stdenv.lib.licenses.bsd3;

From eaa151379a0bf4a66e8a047bafa24eb221492dee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:01:46 +0200
Subject: [PATCH 108/221] haskell-transformers-0.4.1.0: haddock from GHC 6.10.x
 cannot build this documentation

---
 pkgs/development/libraries/haskell/transformers/0.4.1.0.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix
index 88ae33de784..dd3789e5802 100644
--- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix
+++ b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix
@@ -4,6 +4,7 @@ cabal.mkDerivation (self: {
   pname = "transformers";
   version = "0.4.1.0";
   sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg";
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
   meta = {
     description = "Concrete functor and monad transformers";
     license = self.stdenv.lib.licenses.bsd3;

From b5e87f63f9c4e11a66e92b6892b15497e0cd8e96 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:40 +0200
Subject: [PATCH 109/221] haskell-idris: update to version 0.9.13

---
 pkgs/development/compilers/idris/default.nix | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index c32c14cf584..0c3c1c0fba8 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,23 +1,25 @@
 { cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
-, boehmgc, Cabal, cheapskate, deepseq, filepath, gmp, happy
-, haskeline, languageJava, lens, libffi, llvmGeneral
-, llvmGeneralPure, mtl, network, parsers, split, text, time
-, transformers, trifecta, unorderedContainers, utf8String, vector
-, vectorBinaryInstances, xml, zlib
+, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq
+, filepath, gmp, happy, haskeline, languageJava, lens, libffi
+, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative
+, parsers, split, text, time, transformers, trifecta
+, unorderedContainers, utf8String, vector, vectorBinaryInstances
+, xml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.12";
-  sha256 = "151h9qkx7yw24q0b60r78hki1y8m6sxmfars7wywnbzk3kalqb6x";
+  version = "0.9.13";
+  sha256 = "0bpp8b19s1przycndvl542ar9dc285ccnwm7cic33ym1lcqil86n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    annotatedWlPprint ansiTerminal ansiWlPprint binary Cabal cheapskate
-    deepseq filepath haskeline languageJava lens libffi llvmGeneral
-    llvmGeneralPure mtl network parsers split text time transformers
-    trifecta unorderedContainers utf8String vector
-    vectorBinaryInstances xml zlib
+    annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml
+    blazeMarkup Cabal cheapskate deepseq filepath haskeline
+    languageJava lens libffi llvmGeneral llvmGeneralPure mtl network
+    optparseApplicative parsers split text time transformers trifecta
+    unorderedContainers utf8String vector vectorBinaryInstances xml
+    zlib
   ];
   buildTools = [ happy ];
   extraLibraries = [ boehmgc gmp ];

From 180ad15ab53619d09250ff179fc663df053ea997 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:42 +0200
Subject: [PATCH 110/221] haskell-diagrams-core: update to version 1.2.0.1

---
 pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index dbbc3c030b5..153f109d14b 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "1.2";
-  sha256 = "0qlkick9ppwaignh179w65gmiq5as1nsi1ymficdw1p0jldi5f51";
+  version = "1.2.0.1";
+  sha256 = "01rzd2zdg0pv7b299z6s6i6l6xggiszb2qs00vh5dbss295n1sps";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints

From 8e14d2908fc094e6433fd5164ed662d66c3cf8f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:44 +0200
Subject: [PATCH 111/221] haskell-diagrams-lib: update to version 1.2.0.1

---
 pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 26470c21515..03d6ad9f396 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.2";
-  sha256 = "1gdc2k1dmqfv6pcznzngfv0gqsm7pd7ga65xjmd0rzyl8nqk4k3n";
+  version = "1.2.0.1";
+  sha256 = "0p7rq97hnal90dciq1nln1s16kdb1xk9rrwaxhkxqr6kjjr2njf4";
   buildDepends = [
     active colour dataDefaultClass diagramsCore dualTree filepath
     fingertree hashable intervals JuicyPixels lens MemoTrie

From 2a53dce4e7cf0ea6cadd848b2ef34da76628b40c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:46 +0200
Subject: [PATCH 112/221] haskell-hit: update to version 0.6.1

---
 pkgs/development/libraries/haskell/hit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index 9e1a48d94e6..7e5b30ebbad 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.6.0";
-  sha256 = "1haslqhnpfdll5cl3vq1y03h916lydhc9mq4gagm9qzjfjqv54k2";
+  version = "0.6.1";
+  sha256 = "175i6gag596dy341jlr5sjj55qcaqgymrcr1czcaigsxsn5yx8b9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 0e015977e21aca3b3ee9dac7af963ede091b792b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:48 +0200
Subject: [PATCH 113/221] haskell-hourglass: update to version 0.2.0

---
 .../libraries/haskell/hourglass/default.nix           | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix
index 3fc43ef6348..7a5cf59b328 100644
--- a/pkgs/development/libraries/haskell/hourglass/default.nix
+++ b/pkgs/development/libraries/haskell/hourglass/default.nix
@@ -1,15 +1,12 @@
-{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, time
-}:
+{ cabal, deepseq, mtl, tasty, tastyHunit, tastyQuickcheck, time }:
 
 cabal.mkDerivation (self: {
   pname = "hourglass";
-  version = "0.1.2";
-  sha256 = "18jvl4f8vfabvd9vlhxjjlswc80x8w4h6gdflvzdkjrknnyk118j";
+  version = "0.2.0";
+  sha256 = "13zphy3gfj9p7vsa477qy30968fnz5kq7d0lzb1pyg5hxkx44rim";
   buildDepends = [ deepseq ];
   testDepends = [
-    deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2 time
+    deepseq mtl tasty tastyHunit tastyQuickcheck time
   ];
   meta = {
     homepage = "https://github.com/vincenthz/hs-hourglass";

From 226d0941e6d9ce4940e7e8312e065233258aaf78 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:50 +0200
Subject: [PATCH 114/221] haskell-mono-traversable: update to version 0.6.0.1

---
 .../libraries/haskell/mono-traversable/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index a296b3d310e..60cb273d3a3 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.6.0";
-  sha256 = "1ibf7iz24ic2vz0dvmbn5w06vz73g05ipl2q8f93a6zlkqysrkm4";
+  version = "0.6.0.1";
+  sha256 = "0pxmkz5jq511ys77sq2zxmgab7njrhbi01x51lf247z8ii0rdbns";
   buildDepends = [
     comonad dlist dlistInstances hashable semigroupoids semigroups text
     transformers unorderedContainers vector vectorAlgorithms

From 8dc527529915d0200cef1cf2abf930933f05175f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:52 +0200
Subject: [PATCH 115/221] haskell-pipes-aeson: update to version 0.4.1

---
 pkgs/development/libraries/haskell/pipes-aeson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
index 85fd3a0a548..aa226aa4e3b 100644
--- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-aeson";
-  version = "0.4";
-  sha256 = "0cz9av3w8h2gh3cz7gs3ikplf60a111wcsr3z6vi8gqlmmgmck07";
+  version = "0.4.1";
+  sha256 = "06fxl4az5brbivc5db498fc3yawrc2rwnrn20rbssihd0lp9xm1i";
   buildDepends = [
     aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
     transformers

From 3e53f7128aa3da496285a383e1660a15411b95af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:54 +0200
Subject: [PATCH 116/221] haskell-pipes-attoparsec: update to version 0.5.1

---
 .../libraries/haskell/pipes-attoparsec/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
index d886d17478b..04efb0cee73 100644
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-attoparsec";
-  version = "0.5.0";
-  sha256 = "1xpqna850lxawx0m84lzaxwrwfw4vccr7jjf199ir7bmwwhqlr5h";
+  version = "0.5.1";
+  sha256 = "0qvsvbcn211xp4c669cpljmnsqn9zk1rn94ya1dbq77l970s8xah";
   buildDepends = [ attoparsec pipes pipesParse text transformers ];
   testDepends = [
     attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text

From b2ec2c58ba1a27120b8aaf0948b2a2f876f84641 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:56 +0200
Subject: [PATCH 117/221] haskell-postgresql-simple: update to version 0.4.2.3

---
 .../libraries/haskell/postgresql-simple/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index b9783089987..c88ba4e845d 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.4.2.2";
-  sha256 = "0ipwpggzgqsi8ii12pk4c1bmwv2y5yj6yvyh8ma9rsz9f081bzyy";
+  version = "0.4.2.3";
+  sha256 = "1rg6virvz4nr0m39sr72h23yks5f8ih9nimgacx30zw7xvnx942p";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq
     scientific text time transformers uuid vector

From 9bc7005ecd39bdda42032c7be42854cf6028f2b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:03:58 +0200
Subject: [PATCH 118/221] haskell-semigroupoids: update to version 4.0.2.1

---
 pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index 45e2adb35fd..455396564ec 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroupoids";
-  version = "4.0.2";
-  sha256 = "07xzqqdra2d5jr4wclislj1lhbb1nlry65m0y42hdxsjf3n05931";
+  version = "4.0.2.1";
+  sha256 = "00ga4spbnvwnk7j4h7zjw3bkd98glaganhcwq947ffadc0nansb1";
   buildDepends = [
     comonad contravariant distributive semigroups transformers
   ];

From bdbd0d0ccf6cdbad86b18c361f403570a36a6a7d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:00 +0200
Subject: [PATCH 119/221] haskell-snap-core: update to version 0.9.6.3

---
 pkgs/development/libraries/haskell/snap/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 0a1d1b7c5cf..d208cadf8cf 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-core";
-  version = "0.9.6.2";
-  sha256 = "1s77p2q4zrpw2fksklqc9sgcb214fijsk88lqqasdiw9kb9xmwij";
+  version = "0.9.6.3";
+  sha256 = "0i3gl1kxzi2l76sqhyhda7lrcvq8hq6aqgwvfx5k9fa2xic01dw1";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     bytestringMmap caseInsensitive deepseq enumerator filepath hashable

From 9a76b00dd5189e53ce83ee3c465ac0a93eb008b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:02 +0200
Subject: [PATCH 120/221] haskell-snap-server: update to version 0.9.4.5

---
 pkgs/development/libraries/haskell/snap/server.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 0f9a05177d6..a59252fb38c 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.9.4.4";
-  sha256 = "1y53baxyn6z6g4vc3j66w60s0vxdblkg8az712iw2030q2brilg2";
+  version = "0.9.4.5";
+  sha256 = "09399vlqgic0iwmx31c01bjpbdblw8gayxnz71lwzkixqibkbbip";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     caseInsensitive enumerator MonadCatchIOTransformers mtl network

From 6b3ca84380b350f8d3aa5baefe8a7b190f20ff36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:04 +0200
Subject: [PATCH 121/221] haskell-texmath: update to version 0.6.6.3

---
 pkgs/development/libraries/haskell/texmath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index d7e60bf4aed..76963ae36c5 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.6.2";
-  sha256 = "0lwkbniw7nn19gaw5bl1fsbl5q54n111zpiwz8b49d03vmmvd3hs";
+  version = "0.6.6.3";
+  sha256 = "1sly6acnb4299wd8380fkgnb7lzjrwml5lljyv73si84b3v0bnw2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ pandocTypes parsec syb xml ];

From 8fd61a33452cf1ee186c18a4ae63d9e1b9b1848a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:06 +0200
Subject: [PATCH 122/221] haskell-timerep: update to version 1.0.3

---
 pkgs/development/libraries/haskell/timerep/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/timerep/default.nix b/pkgs/development/libraries/haskell/timerep/default.nix
index 6ebc44cb894..24bd1c017aa 100644
--- a/pkgs/development/libraries/haskell/timerep/default.nix
+++ b/pkgs/development/libraries/haskell/timerep/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, time }:
 
 cabal.mkDerivation (self: {
   pname = "timerep";
   version = "1.0.3";
   sha256 = "14lz8nzfy1j7snvifbwjkk1fjc8wy4jk67xk9n87r25v3cva3x0p";
+  buildDepends = [ time ];
   meta = {
     description = "Parse and display time according to some RFCs (RFC3339, RFC2822)";
     license = self.stdenv.lib.licenses.bsd3;

From 4d5a789169bd17aba7b742d621c737771a6ff125 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:08 +0200
Subject: [PATCH 123/221] haskell-transformers-compat: update to version
 0.3.3.4

---
 .../libraries/haskell/transformers-compat/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index dfe9e2ef0d6..4647bbe2980 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers-compat";
-  version = "0.3.3";
-  sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps";
+  version = "0.3.3.4";
+  sha256 = "1hab41ggyaxr4xn2szv8y9fg9np8zi8ifhimr33fspid1jz14xr5";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";

From 2acc27c2c6ec3a2b1e79746fdadf45975b77c154 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:10 +0200
Subject: [PATCH 124/221] haskell-twitter-types: update to version 0.3.20140601

---
 pkgs/development/libraries/haskell/twitter-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
index 0d40217c3d5..4b73fc5cf5a 100644
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-types/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "twitter-types";
-  version = "0.2.20140424";
-  sha256 = "0ap2l3mclcilm58awz0fdayzcs7fckv69l6xdklp1yqyj6i7zk9a";
+  version = "0.3.20140601";
+  sha256 = "1z8vdhyklgb4s3jxkavb8n62h9cn3y80qqzab3hswfv5xwri20ni";
   buildDepends = [ aeson httpTypes text unorderedContainers ];
   testDepends = [
     aeson attoparsec httpTypes HUnit shakespeare testFramework

From 404e05c4e5ab9b22a7b3ddfcebe6956b5bab3e24 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:12 +0200
Subject: [PATCH 125/221] haskell-vinyl: update to version 0.4

---
 pkgs/development/libraries/haskell/vinyl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix
index 239221dc048..52db901c495 100644
--- a/pkgs/development/libraries/haskell/vinyl/default.nix
+++ b/pkgs/development/libraries/haskell/vinyl/default.nix
@@ -1,10 +1,10 @@
-{ cabal, doctest, lens }:
+{ cabal, doctest, lens, singletons }:
 
 cabal.mkDerivation (self: {
   pname = "vinyl";
-  version = "0.3";
-  sha256 = "0wa7pdk5ds1zq0yy6lbzhpjglpnz56hg36iwma09b6jk2x71sf5r";
-  testDepends = [ doctest lens ];
+  version = "0.4";
+  sha256 = "16v13bd5dvm9axngx1pvm7bq9412f6awz0cggsif1z0dy2kjpwgb";
+  testDepends = [ doctest lens singletons ];
   meta = {
     description = "Extensible Records";
     license = self.stdenv.lib.licenses.mit;

From 743ad37a1f62d1c24156a157bf082d010d4971ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:14 +0200
Subject: [PATCH 126/221] haskell-yesod-auth: update to version 1.3.1

---
 .../libraries/haskell/yesod-auth/default.nix  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index ecea7b9f99d..a54c714e979 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,20 +1,22 @@
-{ cabal, aeson, authenticate, base16Bytestring, base64Bytestring
-, binary, blazeHtml, blazeMarkup, byteable, cryptohash, dataDefault
-, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes
-, liftedBase, mimeMail, network, persistent, persistentTemplate
-, random, resourcet, safe, shakespeare, shakespeareCss
-, shakespeareJs, text, time, transformers, unorderedContainers, wai
-, yesodCore, yesodForm, yesodPersistent
+{ cabal, aeson, attoparsecConduit, authenticate, base16Bytestring
+, base64Bytestring, binary, blazeBuilder, blazeHtml, blazeMarkup
+, byteable, conduit, conduitExtra, cryptohash, dataDefault
+, emailValidate, fileEmbed, hamlet, httpClient, httpConduit
+, httpTypes, liftedBase, mimeMail, network, persistent
+, persistentTemplate, random, resourcet, safe, shakespeare
+, shakespeareCss, shakespeareJs, text, time, transformers
+, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.0.5";
-  sha256 = "03vwmc2hql07mfl2s7a3sry82x0y0icr1977p1ljfhinyh35zc6l";
+  version = "1.3.1";
+  sha256 = "1fv5z938rpiyhkl4zjb2ss496bgqvdvn7di5im089zmxvx1m81lz";
   buildDepends = [
-    aeson authenticate base16Bytestring base64Bytestring binary
-    blazeHtml blazeMarkup byteable cryptohash dataDefault emailValidate
-    fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
+    aeson attoparsecConduit authenticate base16Bytestring
+    base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable
+    conduit conduitExtra cryptohash dataDefault emailValidate fileEmbed
+    hamlet httpClient httpConduit httpTypes liftedBase mimeMail network
     persistent persistentTemplate random resourcet safe shakespeare
     shakespeareCss shakespeareJs text time transformers
     unorderedContainers wai yesodCore yesodForm yesodPersistent

From b3fd1fcf5688849c5e4612074a61a9314b6e32c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:16 +0200
Subject: [PATCH 127/221] haskell-yesod-core: update to version 1.2.15.2

---
 pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 433b3985269..ae63f4dbc16 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.15.1";
-  sha256 = "0xvfkplxsvacwkmplhzdyqk028yqkj1bql5x6qsizvj60fwsnnyk";
+  version = "1.2.15.2";
+  sha256 = "1k5dqcfpwqac81p9w2i1kz5pcvr21ibia5kh441811bdzlpwsiwq";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie

From 4acb2ca9bf729b3ece1d303656eac8d65359b1b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:18 +0200
Subject: [PATCH 128/221] haskell-yesod-form: update to version 1.3.9.1

---
 pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 6744a230ca7..add7d94bac4 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.9";
-  sha256 = "1jq281avpw9x5nz6qn6zgc3fh76i48xh9pj980g53rx8ndg3g7x4";
+  version = "1.3.9.1";
+  sha256 = "1iw2vcdvp77vz3az9g9y4nk29g098fa9lvqzc7hwypvdawgwpgwm";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet network persistent resourcet

From 6f8794ecb294a1cca462fc23d26b06dab83c4471 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:20 +0200
Subject: [PATCH 129/221] haskell-yesod-test: update to version 1.2.2

---
 pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index a70490320e0..292941c0171 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.1.5";
-  sha256 = "0ylm6zisz6l2rbn5dr8k0rxszgg1aa1w4ixpvai1xm6y8m17cy0i";
+  version = "1.2.2";
+  sha256 = "1vf5g83mj2a38f34llg6wa63whj13p0vgbzfvi3ic5j7qy5gb8g5";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network

From 8b07b3a6a112d3804882c3d49c632dffeab9b82e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:04:22 +0200
Subject: [PATCH 130/221] haskell-codex: update to version 0.0.2.1

---
 pkgs/development/tools/haskell/codex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix
index eeba452f5c8..3bc9959c8d7 100644
--- a/pkgs/development/tools/haskell/codex/default.nix
+++ b/pkgs/development/tools/haskell/codex/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "codex";
-  version = "0.0.2";
-  sha256 = "156830krsn1qczrx27bn3ihqlis698sjf563sa2njvc7v85plx55";
+  version = "0.0.2.1";
+  sha256 = "0cwn44dw3fks1qaymrjn3q99lq6baginh12y6wwkhz53cd6cv41z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From c82d37a6b3034b10e7a7cc7054734024681b7dcb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:11:48 +0200
Subject: [PATCH 131/221] haskell-base64-bytestring: disable test suite do fix
 the build

https://github.com/bos/base64-bytestring/issues/15
---
 pkgs/development/libraries/haskell/base64-bytestring/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
index 67450dc8887..6b753f7b980 100644
--- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/bos/base64-bytestring";
     description = "Fast base64 encoding and decoding for ByteStrings";

From 035192b813c9ed41627464e798e318cb6d6302e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:13:50 +0200
Subject: [PATCH 132/221] haskell-alternative-io: drop obsolete package

---
 .../haskell/alternative-io/default.nix          | 17 -----------------
 pkgs/top-level/haskell-packages.nix             |  2 --
 2 files changed, 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/alternative-io/default.nix

diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix
deleted file mode 100644
index 9daf9406742..00000000000
--- a/pkgs/development/libraries/haskell/alternative-io/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, liftedBase, monadControl, transformers, transformersBase
-}:
-
-cabal.mkDerivation (self: {
-  pname = "alternative-io";
-  version = "0.0.1";
-  sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch";
-  buildDepends = [
-    liftedBase monadControl transformers transformersBase
-  ];
-  meta = {
-    description = "IO as Alternative instance (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a9ed05451fb..c0535f5ef40 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -147,8 +147,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   aesonQq = callPackage ../development/libraries/haskell/aeson-qq {};
 
-  alternativeIo = callPackage ../development/libraries/haskell/alternative-io {};
-
   alsaCore = callPackage ../development/libraries/haskell/alsa-core {};
 
   alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {};

From d07125a0d985db0b0c8d8b2cf92db3834225ef4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:21:56 +0200
Subject: [PATCH 133/221] haskell-transformers-compat: provide different
 versions for GHC 7.8.2 and below

transformers is a core library in GHC 7.8.2, so that compiler is stuck
with an older version of the -compat library.
---
 .../{default.nix => 0.3.3.4.nix}                   |  0
 .../haskell/transformers-compat/0.3.3.nix          | 14 ++++++++++++++
 pkgs/top-level/haskell-defaults.nix                |  2 ++
 pkgs/top-level/haskell-packages.nix                |  4 +++-
 4 files changed, 19 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/transformers-compat/{default.nix => 0.3.3.4.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix

diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/transformers-compat/default.nix
rename to pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix
diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix
new file mode 100644
index 00000000000..dfe9e2ef0d6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "transformers-compat";
+  version = "0.3.3";
+  sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/transformers-compat/";
+    description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 6341b9a36dd..4139c9fcb97 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -17,6 +17,7 @@
   ghcHEADPrefs = self : super : super // {
     mtl = self.mtl_2_1_2;
     cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; };
+    transformersCompat = super.transformersCompat_0_3_3;
   };
 
   ghc782Prefs = self : super : ghcHEADPrefs self super // {
@@ -44,6 +45,7 @@
     mtl = self.mtl_2_2_1;
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; };
     transformers = self.transformers_0_4_1_0; # core packagen in ghc > 7.6.x
+    transformersCompat = super.transformersCompat;
     zipArchive = super.zipArchive_0_2_2_1;    # works without binary 0.7.x
   };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c0535f5ef40..f00901f9d16 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2269,7 +2269,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   transformersBase = callPackage ../development/libraries/haskell/transformers-base {};
 
-  transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {};
+  transformersCompat_0_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.nix {};
+  transformersCompat_0_3_3_4 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.4.nix {};
+  transformersCompat = self.transformersCompat_0_3_3_4;
 
   transformersFree = callPackage ../development/libraries/haskell/transformers-free {};
 

From c027434f9fd56fafea24388c903c3047fc3dab85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:34:15 +0200
Subject: [PATCH 134/221] haskell-HTTP: don't add a global 'network' override
 for HTTP 4000.2.5

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f00901f9d16..493355e3041 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1021,7 +1021,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
   HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
-  HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; };
+  HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {};
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
   HTTP_4000_2_17 = callPackage ../development/libraries/haskell/HTTP/4000.2.17.nix {};
   HTTP = self.HTTP_4000_2_17;

From 4f2992c3fa2020dcc0bf22b25b0464fd2366acbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:36:05 +0200
Subject: [PATCH 135/221] Switch GHC 6.10.x to network 2.2.x because newer
 versions give buffering errors (according to the Cabal file from HTTP, which
 excludes newer versions from building)

---
 pkgs/top-level/haskell-defaults.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 4139c9fcb97..62d9115a665 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -114,7 +114,7 @@
     hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     OpenGLRaw = self.OpenGLRaw_1_3_0_0;
     OpenGL = self.OpenGL_2_6_0_1;
     QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };

From 3fefc29ee6a8ccbfe7a61bd2fc16fff7a6f07261 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:39:37 +0200
Subject: [PATCH 136/221] haskell-haskeline: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/haskeline/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
index 83e49e746c6..f813ddc2513 100644
--- a/pkgs/development/libraries/haskell/haskeline/default.nix
+++ b/pkgs/development/libraries/haskell/haskeline/default.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "178hzal5gqw3rmgijv9ph9xa6d4sld279z4a8cjyx3hv4azciwr4";
   buildDepends = [ filepath terminfo transformers utf8String ];
   configureFlags = "-fterminfo";
+  jailbreak = true;
   meta = {
     homepage = "http://trac.haskell.org/haskeline";
     description = "A command-line interface for user input, written in Haskell";

From 63fdb6f64f378c5eee87f958f08df1aba12a02e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:40:36 +0200
Subject: [PATCH 137/221] haskell-storable-record: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/storable-record/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
index 455d860ba5e..787956be46d 100644
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ b/pkgs/development/libraries/haskell/storable-record/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ transformers utilityHt ];
+  jailbreak = true;
   meta = {
     homepage = "http://code.haskell.org/~thielema/storable-record/";
     description = "Elegant definition of Storable instances for records";

From 84fb4b94c1063d02ff91b548ed388647fd9e79a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:41:16 +0200
Subject: [PATCH 138/221] haskell-failure: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/failure/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
index 9c0edece302..afb01673650 100644
--- a/pkgs/development/libraries/haskell/failure/default.nix
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.0.2";
   sha256 = "0hvcsn7qx00613f23vvb3vjpjlcy0nfavsai9f6s3yvmyssk5kfv";
   buildDepends = [ transformers ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Failure";
     description = "A simple type class for success/failure computations. (deprecated)";

From 0e3dfb5c71ee51e5f1240645981e0afd1501c1b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:42:05 +0200
Subject: [PATCH 139/221] * haskell-blaze-builder-enumerator: jailbreak to fix
 build with transformers 0.4.x

---
 .../libraries/haskell/blaze-builder-enumerator/default.nix       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
index 00176d215ba..f751126f142 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.0.5";
   sha256 = "0bbbv9wwzw9ss3d02mszdzxzhg6pcrnpwir9bvby7xkmfqpyffaa";
   buildDepends = [ blazeBuilder enumerator transformers ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/meiersi/blaze-builder-enumerator";
     description = "Enumeratees for the incremental conversion of builders to bytestrings";

From 1304beac01c17f52941d073a1a7dc57b37fc6367 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:53:35 +0200
Subject: [PATCH 140/221] haskell-utf8-string: patch to fix build with GHC
 6.12.x

https://github.com/glguy/utf8-string/issues/9
---
 pkgs/development/libraries/haskell/utf8-string/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
index ec946dcdbdf..1233ce8806d 100644
--- a/pkgs/development/libraries/haskell/utf8-string/default.nix
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -4,6 +4,10 @@ cabal.mkDerivation (self: {
   pname = "utf8-string";
   version = "0.3.8";
   sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0";
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
+  patchPhase = ''
+    sed -ir -e 's|Extensions: | Extensions: UndecidableInstances, |' utf8-string.cabal
+  '';
   meta = {
     homepage = "http://github.com/glguy/utf8-string/";
     description = "Support for reading and writing UTF8 Strings";

From 3584bfe0fda1bab95e1f0402f953a448721404ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:55:50 +0200
Subject: [PATCH 141/221] haskell-cabal-dev: remove obsolete package

All cabal-dev functionality has been merged into cabal-install.
---
 .../tools/haskell/cabal-dev/default.nix       | 21 -------------------
 pkgs/top-level/haskell-packages.nix           |  4 ----
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/cabal-dev/default.nix

diff --git a/pkgs/development/tools/haskell/cabal-dev/default.nix b/pkgs/development/tools/haskell/cabal-dev/default.nix
deleted file mode 100644
index fef9892bce8..00000000000
--- a/pkgs/development/tools/haskell/cabal-dev/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, setenv
-, tar, transformers, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-dev";
-  version = "0.9.2";
-  sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network setenv tar transformers zlib
-  ];
-  buildTools = [ cabalInstall ];
-  meta = {
-    homepage = "http://github.com/creswick/cabal-dev";
-    description = "Manage sandboxed Haskell build environments";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 493355e3041..fa3e2f008e5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2721,10 +2721,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
               else self.Cabal_1_18_1_3;
   };
 
-  cabalDev = callPackage ../development/tools/haskell/cabal-dev {
-    HTTP = self.HTTP.override { network = self.network_2_4_1_2; };
-  };
-
   cabalMeta = callPackage ../development/tools/haskell/cabal-meta {};
 
   cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {};

From 6bb301420ec7585b6ee18df74bf1f36383e24e0a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 11:56:42 +0200
Subject: [PATCH 142/221] haskell-data-accessor: jailbreak to fix build with
 transformers 0.4.x

---
 .../libraries/haskell/data-accessor/data-accessor.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index 8fdde66f5fd..5f6dff99dd2 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.2.5";
   sha256 = "0z63fv41cnpk3h404gprk2f5jl7rrpyv97xmsgac9zgdm5zkkhm6";
   buildDepends = [ transformers ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";
     description = "Utilities for accessing and manipulating fields of records";

From 5062c9147e7ba8ca1711f09db75cb332c9475478 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 12:12:39 +0200
Subject: [PATCH 143/221] haskell-arithmoi: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/arithmoi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
index e4d1f522bc1..c027a92c38d 100644
--- a/pkgs/development/libraries/haskell/arithmoi/default.nix
+++ b/pkgs/development/libraries/haskell/arithmoi/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.4.1.0";
   sha256 = "1xmwxmvl9l1fa2sgr4ff7al8b5d5136h4fq9r05abj3nfnx1a0iq";
   buildDepends = [ mtl random ];
+  jailbreak = true;
   meta = {
     homepage = "https://bitbucket.org/dafis/arithmoi";
     description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";

From 7c89fcc5012e16d7ec588c41468fc183ec254f50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 12:13:45 +0200
Subject: [PATCH 144/221] haskell-persistent-template: jailbreak to fix build
 with transformers 0.4.x

---
 .../libraries/haskell/persistent-template/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 994632c40e2..98f9e91e983 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     aeson hspec persistent QuickCheck text transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
     description = "Type-safe, non-relational, multi-backend persistence";

From 9dd2b3c651c623bc9ad861163769938f5cb67a98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 12:20:34 +0200
Subject: [PATCH 145/221] haskell-shelly: move version override to
 haskell-defaults.nix

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 pkgs/top-level/haskell-packages.nix | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 62d9115a665..8c232525006 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -57,6 +57,7 @@
     haddock = self.haddock_2_11_0;
     haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     scientific = self.scientific_0_2_0_2;
+    shelly = self.shelly_0_15_4_1;
   };
 
   ghc722Prefs = self : super : ghc742Prefs self super // {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fa3e2f008e5..abbdca0eef6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1936,9 +1936,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {};
   shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {};
-  shelly = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6")
-    then self.shelly_0_15_4_1
-    else self.shelly_1_5_3_1;
+  shelly = self.shelly_1_5_3_1;
 
   simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {};
 

From 22cc19e96eb67a9d9a427ff9fcba5ee3c7f16021 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 12:21:16 +0200
Subject: [PATCH 146/221] haskell-multiplate: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/multiplate/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix
index 14310f50ef6..32626ae68e6 100644
--- a/pkgs/development/libraries/haskell/multiplate/default.nix
+++ b/pkgs/development/libraries/haskell/multiplate/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.0.2";
   sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw";
   buildDepends = [ transformers ];
+  jailbreak = true;
   meta = {
     homepage = "http://haskell.org/haskellwiki/Multiplate";
     description = "Lightweight generic library for mutually recursive data types";

From 1d50ed522a87e98706de843ad459e6c4c0db8615 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 12:22:53 +0200
Subject: [PATCH 147/221] haskell-system-filepath: require at least Cabal 1.8
 to build

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 8c232525006..ff8049efc36 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -120,6 +120,7 @@
     OpenGL = self.OpenGL_2_6_0_1;
     QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    systemFilepath = super.systemFilepath.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };

From 67cfb66cea956c07436912e7332943852051aa97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 12:23:42 +0200
Subject: [PATCH 148/221] haskell-tabular: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/tabular/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix
index f90c5687193..10f78671013 100644
--- a/pkgs/development/libraries/haskell/tabular/default.nix
+++ b/pkgs/development/libraries/haskell/tabular/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.2.5";
   sha256 = "00d1f8yr7kbg30ziv09pb8f4apcvrfb6izb26my1s97kw9ixa740";
   buildDepends = [ csv html mtl ];
+  jailbreak = true;
   meta = {
     homepage = "http://hub.darcs.net/kowey/tabular";
     description = "Two-dimensional data tables with rendering functions";

From c7a18e326fb06f66c6c0e127e6f3c7e3ae29cd72 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 14:39:03 +0200
Subject: [PATCH 149/221] Stick to transformers 0.3.x everywhere; the new
 versions breaks just about every other package that we have.

---
 pkgs/top-level/haskell-defaults.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index ff8049efc36..d0892ccf0d8 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -42,10 +42,8 @@
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
     modularArithmetic = null;           # requires base >= 4.7
-    mtl = self.mtl_2_2_1;
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; };
-    transformers = self.transformers_0_4_1_0; # core packagen in ghc > 7.6.x
-    transformersCompat = super.transformersCompat;
+    transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
     zipArchive = super.zipArchive_0_2_2_1;    # works without binary 0.7.x
   };
 

From fdee6e37a6d37fd610288833b7ad89fbeca29ee9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:30 +0200
Subject: [PATCH 150/221] haskell-BlogLiterately: update to version 0.7.1.7

---
 pkgs/development/libraries/haskell/BlogLiterately/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix
index e4005ed4ec0..7d5c01f64bf 100644
--- a/pkgs/development/libraries/haskell/BlogLiterately/default.nix
+++ b/pkgs/development/libraries/haskell/BlogLiterately/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "BlogLiterately";
-  version = "0.7.1.6";
-  sha256 = "0mzq0br9jsymml57kcxqyr401lckzm43fy74l3wy25n6grv64hd4";
+  version = "0.7.1.7";
+  sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 056b9ba32ff597dc41db537e74be739fb6e375c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:32 +0200
Subject: [PATCH 151/221] haskell-adjunctions: update to version 4.1.0.1

---
 .../libraries/haskell/adjunctions/default.nix         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix
index d0804959ccb..74e564af62a 100644
--- a/pkgs/development/libraries/haskell/adjunctions/default.nix
+++ b/pkgs/development/libraries/haskell/adjunctions/default.nix
@@ -1,14 +1,15 @@
 { cabal, comonad, contravariant, distributive, free, mtl
-, semigroupoids, semigroups, tagged, transformers, void
+, profunctors, semigroupoids, semigroups, tagged, transformers
+, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "adjunctions";
-  version = "4.0.3";
-  sha256 = "0rh3vffbq407k9g95dingw6zqq3fk87pknyrqj1mrbmgrnllr8k0";
+  version = "4.1.0.1";
+  sha256 = "18p2pabid7dx96qcpd2ywv5mhjp55srhm5g013pn697jcxyq2xiv";
   buildDepends = [
-    comonad contravariant distributive free mtl semigroupoids
-    semigroups tagged transformers void
+    comonad contravariant distributive free mtl profunctors
+    semigroupoids semigroups tagged transformers void
   ];
   meta = {
     homepage = "http://github.com/ekmett/adjunctions/";

From e77179fd448d72f26b7d6c05e7794b7e525af27d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:33 +0200
Subject: [PATCH 152/221] haskell-conduit: update to version 1.1.5

---
 pkgs/development/libraries/haskell/conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 48422e602b2..07f43f0eda8 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.4";
-  sha256 = "1fw55rmmhznkpbblc7gqy463lza7fi9yr0n27g38afdfql8mz5mm";
+  version = "1.1.5";
+  sha256 = "107mfkw2jin724cdkn5mkhxgfv2mf1nkhcn12mwaw9cnkxxxx78z";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void

From 1538d3ff108ecc15b3e9ef5814124f274c53c4b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:35 +0200
Subject: [PATCH 153/221] haskell-io-streams: update to version 1.1.4.6

---
 pkgs/development/libraries/haskell/io-streams/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix
index 1fc49e1c068..864c0cdddae 100644
--- a/pkgs/development/libraries/haskell/io-streams/default.nix
+++ b/pkgs/development/libraries/haskell/io-streams/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-streams";
-  version = "1.1.4.5";
-  sha256 = "1w76p9hb83x2fjlldcnbk3zddaph4cccka2g13b1rcjssqgnbk8h";
+  version = "1.1.4.6";
+  sha256 = "0vn6vlgfapmyd9y87i9i0y480w8w81xd3lnhh66a6lalskd4bjdw";
   buildDepends = [
     attoparsec blazeBuilder network primitive text time transformers
     vector zlibBindings

From 948669f683d127abe1e3481890fc73ab4d077acf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:36 +0200
Subject: [PATCH 154/221] haskell-linear: update to version 1.10.1.2

---
 pkgs/development/libraries/haskell/linear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
index a1837b4baab..ce9fe66a126 100644
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ b/pkgs/development/libraries/haskell/linear/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "linear";
-  version = "1.10.1.1";
-  sha256 = "0falp5mpd9lifzz11dy3lvfph8n0i8n4mh5kk5kg974qvdvjilgq";
+  version = "1.10.1.2";
+  sha256 = "05zbqdcdjq7anng2nymy05wsnk9qpk8mgivqcndbfjpk4l1r9k94";
   buildDepends = [
     adjunctions binary distributive hashable lens reflection
     semigroupoids semigroups tagged transformers unorderedContainers

From 471dd8d1f0c652f73125aecfbf966772c7d8ff04 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:38 +0200
Subject: [PATCH 155/221] haskell-pgm: update to version 0.1.4

---
 pkgs/development/libraries/haskell/pgm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix
index b1be8dd6d03..560826a08b2 100644
--- a/pkgs/development/libraries/haskell/pgm/default.nix
+++ b/pkgs/development/libraries/haskell/pgm/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "pgm";
-  version = "0.1.3";
-  sha256 = "1byq8bacqgdpahf57ccwwa45wf9ij0kkgp89rg9flsv1g10364d4";
+  version = "0.1.4";
+  sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
   buildDepends = [ parsec ];
   meta = {
-    homepage = "https://github.com/sergeyastanin/haskell-pgm";
+    homepage = "https://github.com/astanin/haskell-pgm";
     description = "Pure Haskell implementation of PGM image format";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 4e02b6ca9f4cd6e78ebd8987fb5ab99f29c7e8cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:39 +0200
Subject: [PATCH 156/221] haskell-shake: update to version 0.13.1

---
 pkgs/development/libraries/haskell/shake/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index a2b8cc24e65..f07e0f54b9b 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -16,7 +16,6 @@ cabal.mkDerivation (self: {
     binary deepseq filepath hashable QuickCheck random time
     transformers unorderedContainers utf8String
   ];
-  doCheck = !self.stdenv.isDarwin;
   meta = {
     homepage = "https://github.com/ndmitchell/shake";
     description = "Build system library, like Make, but more accurate dependencies";

From 3bb029e9a1ee2a0fbaa5061a0f7856a6a1e6e92f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:43 +0200
Subject: [PATCH 157/221] haskell-vinyl: update to version 0.4.1

---
 pkgs/development/libraries/haskell/vinyl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix
index 52db901c495..725567ff16b 100644
--- a/pkgs/development/libraries/haskell/vinyl/default.nix
+++ b/pkgs/development/libraries/haskell/vinyl/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vinyl";
-  version = "0.4";
-  sha256 = "16v13bd5dvm9axngx1pvm7bq9412f6awz0cggsif1z0dy2kjpwgb";
+  version = "0.4.1";
+  sha256 = "1x8kxb4z4nj7h6pbl0r37rr7k88ly64cn0bf7izyaqjrsf0kxdci";
   testDepends = [ doctest lens singletons ];
   meta = {
     description = "Extensible Records";

From 9e4254a84f4ad3d6ef4b439ef10c6d695c2928de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 11:36:44 +0200
Subject: [PATCH 158/221] haskell-yesod: update to version 1.2.5.3

---
 pkgs/development/libraries/haskell/yesod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index a3416cf59c6..630b04af26b 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.2.5.2";
-  sha256 = "0vvpzyfwzgnnd8h60pqz5z1474isp487p43vx7cyzhj423c50p6r";
+  version = "1.2.5.3";
+  sha256 = "1w9bbvinnbnhrajjqj6yhy9dgggdf6n98x04dys45anssiwrd2ss";
   buildDepends = [
     aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger
     hamlet monadControl monadLogger networkConduit safe shakespeare

From 1a1c1ba734a7351079b5a5473129ae59d497c20b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:24:57 +0200
Subject: [PATCH 159/221] haskell-git-annex: update to version 5.20140606

---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 24f993b8812..217e4067cb9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -16,8 +16,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140529";
-  sha256 = "18fb0gb38wcdbdz2rlg5vn99gfi1c8hflgcpz96lx4rg2pl8jpf8";
+  version = "5.20140606";
+  sha256 = "1b9hslkdv82lf8njwzy51yj8dgg2wn7g08wy73lk7pnddfh8qjpy";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From d9344b772351bd4a3a24235113f97d6a2b9a96d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:24:59 +0200
Subject: [PATCH 160/221] haskell-conduit: update to version 1.1.6

---
 pkgs/development/libraries/haskell/conduit/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 07f43f0eda8..630e9610bbb 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,13 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.5";
-  sha256 = "107mfkw2jin724cdkn5mkhxgfv2mf1nkhcn12mwaw9cnkxxxx78z";
+  version = "1.1.6";
+  sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void
   ];
-  testDepends = [ hspec mtl QuickCheck resourcet transformers void ];
+  testDepends = [
+    exceptions hspec mtl QuickCheck resourcet transformers void
+  ];
   doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From ddb6bb8d4fddf7e8a1472938aabaddaa0e6dead3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:00 +0200
Subject: [PATCH 161/221] haskell-dbmigrations: update to version 0.8

---
 pkgs/development/libraries/haskell/dbmigrations/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix
index 008cb04f2fa..f8efb953799 100644
--- a/pkgs/development/libraries/haskell/dbmigrations/default.nix
+++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dbmigrations";
-  version = "0.7";
-  sha256 = "1mpmka6jszip8sm8k9mrk0fg1q7wp36n0szyiqy7fnbzijfw0xlz";
+  version = "0.8";
+  sha256 = "0m1zvc61y0n7p66iwsb8wzwgivxnc08cm1h3xvf1jnwrv294dwch";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From b23949f2d70fb48c85e994ca11c5b0985fd38d57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:02 +0200
Subject: [PATCH 162/221] haskell-ekg-core: update to version 0.1.0.1

---
 pkgs/development/libraries/haskell/ekg-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix
index 6c332f832cd..759a6040746 100644
--- a/pkgs/development/libraries/haskell/ekg-core/default.nix
+++ b/pkgs/development/libraries/haskell/ekg-core/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ekg-core";
-  version = "0.1.0.0";
-  sha256 = "19ghqj9zbb198d45bw7k9mlf2z57yq74wgbkp62b9li2ndbcpdzh";
+  version = "0.1.0.1";
+  sha256 = "1zha9r43nalxdw22s79mf89fwfzi8lq0q9ldhw7f6c63dnwxyjja";
   buildDepends = [ text unorderedContainers ];
   meta = {
     homepage = "https://github.com/tibbe/ekg-core";

From 66e3410c4d520a0088f6d3c3ee0f8e2927cfa79e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:03 +0200
Subject: [PATCH 163/221] haskell-failure: update to version 0.2.0.3

---
 pkgs/development/libraries/haskell/failure/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
index afb01673650..4181883f7b0 100644
--- a/pkgs/development/libraries/haskell/failure/default.nix
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "failure";
-  version = "0.2.0.2";
-  sha256 = "0hvcsn7qx00613f23vvb3vjpjlcy0nfavsai9f6s3yvmyssk5kfv";
+  version = "0.2.0.3";
+  sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
   buildDepends = [ transformers ];
   jailbreak = true;
   meta = {

From f4f89ce91d712fa89bcad630d50f1113db392530 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:05 +0200
Subject: [PATCH 164/221] haskell-ghcjs-dom: update to version 0.0.9

---
 pkgs/development/libraries/haskell/ghcjs-dom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
index 20fc85b95f1..2c9770b20e3 100644
--- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
+++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghcjs-dom";
-  version = "0.0.7";
-  sha256 = "1yg2c0slndg3y9bk95xkbgl8zp4lmcgw9wk3jkk1sdizn3y3yggq";
+  version = "0.0.9";
+  sha256 = "0vphhm9wr80p4brcjzhmp2kh0a5rlwzif26w2q054fshxa97kv2a";
   buildDepends = [ ghcjsBase mtl ];
   meta = {
     description = "DOM library that supports both GHCJS and WebKitGTK";

From 88413cdaa543c995cb808d2080cb557aca24a612 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:06 +0200
Subject: [PATCH 165/221] haskell-hoauth2: update to version 0.4.0

---
 .../libraries/haskell/hoauth2/default.nix          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix
index 949e1bdfc59..fa0a913e181 100644
--- a/pkgs/development/libraries/haskell/hoauth2/default.nix
+++ b/pkgs/development/libraries/haskell/hoauth2/default.nix
@@ -1,14 +1,16 @@
-{ cabal, aeson, bytestringShow, conduit, httpConduit, httpTypes
-, monadControl, mtl, random, resourcet, text, transformers
+{ cabal, aeson, bytestringShow, httpConduit, httpTypes
+, monadControl, mtl, random, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hoauth2";
-  version = "0.3.7";
-  sha256 = "0v43hr7vw2iikhx2bldkb0fa5j95msgn7s7k09vkxz3qwqh9maz7";
+  version = "0.4.0";
+  sha256 = "1499rgcn3h4921x21s6l0spnjf3wvmsaa07pimgjgb4rjib3z2d5";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
-    aeson bytestringShow conduit httpConduit httpTypes monadControl mtl
-    random resourcet text transformers
+    aeson bytestringShow httpConduit httpTypes monadControl mtl random
+    text transformers
   ];
   meta = {
     homepage = "https://github.com/freizl/hoauth2";

From d72b09eaa910f1062cbe03db2f787654b0b54ae7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:07 +0200
Subject: [PATCH 166/221] haskell-libjenkins: update to version 0.4.3.0

---
 .../libraries/haskell/libjenkins/default.nix      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix
index 67f0b698d47..fc7c8b37323 100644
--- a/pkgs/development/libraries/haskell/libjenkins/default.nix
+++ b/pkgs/development/libraries/haskell/libjenkins/default.nix
@@ -1,24 +1,23 @@
 { cabal, async, conduit, doctest, filepath, free, hspec
 , hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens
-, monadControl, network, text, transformers, xmlConduit
+, monadControl, network, resourcet, text, transformers, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "libjenkins";
-  version = "0.4.2.0";
-  sha256 = "11013klk2gvcaf2d2gmi0bf3jg2m82li19szqlwb325kdjmdf546";
-  patches = [ ./new-conduit.patch ];
+  version = "0.4.3.0";
+  sha256 = "18z1yaf1a1ncvflxzv96b35d44933yrmsmxv5dr87iyfry28qbnv";
   buildDepends = [
     async conduit free httpClient httpConduit httpTypes lens
-    monadControl network text transformers xmlConduit
+    monadControl network resourcet text transformers xmlConduit
   ];
   testDepends = [
     async conduit doctest filepath free hspec hspecExpectationsLens
-    httpClient httpConduit httpTypes lens monadControl network text
-    transformers xmlConduit
+    httpClient httpConduit httpTypes lens monadControl network
+    resourcet text transformers xmlConduit
   ];
-  doCheck = false;
   jailbreak = true;
+  doCheck = false;
   meta = {
     description = "Jenkins API interface";
     license = self.stdenv.lib.licenses.bsd3;

From 5e458d55707bc4965033c637eecc721a7f294bf0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:09 +0200
Subject: [PATCH 167/221] haskell-mono-traversable: update to version 0.6.0.2

---
 .../libraries/haskell/mono-traversable/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index 60cb273d3a3..b8acec758de 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.6.0.1";
-  sha256 = "0pxmkz5jq511ys77sq2zxmgab7njrhbi01x51lf247z8ii0rdbns";
+  version = "0.6.0.2";
+  sha256 = "1ckdx8szllk4np5samfdx7l6lzarmfabm8w4210b5m7yms2w98sy";
   buildDepends = [
     comonad dlist dlistInstances hashable semigroupoids semigroups text
     transformers unorderedContainers vector vectorAlgorithms

From eac3634da3f36426f4ae0ed6ae5fff7ddff1eac9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:10 +0200
Subject: [PATCH 168/221] haskell-persistent-template: update to version
 1.3.1.4

---
 .../libraries/haskell/persistent-template/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 98f9e91e983..b967e17f8f7 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "1.3.1.3";
-  sha256 = "0q5ysv1r6p4mg79waq2g6ql11rap6znawkplddblpaa8lq9qalj6";
+  version = "1.3.1.4";
+  sha256 = "1ys5s1vb9w3nrv9kwvzgjwfs2j09pslpplz05idpfn02xx03hcfk";
   buildDepends = [
     aeson monadControl monadLogger persistent text transformers
     unorderedContainers

From 5be634fab543b5d6841277ded38084c3d0e0efb7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:12 +0200
Subject: [PATCH 169/221] haskell-purescript: update to version 0.5.2.2

---
 pkgs/development/libraries/haskell/purescript/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
index bbf380f3e73..8e23a0cf8f2 100644
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -5,15 +5,15 @@
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.5.2.1";
-  sha256 = "1dr34capgjlyjsaghsv11zz6ph5l0y8dz0q398f0f3hplcal3f58";
+  version = "0.5.2.2";
+  sha256 = "07gkd897qcgn7yf81bii5njkiq1hlhfz5jx3spdlv64a492grmg2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     cmdtheline filepath haskeline monadUnify mtl parsec patternArrows
     time transformers unorderedContainers utf8String xdgBasedir
   ];
-  # The example don't seem to get packaged in the release.
+  testDepends = [ filepath mtl parsec transformers utf8String ];
   doCheck = false;
   meta = {
     homepage = "http://www.purescript.org/";

From 5043062e6891ae5141486545fd36931996a897f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:13 +0200
Subject: [PATCH 170/221] haskell-resource-pool: update to version 0.2.3.0

---
 pkgs/development/libraries/haskell/resource-pool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
index 677243190b1..72178ddc1cf 100644
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ b/pkgs/development/libraries/haskell/resource-pool/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resource-pool";
-  version = "0.2.2.0";
-  sha256 = "0h00q6lmv21nqjs81r7y3ig4y65zpap1r6xqz9lc3zxx29bgl8xk";
+  version = "0.2.3.0";
+  sha256 = "15igbvnqs6ig1k30l3jngyi60ay7k15mwgza5smv8zbpx86vb1mh";
   buildDepends = [
     hashable monadControl stm time transformers transformersBase vector
   ];

From 7ac38497121c576548f65fc54c6e73f52b97857e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:15 +0200
Subject: [PATCH 171/221] haskell-snap: update to version 0.13.2.7

---
 pkgs/development/libraries/haskell/snap/snap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index ecbb5da37a7..97e4a4d67a5 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.13.2.6";
-  sha256 = "0f9m8rvciis16w211hfrablh3xzxwcqqsgvfc34j70lazj3kigs3";
+  version = "0.13.2.7";
+  sha256 = "1vw8c48rb1clahm1yw951si9dv9mk0gfldxvk3jd7rvsfzg97s4z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 6aea9b49cac9d5c758544546c457f3d418ff86fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:16 +0200
Subject: [PATCH 172/221] haskell-threads: update to version 0.5.1.2

---
 pkgs/development/libraries/haskell/threads/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix
index 932ef113fa7..48b4ee2fb11 100644
--- a/pkgs/development/libraries/haskell/threads/default.nix
+++ b/pkgs/development/libraries/haskell/threads/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "threads";
-  version = "0.5.1.1";
-  sha256 = "196yjkq7wgjcck9wqj4f3x3k47ls9yiay3k6d8k7kzixc2xc621z";
+  version = "0.5.1.2";
+  sha256 = "1bq2aza6sam4zkgpgf8x4lhkk2na1i8annx9cwad3j68p5vdg929";
   buildDepends = [ baseUnicodeSymbols stm ];
   testDepends = [
     baseUnicodeSymbols concurrentExtra HUnit stm testFramework

From 717fe5e3e4f29a8305550bc0256ff5a384fb12dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:25:18 +0200
Subject: [PATCH 173/221] haskell-threadscope: update to version 0.2.4

---
 pkgs/development/tools/haskell/threadscope/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
index afc904ecf95..1158221ad1a 100644
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "threadscope";
-  version = "0.2.3";
-  sha256 = "07kbkcckxfsb50zks8jgw2g0ary63hymicq5lqrm5jjaarjb80gr";
+  version = "0.2.4";
+  sha256 = "1208gp80vj3dngc4nrj1jk5y4h1181bgwq2qj764kcjvkaxch599";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From b134e2a0fd397d2580ad8c998be8d5b494408ad4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:32:22 +0200
Subject: [PATCH 174/221] haskell-defaults.nix: don't provide singletons on
 pre-7.8.x platforms

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index d0892ccf0d8..fb6094fa781 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -43,6 +43,7 @@
     haddock = self.haddock_2_13_2;
     modularArithmetic = null;           # requires base >= 4.7
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; };
+    singletons = null;                  # requires base >= 4.7
     transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
     zipArchive = super.zipArchive_0_2_2_1;    # works without binary 0.7.x
   };

From 40eb5a5f739bf6ca88748f2e7de95d4a16e6e2cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:32:47 +0200
Subject: [PATCH 175/221] haskell-system-fileio: require Cabal >= 1.8

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index fb6094fa781..959fa331c05 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -120,6 +120,7 @@
     QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     systemFilepath = super.systemFilepath.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    systemFileio = super.systemFileio.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };

From f085cf39993a64c58e44eca50c37053d96b6115e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:49:07 +0200
Subject: [PATCH 176/221] haskell-snap: jailbreak to fix build with lens 4.2

---
 pkgs/development/libraries/haskell/snap/snap.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 97e4a4d67a5..435bccd9cb5 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -20,6 +20,9 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorAlgorithms xmlhtml
   ];
   jailbreak = true;
+  patchPhase = ''
+    sed -i -e 's|lens .*< 4.2|lens|' snap.cabal
+  '';
   meta = {
     homepage = "http://snapframework.com/";
     description = "Top-level package for the Snap Web Framework";

From 6071b304ef7fe8f848322ad4baf24889542483c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 09:52:41 +0200
Subject: [PATCH 177/221] haskell-cabal-lenses: jailbreak to fix build

---
 pkgs/development/libraries/haskell/cabal-lenses/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
index 06777aadc4d..39c0eeb1dd1 100644
--- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.1";
   sha256 = "0jss4h7crh7mndl5ghbpziy37cg9i29cc64fgxvxb63hpk0q2m17";
   buildDepends = [ Cabal lens unorderedContainers ];
+  jailbreak = true;
   meta = {
     description = "Lenses and traversals for the Cabal library";
     license = self.stdenv.lib.licenses.bsd3;

From 766d934090f52adb9e932f04d9a90aa7c86b4ac7 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tom@copilotlabs.com>
Date: Sun, 8 Jun 2014 23:56:52 -0400
Subject: [PATCH 178/221] haskell-cabal-cargs: add version 0.6.1

---
 .../libraries/haskell/cabal-cargs/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/cabal-cargs/default.nix

diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
new file mode 100644
index 00000000000..243dd2beb00
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
@@ -0,0 +1,23 @@
+{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens
+, strict, systemFileio, systemFilepath, tasty, tastyGolden, text
+, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-cargs";
+  version = "0.6.1";
+  sha256 = "1bf903kgs16f054crwq0yyp6ijch80qn3d5ksy4j0fnyxxrdqvsa";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    Cabal cabalLenses cmdargs either lens strict systemFileio
+    systemFilepath text transformers unorderedContainers
+  ];
+  testDepends = [ filepath tasty tastyGolden ];
+  meta = {
+    description = "A command line program for extracting compiler arguments from a cabal file";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.tomberek ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index abbdca0eef6..b282ff44e41 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -326,6 +326,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {};
   Cabal = null;                 # core package since forever
 
+  cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {};
+
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
 
   cabalLenses = callPackage ../development/libraries/haskell/cabal-lenses {};

From c7e1a2c5cc01371767bf033fd78999b87d2f939a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 10:03:56 +0200
Subject: [PATCH 179/221] haskell-cabal-cargs: jailbreak to fix build with
 recent versions of either, lens, and tasty

https://github.com/dan-t/cabal-cargs/issues/3
---
 pkgs/development/libraries/haskell/cabal-cargs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
index 243dd2beb00..34759c9b892 100644
--- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     systemFilepath text transformers unorderedContainers
   ];
   testDepends = [ filepath tasty tastyGolden ];
+  jailbreak = true;
   meta = {
     description = "A command line program for extracting compiler arguments from a cabal file";
     license = self.stdenv.lib.licenses.bsd3;

From f481b682b6312f454e246629f2ff6de08f994760 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 6 Jun 2014 23:55:42 +0200
Subject: [PATCH 180/221] test-framework-smallcheck: 0.2

---
 .../haskell/test-framework-smallcheck/default.nix  | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix

diff --git a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix
new file mode 100644
index 00000000000..120425e8c01
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix
@@ -0,0 +1,14 @@
+{ cabal, smallcheck, testFramework, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "test-framework-smallcheck";
+  version = "0.2";
+  sha256 = "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0";
+  buildDepends = [ smallcheck testFramework transformers ];
+  meta = {
+    homepage = "https://github.com/feuerbach/smallcheck";
+    description = "Support for SmallCheck tests in test-framework";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b282ff44e41..28bd1b4b535 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2186,6 +2186,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {};
 
+  testFrameworkSmallcheck = callPackage ../development/libraries/haskell/test-framework-smallcheck {};
+
   testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {};
 
   testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {};

From 3287542c579d4a93b11b7dfc28a66f54997728e8 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 6 Jun 2014 23:56:29 +0200
Subject: [PATCH 181/221] haskell-vty: add version 5.1.0

---
 .../haskell/vty/{default.nix => 4.7.5.nix}    |  0
 .../libraries/haskell/vty/5.1.0.nix           | 32 +++++++++++++++++++
 pkgs/top-level/haskell-defaults.nix           |  1 +
 pkgs/top-level/haskell-packages.nix           |  4 ++-
 4 files changed, 36 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/vty/{default.nix => 4.7.5.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/vty/5.1.0.nix

diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/vty/default.nix
rename to pkgs/development/libraries/haskell/vty/4.7.5.nix
diff --git a/pkgs/development/libraries/haskell/vty/5.1.0.nix b/pkgs/development/libraries/haskell/vty/5.1.0.nix
new file mode 100644
index 00000000000..fc2f0256d7f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vty/5.1.0.nix
@@ -0,0 +1,32 @@
+{ cabal, blazeBuilder, Cabal, dataDefault, deepseq, filepath
+, hashable, HUnit, lens, mtl, parallel, parsec, QuickCheck
+, quickcheckAssertions, random, smallcheck, stringQq, terminfo
+, testFramework, testFrameworkHunit, testFrameworkSmallcheck, text
+, transformers, utf8String, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "vty";
+  version = "5.1.0";
+  sha256 = "0cq9y802z9wq69yw1yy916xsz6j7v8208k5mxixp41375cdm141x";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeBuilder dataDefault deepseq filepath hashable lens mtl
+    parallel parsec terminfo text transformers utf8String vector
+  ];
+  testDepends = [
+    blazeBuilder Cabal dataDefault deepseq HUnit lens mtl QuickCheck
+    quickcheckAssertions random smallcheck stringQq terminfo
+    testFramework testFrameworkHunit testFrameworkSmallcheck text
+    utf8String vector
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "https://github.com/coreyoconnor/vty";
+    description = "A simple terminal UI library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 959fa331c05..d002503d0c7 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -44,6 +44,7 @@
     modularArithmetic = null;           # requires base >= 4.7
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; };
     singletons = null;                  # requires base >= 4.7
+    vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; };
     transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
     zipArchive = super.zipArchive_0_2_2_1;    # works without binary 0.7.x
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 28bd1b4b535..e63e4936700 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2397,7 +2397,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   void = callPackage ../development/libraries/haskell/void {};
 
-  vty = callPackage ../development/libraries/haskell/vty {};
+  vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {};
+  vty_5_1_0 = callPackage ../development/libraries/haskell/vty/5.1.0.nix {};
+  vty = self.vty_4_7_5;
 
   vtyUi = callPackage ../development/libraries/haskell/vty-ui {};
 

From b3c9513efe2aafe840a45923c5a903cfd6893e55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 10:14:21 +0200
Subject: [PATCH 182/221] haskell-vty-5.1.0: jailbreak to fix build with lens
 4.2

---
 pkgs/development/libraries/haskell/vty/5.1.0.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/vty/5.1.0.nix b/pkgs/development/libraries/haskell/vty/5.1.0.nix
index fc2f0256d7f..b04f7ff33ed 100644
--- a/pkgs/development/libraries/haskell/vty/5.1.0.nix
+++ b/pkgs/development/libraries/haskell/vty/5.1.0.nix
@@ -21,6 +21,7 @@ cabal.mkDerivation (self: {
     testFramework testFrameworkHunit testFrameworkSmallcheck text
     utf8String vector
   ];
+  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/coreyoconnor/vty";

From 20da5ecc9cce6bf8852abd493c7fe7c1e2609f1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 10:25:45 +0200
Subject: [PATCH 183/221] haskell-parsers: update to version 0.11.0.2

Unfortunately, there are still build errors with this package (see
https://github.com/ekmett/parsers/issues/39). We need the latest
version, though, because older ones won't work with the latest
attoparsec.
---
 .../libraries/haskell/parsers/{0.11.0.1.nix => 0.11.0.2.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/parsers/{0.11.0.1.nix => 0.11.0.2.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/parsers/0.11.0.1.nix b/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/parsers/0.11.0.1.nix
rename to pkgs/development/libraries/haskell/parsers/0.11.0.2.nix
index f24c96b1fad..36c5f2ae998 100644
--- a/pkgs/development/libraries/haskell/parsers/0.11.0.1.nix
+++ b/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parsers";
-  version = "0.11.0.1";
-  sha256 = "0jg91zzsq12vxxsxrd1kx8h2c06asccymjbpx0zl7nvj5dhjfkpq";
+  version = "0.11.0.2";
+  sha256 = "0b2qb6lhn647926s2g7qrzhnvnym5dr7fny784bv19mfvimwi81c";
   buildDepends = [
     attoparsec charset parsec text transformers unorderedContainers
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e63e4936700..3c3ee8e7f80 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1644,8 +1644,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   parsec = self.parsec_3_1_5;
 
   parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
-  parsers_0_11_0_1 = callPackage ../development/libraries/haskell/parsers/0.11.0.1.nix {};
-  parsers = self.parsers_0_11_0_1;
+  parsers_0_11_0_2 = callPackage ../development/libraries/haskell/parsers/0.11.0.2.nix {};
+  parsers = self.parsers_0_11_0_2;
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 

From 1986a10d41c9206b684539125373f2e1d7114a5e Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 9 Jun 2014 03:58:18 -0500
Subject: [PATCH 184/221] cabal-db: new expression

---
 .../tools/haskell/cabal-db/default.nix        | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/cabal-db/default.nix

diff --git a/pkgs/development/tools/haskell/cabal-db/default.nix b/pkgs/development/tools/haskell/cabal-db/default.nix
new file mode 100644
index 00000000000..0d8b6ce5993
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal-db/default.nix
@@ -0,0 +1,20 @@
+{ cabal, ansiWlPprint, Cabal, filepath, mtl, optparseApplicative
+, tar, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-db";
+  version = "0.1.9";
+  sha256 = "19mw5ycc2y5wkn1h7wkdm2gb29pq2sh0n8z52dbxlkf0rwcgjbfq";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    ansiWlPprint Cabal filepath mtl optparseApplicative tar utf8String
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/cabal-db";
+    description = "query tools for the local cabal database (revdeps, graph, info, search-by, license, bounds)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3c3ee8e7f80..9d6fb908017 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2692,6 +2692,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   # Tools.
 
+  cabalDb = callPackage ../development/tools/haskell/cabal-db {};
+
   cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
 
   # Build a cabal package given a local .cabal file

From 0e400be1ecc9eb08911ad6d2e348f28a698516c7 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 9 Jun 2014 03:58:34 -0500
Subject: [PATCH 185/221] haskell-RepLib: do not build haddocks

---
 pkgs/development/libraries/haskell/RepLib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index 89e13f1eddc..769a1d534ba 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.5.3.3";
   sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
   buildDepends = [ mtl typeEquality ];
+  noHaddock = true;
   meta = {
     homepage = "http://code.google.com/p/replib/";
     description = "Generic programming library with representation types";

From 208d466c21cd51e64ef9b8a32462af9b2991d78d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 9 Jun 2014 11:26:22 +0200
Subject: [PATCH 186/221] nixos/graphite-service: make option descriptions end
 with '.'

Because that is how it is supposed to be.
---
 .../modules/services/monitoring/graphite.nix  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 3a5b13d6d40..8ef6b8d029e 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -47,19 +47,19 @@ in {
 
     web = {
       enable = mkOption {
-        description = "Whether to enable graphite web frontend";
+        description = "Whether to enable graphite web frontend.";
         default = false;
         type = types.uniq types.bool;
       };
 
       host = mkOption {
-        description = "Graphite web frontend listen address";
+        description = "Graphite web frontend listen address.";
         default = "127.0.0.1";
         type = types.str;
       };
 
       port = mkOption {
-        description = "Graphite web frontend port";
+        description = "Graphite web frontend port.";
         default = 8080;
         type = types.int;
       };
@@ -67,7 +67,7 @@ in {
 
     carbon = {
       config = mkOption {
-        description = "Content of carbon configuration file";
+        description = "Content of carbon configuration file.";
         default = ''
           [cache]
           # Listen on localhost by default for security reasons
@@ -83,13 +83,13 @@ in {
       };
 
       enableCache = mkOption {
-        description = "Whether to enable carbon cache, the graphite storage daemon";
+        description = "Whether to enable carbon cache, the graphite storage daemon.";
         default = false;
         type = types.uniq types.bool;
       };
 
       storageAggregation = mkOption {
-        description = "Defines how to aggregate data to lower-precision retentions";
+        description = "Defines how to aggregate data to lower-precision retentions.";
         default = null;
         type = types.uniq (types.nullOr types.string);
         example = ''
@@ -101,7 +101,7 @@ in {
       };
 
       storageSchemas = mkOption {
-        description = "Defines retention rates for storing metrics";
+        description = "Defines retention rates for storing metrics.";
         default = "";
         type = types.uniq (types.nullOr types.string);
         example = ''
@@ -112,21 +112,24 @@ in {
       };
 
       blacklist = mkOption {
-        description = "Any metrics received which match one of the experssions will be dropped";
+        description = "Any metrics received which match one of the experssions will be dropped.";
         default = null;
         type = types.uniq (types.nullOr types.string);
         example = "^some\.noisy\.metric\.prefix\..*";
       };
 
       whitelist = mkOption {
-        description = "Only metrics received which match one of the experssions will be persisted";
+        description = "Only metrics received which match one of the experssions will be persisted.";
         default = null;
         type = types.uniq (types.nullOr types.string);
         example = ".*";
       };
 
       rewriteRules = mkOption {
-        description = "Regular expression patterns that can be used to rewrite metric names in a search and replace fashion";
+        description = ''
+          Regular expression patterns that can be used to rewrite metric names
+          in a search and replace fashion.
+        '';
         default = null;
         type = types.uniq (types.nullOr types.string);
         example = ''
@@ -137,7 +140,7 @@ in {
       };
 
       enableRelay = mkOption {
-        description = "Whether to enable carbon relay, the carbon replication and sharding service";
+        description = "Whether to enable carbon relay, the carbon replication and sharding service.";
         default = false;
         type = types.uniq types.bool;
       };
@@ -154,13 +157,13 @@ in {
       };
 
       enableAggregator = mkOption {
-        description = "Whether to enable carbon agregator, the carbon buffering service";
+        description = "Whether to enable carbon agregator, the carbon buffering service.";
         default = false;
         type = types.uniq types.bool;
       };
 
       aggregationRules = mkOption {
-        description = "Defines if and how received metrics will be agregated";
+        description = "Defines if and how received metrics will be agregated.";
         default = null;
         type = types.uniq (types.nullOr types.string);
         example = ''

From 054a3c0321d7c7894eac7562e4405edea159223f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 9 Jun 2014 11:29:05 +0200
Subject: [PATCH 187/221] nixos/graphite-service: clean up restartTriggers

Currently, the restartTriggers are abusing the systemd unit file in that
the cfg.carbon.config/storageAggregation/... option text is pasted into
the unit file. Even though this sort-of works (the service is restarted
if the config changes) this causes systemd to print error messages about
invalid sections (rightfully so!).

The correct use of restartTriggers is to list storage paths, which is
what this change does. If any of the
cfg.carbon/config/storageAggregation/... options change, configDir will
get a new hash. It is not as "fine grained" as the current version, but
it is not abusing the interface.

Also, remove unneeded 'waitress' in one of the restartTriggers, because
it is already listed as part of the service config.
---
 nixos/modules/services/monitoring/graphite.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 8ef6b8d029e..dbfe0ee182a 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -191,10 +191,7 @@ in {
       };
       restartTriggers = [
         pkgs.pythonPackages.carbon
-        cfg.carbon.config
-        cfg.carbon.storageAggregation
-        cfg.carbon.storageSchemas
-        cfg.carbon.rewriteRules
+        configDir
       ];
       preStart = ''
         mkdir -p ${cfg.dataDir}/whisper
@@ -215,7 +212,8 @@ in {
         Group = "graphite";
       };
       restartTriggers = [
-        pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.aggregationRules
+        pkgs.pythonPackages.carbon
+        configDir
       ];
     };
 
@@ -231,7 +229,8 @@ in {
         Group = "graphite";
       };
       restartTriggers = [
-        pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.relayRules
+        pkgs.pythonPackages.carbon
+        configDir
       ];
     };
 
@@ -274,7 +273,6 @@ in {
       '';
       restartTriggers = [
         pkgs.python27Packages.graphite_web
-        pkgs.python27Packages.waitress
       ];
     };
 

From 977d43f6c536d5d7fe6969854a0b53f62cfd648d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 12:56:04 +0200
Subject: [PATCH 188/221] cran-packages.nix: fix a couple of builds

---
 pkgs/development/r-modules/cran-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 2c48adc558b..3bebd5468e9 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -64,6 +64,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [Rcpp];
     patchPhase = "patchShebangs configure";
+    meta.hydraPlatforms = R.meta.hydraPlatforms;
   };
 
   A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; };
@@ -334,16 +335,16 @@ let self = _self // overrides; _self = with self; {
   bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
   BayesQTLBIC = derive { name="BayesQTLBIC"; version="1.0-2"; sha256="1pgd3h45v3l44pfkin2883lk1davp0y4fq80lp6nqrsbx9cpsy2z"; depends=[leaps]; };
   bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[MASS mnormt gplots combinat]; };
-  BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; };
+  BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice pkgs.gsl]; };
   BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; };
   bayesSurv = derive { name="bayesSurv"; version="2.1-1"; sha256="076lzaiwjp4ahw36wvx9sb1g86b9cidvjv91sc1r509s8khph91w"; depends=[survival coda smoothSurv]; };
   bayesTFR = derive { name="bayesTFR"; version="4.0-5"; sha256="1cyzkgx0f275ng0ds0lvm3rwryd2ai20shhilp7ajvsria4h4dcw"; depends=[mvtnorm MASS coda wpp2012]; };
   Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; };
   BayesTree = derive { name="BayesTree"; version="0.3-1.1"; sha256="1sdxya2nli590m837zmqn4y3h62ph1hx8qszp6ayb19liff2bnmd"; depends=[nnet]; };
   BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; };
-  BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS]; };
+  BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS pkgs.gsl]; };
   BayesX = derive { name="BayesX"; version="0.2-8"; sha256="1kj0xwy972383vx52i8dn7vp0x8r5cbbii0s7nwfz0bn2iaks0c0"; depends=[shapefiles sp maptools colorspace coda]; };
-  BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
+  BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[pkgs.readline]; };
   BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
   BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
   BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
@@ -646,7 +647,7 @@ let self = _self // overrides; _self = with self; {
   cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
   CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-  CDM = derive { name="CDM"; version="3.2-6"; sha256="07vnvqzrs3zny0p2sq0df37jgiwhzrnlgw9p6dd9x9qn5m9asfm6"; depends=[mvtnorm MASS psych polycor sfsmisc Rcpp]; };
+  CDM = derive { name="CDM"; version="3.2-6"; sha256="07vnvqzrs3zny0p2sq0df37jgiwhzrnlgw9p6dd9x9qn5m9asfm6"; depends=[mvtnorm MASS psych polycor sfsmisc Rcpp RcppArmadillo]; };
   CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; };
   CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; };
   cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.3"; sha256="1fc833ji557y2vb6snlxh90gz1n7fxjfkwjmdcmasj1sfzaalsjy"; depends=[]; };

From 164c81be8467e0935782d4110946c0a73ae10694 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 10:31:29 +0200
Subject: [PATCH 189/221] haskell-hscolour: define the bootstap version of this
 package using 'extension' rather than by passing an additional parameter to
 it

---
 pkgs/development/tools/haskell/hscolour/default.nix | 3 +--
 pkgs/top-level/haskell-packages.nix                 | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/hscolour/default.nix b/pkgs/development/tools/haskell/hscolour/default.nix
index 88c4545ff6d..d8bc08b4b33 100644
--- a/pkgs/development/tools/haskell/hscolour/default.nix
+++ b/pkgs/development/tools/haskell/hscolour/default.nix
@@ -1,4 +1,4 @@
-{ cabal, hyperlinkSource ? true }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "hscolour";
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs";
   isLibrary = true;
   isExecutable = true;
-  hyperlinkSource = hyperlinkSource;
   meta = {
     homepage = "http://code.haskell.org/~malcolm/hscolour/";
     description = "Colourise Haskell code";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9d6fb908017..f083490ddc6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2641,7 +2641,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   hlint = callPackage ../development/tools/haskell/hlint {};
 
   hscolour = callPackage ../development/tools/haskell/hscolour {};
-  hscolourBootstrap = self.hscolour.override { hyperlinkSource = false; };
+  hscolourBootstrap = self.hscolour.override {
+    cabal = self.cabal.override {
+      extension = self : super : { hyperlinkSource = false; };
+    };
+  };
 
   hslogger = callPackage ../development/tools/haskell/hslogger {};
 

From 473ab2b36293d483fae6a80ad02c552febb0769b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Jun 2014 10:40:31 +0200
Subject: [PATCH 190/221] haskell-vector: add version 0.10.11.0

---
 .../libraries/haskell/vector/0.10.11.0.nix        | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/vector/0.10.11.0.nix

diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix
new file mode 100644
index 00000000000..1b8cb381f0b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix
@@ -0,0 +1,15 @@
+{ cabal, deepseq, primitive }:
+
+cabal.mkDerivation (self: {
+  pname = "vector";
+  version = "0.10.11.0";
+  sha256 = "0f5jks8q0287zgzlfg3x7akpahck6dm1c37hb8kk6qn51csx515j";
+  buildDepends = [ deepseq primitive ];
+  meta = {
+    homepage = "https://github.com/haskell/vector";
+    description = "Efficient Arrays";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f083490ddc6..a2bd99a7ca9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2379,7 +2379,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   vector_0_10_0_1  = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {};
   vector_0_10_9_3  = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {};
-  vector = self.vector_0_10_9_3;
+  vector_0_10_11_0  = callPackage ../development/libraries/haskell/vector/0.10.11.0.nix {};
+  vector = self.vector_0_10_11_0;
 
   vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
 

From 33d99a22cab7375bf947e87ca2120b9e591cbaaf Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 9 Jun 2014 13:36:26 +0200
Subject: [PATCH 191/221] nixos-build-vms: Fix function invocation to test
 driver

---
 nixos/modules/installer/tools/nixos-build-vms/build-vms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
index 5e77b701ff5..4372d196261 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -6,4 +6,4 @@ let nodes = import networkExpr; in
 
 with import ../../../../lib/testing.nix { inherit system; };
 
-(complete { inherit nodes; testScript = ""; }).driver
+(makeTest { inherit nodes; testScript = ""; }).driver

From cf3a2d04751fcc875656b0af6bf2e7f728cf770d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Jun 2014 13:37:49 +0200
Subject: [PATCH 192/221] Add vtop, update some node packages.

---
 pkgs/top-level/node-packages-generated.nix | 6397 +++++++++++++-------
 pkgs/top-level/node-packages.json          |    1 +
 2 files changed, 4248 insertions(+), 2150 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index e250085f730..84440094a44 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -34,7 +34,7 @@
     buildInputs =
       (self.nativeDeps."CSSselect" or []);
     deps = [
-      self.by-version."CSSwhat"."0.4.5"
+      self.by-version."CSSwhat"."0.4.7"
       self.by-version."domutils"."1.4.3"
       self.by-version."boolbase"."1.0.0"
       self.by-version."nth-check"."1.0.0"
@@ -57,7 +57,7 @@
     buildInputs =
       (self.nativeDeps."CSSselect" or []);
     deps = [
-      self.by-version."CSSwhat"."0.4.5"
+      self.by-version."CSSwhat"."0.4.7"
       self.by-version."domutils"."1.4.3"
     ];
     peerDependencies = [
@@ -65,14 +65,14 @@
     passthru.names = [ "CSSselect" ];
   };
   by-spec."CSSwhat"."0.4" =
-    self.by-version."CSSwhat"."0.4.5";
-  by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSwhat-0.4.5";
+    self.by-version."CSSwhat"."0.4.7";
+  by-version."CSSwhat"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSwhat-0.4.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz";
-        name = "CSSwhat-0.4.5.tgz";
-        sha1 = "85d7b2799ff3d98055353c802949e39913e16a62";
+        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
+        name = "CSSwhat-0.4.7.tgz";
+        sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
       })
     ];
     buildInputs =
@@ -105,14 +105,14 @@
     passthru.names = [ "JSONStream" ];
   };
   by-spec."JSONStream"."~0.7.1" =
-    self.by-version."JSONStream"."0.7.2";
-  by-version."JSONStream"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-JSONStream-0.7.2";
+    self.by-version."JSONStream"."0.7.4";
+  by-version."JSONStream"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-JSONStream-0.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.2.tgz";
-        name = "JSONStream-0.7.2.tgz";
-        sha1 = "27f4d7fe1918dc08ee72aed9c794e32ce80618f7";
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz";
+        name = "JSONStream-0.7.4.tgz";
+        sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786";
       })
     ];
     buildInputs =
@@ -167,6 +167,8 @@
     self.by-version."abbrev"."1.0.5";
   by-spec."abbrev"."~1.0.4" =
     self.by-version."abbrev"."1.0.5";
+  by-spec."abbrev"."~1.0.5" =
+    self.by-version."abbrev"."1.0.5";
   by-spec."accepts"."1.0.0" =
     self.by-version."accepts"."1.0.0";
   by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -188,6 +190,48 @@
     ];
     passthru.names = [ "accepts" ];
   };
+  by-spec."accepts"."1.0.1" =
+    self.by-version."accepts"."1.0.1";
+  by-version."accepts"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-accepts-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/accepts/-/accepts-1.0.1.tgz";
+        name = "accepts-1.0.1.tgz";
+        sha1 = "c1e06d613e6246ba874678d6d9b92389b7ce310c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."accepts" or []);
+    deps = [
+      self.by-version."mime"."1.2.11"
+      self.by-version."negotiator"."0.4.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "accepts" ];
+  };
+  by-spec."accepts"."1.0.2" =
+    self.by-version."accepts"."1.0.2";
+  by-version."accepts"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-accepts-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/accepts/-/accepts-1.0.2.tgz";
+        name = "accepts-1.0.2.tgz";
+        sha1 = "96266ace1b4c03f9637428f3acafe891959f3883";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."accepts" or []);
+    deps = [
+      self.by-version."mime"."1.2.11"
+      self.by-version."negotiator"."0.4.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "accepts" ];
+  };
   by-spec."active-x-obfuscator"."0.0.1" =
     self.by-version."active-x-obfuscator"."0.0.1";
   by-version."active-x-obfuscator"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -208,7 +252,7 @@
     ];
     passthru.names = [ "active-x-obfuscator" ];
   };
-  by-spec."addressparser"."~0.2.0" =
+  by-spec."addressparser"."~0.2.1" =
     self.by-version."addressparser"."0.2.1";
   by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-addressparser-0.2.1";
@@ -309,6 +353,25 @@
   "amdefine" = self.by-version."amdefine"."0.1.0";
   by-spec."amdefine".">=0.0.4" =
     self.by-version."amdefine"."0.1.0";
+  by-spec."ansi"."^0.3.0" =
+    self.by-version."ansi"."0.3.0";
+  by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ansi-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
+        name = "ansi-0.3.0.tgz";
+        sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansi" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansi" ];
+  };
   by-spec."ansi"."~0.2.1" =
     self.by-version."ansi"."0.2.1";
   by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -482,24 +545,26 @@
     ];
     passthru.names = [ "apparatus" ];
   };
-  by-spec."archiver"."~0.5.2" =
-    self.by-version."archiver"."0.5.2";
-  by-version."archiver"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-archiver-0.5.2";
+  by-spec."archiver"."~0.10.0" =
+    self.by-version."archiver"."0.10.0";
+  by-version."archiver"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-archiver-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz";
-        name = "archiver-0.5.2.tgz";
-        sha1 = "4e021b1fea5d902201f4886fca6a19fcc760083b";
+        url = "http://registry.npmjs.org/archiver/-/archiver-0.10.0.tgz";
+        name = "archiver-0.10.0.tgz";
+        sha1 = "49e84512f31e4ec1cff27d7913f58ab61b80136b";
       })
     ];
     buildInputs =
       (self.nativeDeps."archiver" or []);
     deps = [
+      self.by-version."buffer-crc32"."0.2.1"
       self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."zip-stream"."0.1.4"
+      self.by-version."tar-stream"."0.3.3"
+      self.by-version."zip-stream"."0.3.4"
       self.by-version."lazystream"."0.1.0"
-      self.by-version."file-utils"."0.1.5"
+      self.by-version."file-utils"."0.2.0"
       self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
@@ -527,6 +592,8 @@
   };
   by-spec."archy"."0.0.2" =
     self.by-version."archy"."0.0.2";
+  by-spec."archy"."~0.0.2" =
+    self.by-version."archy"."0.0.2";
   by-spec."argparse"."0.1.15" =
     self.by-version."argparse"."0.1.15";
   by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage {
@@ -746,6 +813,30 @@
     ];
     passthru.names = [ "assertion-error" ];
   };
+  by-spec."ast-query"."~0.2.3" =
+    self.by-version."ast-query"."0.2.4";
+  by-version."ast-query"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ast-query-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ast-query/-/ast-query-0.2.4.tgz";
+        name = "ast-query-0.2.4.tgz";
+        sha1 = "853d13e6493fe8c88c19b8fecb098183c3d7449a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ast-query" or []);
+    deps = [
+      self.by-version."esprima"."1.1.1"
+      self.by-version."escodegen"."1.3.3"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."traverse"."0.6.6"
+      self.by-version."class-extend"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ast-query" ];
+  };
   by-spec."astw"."~1.1.0" =
     self.by-version."astw"."1.1.0";
   by-version."astw"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -767,14 +858,14 @@
     passthru.names = [ "astw" ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."0.7.0";
-  by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.7.0";
+    self.by-version."async"."0.9.0";
+  by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz";
-        name = "async-0.7.0.tgz";
-        sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5";
+        url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
+        name = "async-0.9.0.tgz";
+        sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
       })
     ];
     buildInputs =
@@ -785,7 +876,7 @@
     ];
     passthru.names = [ "async" ];
   };
-  "async" = self.by-version."async"."0.7.0";
+  "async" = self.by-version."async"."0.9.0";
   by-spec."async"."0.1.15" =
     self.by-version."async"."0.1.15";
   by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
@@ -864,12 +955,31 @@
     ];
     passthru.names = [ "async" ];
   };
+  by-spec."async"."0.8.x" =
+    self.by-version."async"."0.8.0";
+  by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.8.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz";
+        name = "async-0.8.0.tgz";
+        sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
   by-spec."async"."^0.2.10" =
     self.by-version."async"."0.2.10";
+  by-spec."async"."^0.9.0" =
+    self.by-version."async"."0.9.0";
   by-spec."async"."~0.1.22" =
     self.by-version."async"."0.1.22";
-  by-spec."async"."~0.2.10" =
-    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.6" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.7" =
@@ -878,44 +988,12 @@
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.9" =
     self.by-version."async"."0.2.10";
-  by-spec."async"."~0.4" =
-    self.by-version."async"."0.4.1";
-  by-version."async"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.4.1.tgz";
-        name = "async-0.4.1.tgz";
-        sha1 = "1985abade017df906bfaa8d77d424b25366b3a5b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
-  };
-  by-spec."async"."~0.6.2" =
-    self.by-version."async"."0.6.2";
-  by-version."async"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.6.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz";
-        name = "async-0.6.2.tgz";
-        sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
-  };
+  by-spec."async"."~0.8" =
+    self.by-version."async"."0.8.0";
+  by-spec."async"."~0.8.0" =
+    self.by-version."async"."0.8.0";
+  by-spec."async"."~0.9.0" =
+    self.by-version."async"."0.9.0";
   by-spec."aws-sdk"."*" =
     self.by-version."aws-sdk"."2.0.0-rc9";
   by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage {
@@ -1076,14 +1154,14 @@
     passthru.names = [ "base62" ];
   };
   by-spec."base64-js"."~0.0.4" =
-    self.by-version."base64-js"."0.0.6";
-  by-version."base64-js"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-base64-js-0.0.6";
+    self.by-version."base64-js"."0.0.7";
+  by-version."base64-js"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-base64-js-0.0.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
-        name = "base64-js-0.0.6.tgz";
-        sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
+        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz";
+        name = "base64-js-0.0.7.tgz";
+        sha1 = "54400dc91d696cec32a8a47902f971522fee8f48";
       })
     ];
     buildInputs =
@@ -1152,14 +1230,14 @@
     passthru.names = [ "batch" ];
   };
   by-spec."bcrypt"."*" =
-    self.by-version."bcrypt"."0.7.7";
-  by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bcrypt-0.7.7";
+    self.by-version."bcrypt"."0.7.8";
+  by-version."bcrypt"."0.7.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bcrypt-0.7.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz";
-        name = "bcrypt-0.7.7.tgz";
-        sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868";
+        url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.8.tgz";
+        name = "bcrypt-0.7.8.tgz";
+        sha1 = "42c99aac202918e947b5bd086110184f62745e3e";
       })
     ];
     buildInputs =
@@ -1171,7 +1249,7 @@
     ];
     passthru.names = [ "bcrypt" ];
   };
-  "bcrypt" = self.by-version."bcrypt"."0.7.7";
+  "bcrypt" = self.by-version."bcrypt"."0.7.8";
   by-spec."binary"."~0.3.0" =
     self.by-version."binary"."0.3.0";
   by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -1231,6 +1309,47 @@
     ];
     passthru.names = [ "bindings" ];
   };
+  by-spec."bindings".">=1.2.0" =
+    self.by-version."bindings"."1.2.0";
+  by-spec."bl"."~0.6.0" =
+    self.by-version."bl"."0.6.0";
+  by-version."bl"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bl-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bl/-/bl-0.6.0.tgz";
+        name = "bl-0.6.0.tgz";
+        sha1 = "30910299937294133844ee34aa479a5344b4cd29";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bl" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.27-1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bl" ];
+  };
+  by-spec."blessed"."0.0.33" =
+    self.by-version."blessed"."0.0.33";
+  by-version."blessed"."0.0.33" = lib.makeOverridable self.buildNodePackage {
+    name = "blessed-0.0.33";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/blessed/-/blessed-0.0.33.tgz";
+        name = "blessed-0.0.33.tgz";
+        sha1 = "da5837b2539921a7aeb57ac6ff48f038c8b9e750";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."blessed" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "blessed" ];
+  };
   by-spec."block-stream"."*" =
     self.by-version."block-stream"."0.0.7";
   by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -1272,23 +1391,47 @@
     ];
     passthru.names = [ "blueimp-md5" ];
   };
-  by-spec."body-parser"."~1.0.1" =
-    self.by-version."body-parser"."1.0.2";
-  by-version."body-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-body-parser-1.0.2";
+  by-spec."body-parser"."1.3.0" =
+    self.by-version."body-parser"."1.3.0";
+  by-version."body-parser"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-body-parser-1.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.0.2.tgz";
-        name = "body-parser-1.0.2.tgz";
-        sha1 = "3461479a3278fe00fcaebec3314bb54fc4f7b47c";
+        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.3.0.tgz";
+        name = "body-parser-1.3.0.tgz";
+        sha1 = "1a651cb9993a01a65531ae38395ceb0199dd7e3c";
       })
     ];
     buildInputs =
       (self.nativeDeps."body-parser" or []);
     deps = [
-      self.by-version."type-is"."1.1.0"
-      self.by-version."raw-body"."1.1.4"
+      self.by-version."bytes"."1.0.0"
       self.by-version."qs"."0.6.6"
+      self.by-version."raw-body"."1.1.6"
+      self.by-version."type-is"."1.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "body-parser" ];
+  };
+  by-spec."body-parser"."~1.2.0" =
+    self.by-version."body-parser"."1.2.2";
+  by-version."body-parser"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-body-parser-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.2.2.tgz";
+        name = "body-parser-1.2.2.tgz";
+        sha1 = "6106373cc1d34d559ebcfdb582e4e37d4312acfb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."body-parser" or []);
+    deps = [
+      self.by-version."bytes"."1.0.0"
+      self.by-version."qs"."0.6.6"
+      self.by-version."raw-body"."1.1.6"
+      self.by-version."type-is"."1.2.0"
     ];
     peerDependencies = [
     ];
@@ -1354,14 +1497,14 @@
     passthru.names = [ "boom" ];
   };
   by-spec."bower"."*" =
-    self.by-version."bower"."1.3.2";
-  by-version."bower"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.3.2";
+    self.by-version."bower"."1.3.5";
+  by-version."bower"."1.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-1.3.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.3.2.tgz";
-        name = "bower-1.3.2.tgz";
-        sha1 = "ae1eeea5c3ba9300e10e55b193e9d2fd5407fb7b";
+        url = "http://registry.npmjs.org/bower/-/bower-1.3.5.tgz";
+        name = "bower-1.3.5.tgz";
+        sha1 = "36a749fa8d0ac4d96609f721d15c93834bdaf98b";
       })
     ];
     buildInputs =
@@ -1369,55 +1512,55 @@
     deps = [
       self.by-version."abbrev"."1.0.5"
       self.by-version."archy"."0.0.2"
-      self.by-version."bower-config"."0.5.0"
+      self.by-version."bower-config"."0.5.1"
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-json"."0.4.0"
       self.by-version."bower-logger"."0.2.2"
-      self.by-version."bower-registry-client"."0.1.6"
+      self.by-version."bower-registry-client"."0.2.1"
       self.by-version."cardinal"."0.4.4"
       self.by-version."chalk"."0.4.0"
       self.by-version."chmodr"."0.1.0"
-      self.by-version."decompress-zip"."0.0.6"
+      self.by-version."decompress-zip"."0.0.8"
       self.by-version."fstream"."0.1.25"
-      self.by-version."fstream-ignore"."0.0.7"
-      self.by-version."glob"."3.2.9"
+      self.by-version."fstream-ignore"."0.0.8"
+      self.by-version."glob"."3.2.11"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."handlebars"."1.3.0"
       self.by-version."inquirer"."0.4.1"
-      self.by-version."junk"."0.2.2"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."mout"."0.9.1"
-      self.by-version."nopt"."2.1.2"
-      self.by-version."lru-cache"."2.5.0"
-      self.by-version."open"."0.0.5"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."promptly"."0.2.0"
-      self.by-version."q"."1.0.1"
-      self.by-version."request"."2.33.0"
-      self.by-version."request-progress"."0.3.1"
-      self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."semver"."2.2.1"
-      self.by-version."stringify-object"."0.2.0"
-      self.by-version."tar"."0.1.19"
-      self.by-version."tmp"."0.0.23"
-      self.by-version."update-notifier"."0.1.8"
-      self.by-version."which"."1.0.5"
-      self.by-version."p-throttler"."0.0.1"
       self.by-version."insight"."0.3.1"
       self.by-version."is-root"."0.1.0"
-      self.by-version."shell-quote"."1.4.1"
+      self.by-version."junk"."0.3.0"
       self.by-version."lockfile"."0.4.2"
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."mout"."0.9.1"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."opn"."0.1.2"
+      self.by-version."osenv"."0.0.3"
+      self.by-version."p-throttler"."0.0.1"
+      self.by-version."promptly"."0.2.0"
+      self.by-version."q"."1.0.1"
+      self.by-version."request"."2.34.0"
+      self.by-version."request-progress"."0.3.1"
+      self.by-version."retry"."0.6.0"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."2.2.1"
+      self.by-version."shell-quote"."1.4.1"
+      self.by-version."stringify-object"."0.2.1"
+      self.by-version."tar"."0.1.19"
+      self.by-version."tmp"."0.0.23"
+      self.by-version."update-notifier"."0.1.10"
+      self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "bower" ];
   };
-  "bower" = self.by-version."bower"."1.3.2";
+  "bower" = self.by-version."bower"."1.3.5";
   by-spec."bower".">=0.9.0" =
-    self.by-version."bower"."1.3.2";
+    self.by-version."bower"."1.3.5";
   by-spec."bower".">=1.2.8 <2" =
-    self.by-version."bower"."1.3.2";
+    self.by-version."bower"."1.3.5";
   by-spec."bower"."~1.2.0" =
     self.by-version."bower"."1.2.8";
   by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage {
@@ -1434,7 +1577,7 @@
     deps = [
       self.by-version."abbrev"."1.0.5"
       self.by-version."archy"."0.0.2"
-      self.by-version."bower-config"."0.5.0"
+      self.by-version."bower-config"."0.5.1"
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-json"."0.4.0"
       self.by-version."bower-logger"."0.2.2"
@@ -1442,10 +1585,10 @@
       self.by-version."cardinal"."0.4.4"
       self.by-version."chalk"."0.2.1"
       self.by-version."chmodr"."0.1.0"
-      self.by-version."decompress-zip"."0.0.6"
+      self.by-version."decompress-zip"."0.0.8"
       self.by-version."fstream"."0.1.25"
-      self.by-version."fstream-ignore"."0.0.7"
-      self.by-version."glob"."3.2.9"
+      self.by-version."fstream-ignore"."0.0.8"
+      self.by-version."glob"."3.2.11"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."handlebars"."1.0.12"
       self.by-version."inquirer"."0.3.5"
@@ -1461,13 +1604,13 @@
       self.by-version."request"."2.27.0"
       self.by-version."request-progress"."0.3.1"
       self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."semver"."2.1.0"
       self.by-version."stringify-object"."0.1.8"
       self.by-version."sudo-block"."0.2.1"
       self.by-version."tar"."0.1.19"
       self.by-version."tmp"."0.0.23"
-      self.by-version."update-notifier"."0.1.8"
+      self.by-version."update-notifier"."0.1.10"
       self.by-version."which"."1.0.5"
       self.by-version."p-throttler"."0.0.1"
     ];
@@ -1475,6 +1618,29 @@
     ];
     passthru.names = [ "bower" ];
   };
+  by-spec."bower-config"."^0.5.0" =
+    self.by-version."bower-config"."0.5.1";
+  by-version."bower-config"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bower-config-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.1.tgz";
+        name = "bower-config-0.5.1.tgz";
+        sha1 = "dbcfac40734f5e7c61c5c8353c1dfb0ed5f51ce1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-config" or []);
+    deps = [
+      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."mout"."0.9.1"
+      self.by-version."optimist"."0.6.1"
+      self.by-version."osenv"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-config" ];
+  };
   by-spec."bower-config"."~0.4.3" =
     self.by-version."bower-config"."0.4.5";
   by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage {
@@ -1499,28 +1665,7 @@
     passthru.names = [ "bower-config" ];
   };
   by-spec."bower-config"."~0.5.0" =
-    self.by-version."bower-config"."0.5.0";
-  by-version."bower-config"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-config-0.5.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.0.tgz";
-        name = "bower-config-0.5.0.tgz";
-        sha1 = "d081d43008816b1beb876dee272219851dd4c89c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-config" or []);
-    deps = [
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."mout"."0.6.0"
-      self.by-version."optimist"."0.6.1"
-      self.by-version."osenv"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-config" ];
-  };
+    self.by-version."bower-config"."0.5.1";
   by-spec."bower-endpoint-parser"."0.2.1" =
     self.by-version."bower-endpoint-parser"."0.2.1";
   by-version."bower-endpoint-parser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -1556,7 +1701,7 @@
     buildInputs =
       (self.nativeDeps."bower-json" or []);
     deps = [
-      self.by-version."deep-extend"."0.2.8"
+      self.by-version."deep-extend"."0.2.10"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."intersect"."0.0.3"
     ];
@@ -1626,7 +1771,34 @@
       self.by-version."lru-cache"."2.3.1"
       self.by-version."request"."2.27.0"
       self.by-version."request-replay"."0.2.0"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."mkdirp"."0.3.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-registry-client" ];
+  };
+  by-spec."bower-registry-client"."~0.2.0" =
+    self.by-version."bower-registry-client"."0.2.1";
+  by-version."bower-registry-client"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bower-registry-client-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.1.tgz";
+        name = "bower-registry-client-0.2.1.tgz";
+        sha1 = "06fbff982f82a4a4045dc53ac9dcb1c43d9cd591";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-registry-client" or []);
+    deps = [
+      self.by-version."async"."0.2.10"
+      self.by-version."bower-config"."0.5.1"
+      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."lru-cache"."2.3.1"
+      self.by-version."request"."2.27.0"
+      self.by-version."request-replay"."0.2.0"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."mkdirp"."0.3.5"
     ];
     peerDependencies = [
@@ -1652,10 +1824,10 @@
       self.by-version."bower-json"."0.4.0"
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-logger"."0.2.1"
-      self.by-version."bower"."1.3.2"
+      self.by-version."bower"."1.3.5"
       self.by-version."argparse"."0.1.15"
       self.by-version."clone"."0.1.11"
-      self.by-version."semver"."2.2.1"
+      self.by-version."semver"."2.3.0"
       self.by-version."fetch-bower"."2.0.0"
     ];
     peerDependencies = [
@@ -1733,6 +1905,8 @@
   };
   by-spec."browser-resolve"."~1.2.2" =
     self.by-version."browser-resolve"."1.2.4";
+  by-spec."browser-resolve"."~1.2.4" =
+    self.by-version."browser-resolve"."1.2.4";
   by-spec."browserchannel"."*" =
     self.by-version."browserchannel"."1.2.0";
   by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -1748,8 +1922,8 @@
       (self.nativeDeps."browserchannel" or []);
     deps = [
       self.by-version."hat"."0.0.3"
-      self.by-version."connect"."2.14.4"
-      self.by-version."request"."2.34.0"
+      self.by-version."connect"."2.19.4"
+      self.by-version."request"."2.36.0"
       self.by-version."ascii-json"."0.2.0"
     ];
     peerDependencies = [
@@ -1758,70 +1932,73 @@
   };
   "browserchannel" = self.by-version."browserchannel"."1.2.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."3.44.2";
-  by-version."browserify"."3.44.2" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-3.44.2";
+    self.by-version."browserify"."4.1.8";
+  by-version."browserify"."4.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-4.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.44.2.tgz";
-        name = "browserify-3.44.2.tgz";
-        sha1 = "ffa2788d06e8073ffd734d94c3ae272ca3dd630a";
+        url = "http://registry.npmjs.org/browserify/-/browserify-4.1.8.tgz";
+        name = "browserify-4.1.8.tgz";
+        sha1 = "fe567fd8493e25c0ab33985eb62595bc9be66780";
       })
     ];
     buildInputs =
       (self.nativeDeps."browserify" or []);
     deps = [
-      self.by-version."JSONStream"."0.7.2"
+      self.by-version."JSONStream"."0.7.4"
       self.by-version."assert"."1.1.1"
       self.by-version."browser-pack"."2.0.1"
       self.by-version."browser-resolve"."1.2.4"
       self.by-version."browserify-zlib"."0.1.4"
-      self.by-version."buffer"."2.1.13"
-      self.by-version."builtins"."0.0.3"
+      self.by-version."buffer"."2.3.2"
+      self.by-version."builtins"."0.0.4"
       self.by-version."commondir"."0.0.1"
-      self.by-version."concat-stream"."1.4.5"
+      self.by-version."concat-stream"."1.4.6"
       self.by-version."console-browserify"."1.0.3"
       self.by-version."constants-browserify"."0.0.1"
       self.by-version."crypto-browserify"."1.0.9"
       self.by-version."deep-equal"."0.1.2"
       self.by-version."defined"."0.0.0"
-      self.by-version."deps-sort"."0.1.1"
+      self.by-version."deps-sort"."0.1.2"
       self.by-version."derequire"."0.8.0"
-      self.by-version."domain-browser"."1.1.1"
+      self.by-version."domain-browser"."1.1.2"
       self.by-version."duplexer"."0.1.1"
-      self.by-version."events"."1.0.0"
-      self.by-version."glob"."3.2.9"
+      self.by-version."events"."1.0.1"
+      self.by-version."glob"."3.2.11"
       self.by-version."http-browserify"."1.3.2"
       self.by-version."https-browserify"."0.0.0"
       self.by-version."inherits"."2.0.1"
-      self.by-version."insert-module-globals"."5.0.1"
-      self.by-version."module-deps"."1.10.0"
+      self.by-version."insert-module-globals"."6.0.0"
+      self.by-version."module-deps"."2.1.2"
       self.by-version."os-browserify"."0.1.2"
       self.by-version."parents"."0.0.2"
       self.by-version."path-browserify"."0.0.0"
       self.by-version."punycode"."1.2.4"
-      self.by-version."querystring-es3"."0.2.0"
+      self.by-version."querystring-es3"."0.2.1-0"
+      self.by-version."readable-stream"."1.1.13-1"
       self.by-version."resolve"."0.6.3"
       self.by-version."shallow-copy"."0.0.1"
       self.by-version."shell-quote"."0.0.1"
-      self.by-version."stream-browserify"."0.1.3"
+      self.by-version."stream-browserify"."1.0.0"
       self.by-version."stream-combiner"."0.0.4"
       self.by-version."string_decoder"."0.0.1"
       self.by-version."subarg"."0.0.1"
       self.by-version."syntax-error"."1.1.0"
-      self.by-version."through2"."0.4.1"
+      self.by-version."through2"."0.4.2"
       self.by-version."timers-browserify"."1.0.1"
       self.by-version."tty-browserify"."0.0.0"
-      self.by-version."umd"."2.0.0"
+      self.by-version."umd"."2.1.0"
       self.by-version."url"."0.10.1"
       self.by-version."util"."0.10.3"
       self.by-version."vm-browserify"."0.0.4"
+      self.by-version."xtend"."3.0.0"
+      self.by-version."process"."0.7.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserify" ];
   };
-  "browserify" = self.by-version."browserify"."3.44.2";
+  "browserify" = self.by-version."browserify"."4.1.8";
   by-spec."browserify"."~3.38.0" =
     self.by-version."browserify"."3.38.1";
   by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage {
@@ -1836,25 +2013,25 @@
     buildInputs =
       (self.nativeDeps."browserify" or []);
     deps = [
-      self.by-version."JSONStream"."0.7.2"
+      self.by-version."JSONStream"."0.7.4"
       self.by-version."assert"."1.1.1"
       self.by-version."browser-pack"."2.0.1"
       self.by-version."browser-resolve"."1.2.4"
       self.by-version."buffer"."2.1.13"
-      self.by-version."builtins"."0.0.3"
+      self.by-version."builtins"."0.0.4"
       self.by-version."commondir"."0.0.1"
-      self.by-version."concat-stream"."1.4.5"
+      self.by-version."concat-stream"."1.4.6"
       self.by-version."console-browserify"."1.0.3"
       self.by-version."constants-browserify"."0.0.1"
       self.by-version."crypto-browserify"."1.0.9"
       self.by-version."deep-equal"."0.1.2"
       self.by-version."defined"."0.0.0"
-      self.by-version."deps-sort"."0.1.1"
+      self.by-version."deps-sort"."0.1.2"
       self.by-version."derequire"."0.8.0"
-      self.by-version."domain-browser"."1.1.1"
+      self.by-version."domain-browser"."1.1.2"
       self.by-version."duplexer"."0.1.1"
-      self.by-version."events"."1.0.0"
-      self.by-version."glob"."3.2.9"
+      self.by-version."events"."1.0.1"
+      self.by-version."glob"."3.2.11"
       self.by-version."http-browserify"."1.3.2"
       self.by-version."https-browserify"."0.0.0"
       self.by-version."inherits"."2.0.1"
@@ -1873,7 +2050,7 @@
       self.by-version."string_decoder"."0.0.1"
       self.by-version."subarg"."0.0.1"
       self.by-version."syntax-error"."1.1.0"
-      self.by-version."through2"."0.4.1"
+      self.by-version."through2"."0.4.2"
       self.by-version."timers-browserify"."1.0.1"
       self.by-version."tty-browserify"."0.0.0"
       self.by-version."umd"."2.0.0"
@@ -1900,7 +2077,7 @@
     buildInputs =
       (self.nativeDeps."browserify-zlib" or []);
     deps = [
-      self.by-version."pako"."0.2.0"
+      self.by-version."pako"."0.2.3"
     ];
     peerDependencies = [
     ];
@@ -1963,26 +2140,47 @@
     ];
     passthru.names = [ "bson" ];
   };
-  by-spec."bson"."0.2.7" =
-    self.by-version."bson"."0.2.7";
-  by-version."bson"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bson-0.2.7";
+  by-spec."bson"."0.2.8" =
+    self.by-version."bson"."0.2.8";
+  by-version."bson"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bson-0.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz";
-        name = "bson-0.2.7.tgz";
-        sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b";
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.8.tgz";
+        name = "bson-0.2.8.tgz";
+        sha1 = "7ad6ddc15aafa63808942bd53c61387f825d64a1";
       })
     ];
     buildInputs =
       (self.nativeDeps."bson" or []);
     deps = [
-      self.by-version."nan"."0.8.0"
+      self.by-version."nan"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "bson" ];
   };
+  by-spec."buffer"."^2.3.0" =
+    self.by-version."buffer"."2.3.2";
+  by-version."buffer"."2.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-2.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.3.2.tgz";
+        name = "buffer-2.3.2.tgz";
+        sha1 = "05f14d173c73d24f21045a9f83e1c396ae34d74b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer" or []);
+    deps = [
+      self.by-version."base64-js"."0.0.7"
+      self.by-version."ieee754"."1.1.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer" ];
+  };
   by-spec."buffer"."~2.1.4" =
     self.by-version."buffer"."2.1.13";
   by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage {
@@ -1997,7 +2195,7 @@
     buildInputs =
       (self.nativeDeps."buffer" or []);
     deps = [
-      self.by-version."base64-js"."0.0.6"
+      self.by-version."base64-js"."0.0.7"
       self.by-version."ieee754"."1.1.3"
     ];
     peerDependencies = [
@@ -2103,14 +2301,14 @@
     passthru.names = [ "buffertools" ];
   };
   by-spec."builtins"."~0.0.3" =
-    self.by-version."builtins"."0.0.3";
-  by-version."builtins"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-builtins-0.0.3";
+    self.by-version."builtins"."0.0.4";
+  by-version."builtins"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-builtins-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.3.tgz";
-        name = "builtins-0.0.3.tgz";
-        sha1 = "5d006166da71610bc2bcf73019f0f0cc43309755";
+        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.4.tgz";
+        name = "builtins-0.0.4.tgz";
+        sha1 = "ec6d4ca4ba5a3a173749f10146bdcda28ea6d65d";
       })
     ];
     buildInputs =
@@ -2219,15 +2417,15 @@
     ];
     passthru.names = [ "bytes" ];
   };
-  by-spec."bytes"."0.3.0" =
-    self.by-version."bytes"."0.3.0";
-  by-version."bytes"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bytes-0.3.0";
+  by-spec."bytes"."1" =
+    self.by-version."bytes"."1.0.0";
+  by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bytes-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
-        name = "bytes-0.3.0.tgz";
-        sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935";
+        url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+        name = "bytes-1.0.0.tgz";
+        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
       })
     ];
     buildInputs =
@@ -2238,12 +2436,10 @@
     ];
     passthru.names = [ "bytes" ];
   };
-  by-spec."bytes"."~0.2.0" =
-    self.by-version."bytes"."0.2.1";
+  by-spec."bytes"."1.0.0" =
+    self.by-version."bytes"."1.0.0";
   by-spec."bytes"."~0.2.1" =
     self.by-version."bytes"."0.2.1";
-  by-spec."bytes"."~0.3.0" =
-    self.by-version."bytes"."0.3.0";
   by-spec."callsite"."~1.0.0" =
     self.by-version."callsite"."1.0.0";
   by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -2413,6 +2609,25 @@
   };
   by-spec."chalk"."~0.4.0" =
     self.by-version."chalk"."0.4.0";
+  by-spec."char-spinner"."~1.0.1" =
+    self.by-version."char-spinner"."1.0.1";
+  by-version."char-spinner"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-char-spinner-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
+        name = "char-spinner-1.0.1.tgz";
+        sha1 = "e6ea67bd247e107112983b7ab0479ed362800081";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."char-spinner" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "char-spinner" ];
+  };
   by-spec."character-parser"."1.2.0" =
     self.by-version."character-parser"."1.2.0";
   by-version."character-parser"."1.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -2432,6 +2647,29 @@
     ];
     passthru.names = [ "character-parser" ];
   };
+  by-spec."cheerio"."^0.16.0" =
+    self.by-version."cheerio"."0.16.0";
+  by-version."cheerio"."0.16.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cheerio-0.16.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.16.0.tgz";
+        name = "cheerio-0.16.0.tgz";
+        sha1 = "780ae472692ea85e1e0fe332e806bdba98c16d0a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cheerio" or []);
+    deps = [
+      self.by-version."CSSselect"."0.4.1"
+      self.by-version."entities"."1.1.1"
+      self.by-version."htmlparser2"."3.7.2"
+      self.by-version."lodash"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cheerio" ];
+  };
   by-spec."cheerio"."~0.12.0" =
     self.by-version."cheerio"."0.12.4";
   by-version."cheerio"."0.12.4" = lib.makeOverridable self.buildNodePackage {
@@ -2576,27 +2814,7 @@
     ];
     passthru.names = [ "chownr" ];
   };
-  by-spec."circular-json"."0.1.x" =
-    self.by-version."circular-json"."0.1.6";
-  by-version."circular-json"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-circular-json-0.1.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/circular-json/-/circular-json-0.1.6.tgz";
-        name = "circular-json-0.1.6.tgz";
-        sha1 = "fd692b65f8bce4f2900bea14f74ad681ab294c7f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."circular-json" or []);
-    deps = [
-      self.by-version."wru"."0.2.7"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "circular-json" ];
-  };
-  by-spec."class-extend"."~0.1.0" =
+  by-spec."class-extend"."^0.1.0" =
     self.by-version."class-extend"."0.1.1";
   by-version."class-extend"."0.1.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-class-extend-0.1.1";
@@ -2616,6 +2834,10 @@
     ];
     passthru.names = [ "class-extend" ];
   };
+  by-spec."class-extend"."~0.1.0" =
+    self.by-version."class-extend"."0.1.1";
+  by-spec."class-extend"."~0.1.1" =
+    self.by-version."class-extend"."0.1.1";
   by-spec."clean-css"."2.1.x" =
     self.by-version."clean-css"."2.1.8";
   by-version."clean-css"."2.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -2638,27 +2860,51 @@
   };
   by-spec."clean-css"."~2.1.0" =
     self.by-version."clean-css"."2.1.8";
-  by-spec."cli"."0.4.x" =
-    self.by-version."cli"."0.4.5";
-  by-version."cli"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cli-0.4.5";
+  by-spec."cli"."0.6.x" =
+    self.by-version."cli"."0.6.3";
+  by-version."cli"."0.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cli-0.6.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
-        name = "cli-0.4.5.tgz";
-        sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
+        url = "http://registry.npmjs.org/cli/-/cli-0.6.3.tgz";
+        name = "cli-0.6.3.tgz";
+        sha1 = "31418ed08d60a1b02cf180c6d6fee3204bfe65cd";
       })
     ];
     buildInputs =
       (self.nativeDeps."cli" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
+      self.by-version."exit"."0.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cli" ];
   };
   by-spec."cli-color"."*" =
+    self.by-version."cli-color"."0.3.2";
+  by-version."cli-color"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cli-color-0.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz";
+        name = "cli-color-0.3.2.tgz";
+        sha1 = "75fa5f728c308cc4ac594b05e06cc5d80daccd86";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cli-color" or []);
+    deps = [
+      self.by-version."d"."0.1.1"
+      self.by-version."es5-ext"."0.10.4"
+      self.by-version."memoizee"."0.3.3"
+      self.by-version."timers-ext"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cli-color" ];
+  };
+  by-spec."cli-color"."~0.2.2" =
     self.by-version."cli-color"."0.2.3";
   by-version."cli-color"."0.2.3" = lib.makeOverridable self.buildNodePackage {
     name = "node-cli-color-0.2.3";
@@ -2679,10 +2925,10 @@
     ];
     passthru.names = [ "cli-color" ];
   };
-  by-spec."cli-color"."~0.2.2" =
-    self.by-version."cli-color"."0.2.3";
   by-spec."cli-color"."~0.2.3" =
     self.by-version."cli-color"."0.2.3";
+  by-spec."cli-color"."~0.3.2" =
+    self.by-version."cli-color"."0.3.2";
   by-spec."cli-log"."~0.0.8" =
     self.by-version."cli-log"."0.0.8";
   by-version."cli-log"."0.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -2697,7 +2943,7 @@
     buildInputs =
       (self.nativeDeps."cli-log" or []);
     deps = [
-      self.by-version."cli-color"."0.2.3"
+      self.by-version."cli-color"."0.3.2"
     ];
     peerDependencies = [
     ];
@@ -2891,7 +3137,7 @@
     ];
     passthru.names = [ "coffee-script-redux" ];
   };
-  by-spec."collections"."^2.0.0" =
+  by-spec."collections".">=2.0.1 <3.0.0" =
     self.by-version."collections"."2.0.1";
   by-version."collections"."2.0.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-collections-2.0.1";
@@ -2905,21 +3151,21 @@
     buildInputs =
       (self.nativeDeps."collections" or []);
     deps = [
-      self.by-version."weak-map"."1.0.4"
+      self.by-version."weak-map"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "collections" ];
   };
-  by-spec."color"."~0.5.0" =
-    self.by-version."color"."0.5.0";
-  by-version."color"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-color-0.5.0";
+  by-spec."color"."~0.6.0" =
+    self.by-version."color"."0.6.0";
+  by-version."color"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-color-0.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/color/-/color-0.5.0.tgz";
-        name = "color-0.5.0.tgz";
-        sha1 = "4d283d8bfe4cbc7006de6b6d25a3c26f00e3ee6d";
+        url = "http://registry.npmjs.org/color/-/color-0.6.0.tgz";
+        name = "color-0.6.0.tgz";
+        sha1 = "53f4b27698e1fe42a19423dc092dd8ee529b4267";
       })
     ];
     buildInputs =
@@ -3034,7 +3280,7 @@
     ];
     passthru.names = [ "colour" ];
   };
-  by-spec."columnify"."0.1.2" =
+  by-spec."columnify"."~0.1.2" =
     self.by-version."columnify"."0.1.2";
   by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-columnify-0.1.2";
@@ -3068,7 +3314,7 @@
       (self.nativeDeps."combine-source-map" or []);
     deps = [
       self.by-version."inline-source-map"."0.3.0"
-      self.by-version."convert-source-map"."0.3.3"
+      self.by-version."convert-source-map"."0.3.4"
       self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
@@ -3214,6 +3460,25 @@
   };
   by-spec."commander"."2.1.x" =
     self.by-version."commander"."2.1.0";
+  by-spec."commander"."2.2.0" =
+    self.by-version."commander"."2.2.0";
+  by-version."commander"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commander-2.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-2.2.0.tgz";
+        name = "commander-2.2.0.tgz";
+        sha1 = "175ad4b9317f3ff615f201c1e57224f55a3e91df";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
   by-spec."commander"."~0.6.1" =
     self.by-version."commander"."0.6.1";
   by-spec."commander"."~2.1.0" =
@@ -3237,15 +3502,34 @@
     ];
     passthru.names = [ "commondir" ];
   };
-  by-spec."compressible"."1.0.0" =
-    self.by-version."compressible"."1.0.0";
-  by-version."compressible"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-compressible-1.0.0";
+  by-spec."component-emitter"."1.1.2" =
+    self.by-version."component-emitter"."1.1.2";
+  by-version."component-emitter"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-component-emitter-1.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
-        name = "compressible-1.0.0.tgz";
-        sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
+        url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
+        name = "component-emitter-1.1.2.tgz";
+        sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."component-emitter" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "component-emitter" ];
+  };
+  by-spec."compressible"."1.0.1" =
+    self.by-version."compressible"."1.0.1";
+  by-version."compressible"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compressible-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/compressible/-/compressible-1.0.1.tgz";
+        name = "compressible-1.0.1.tgz";
+        sha1 = "8ed8224822c60c3c8dabcad34e913ed2952ad170";
       })
     ];
     buildInputs =
@@ -3256,44 +3540,45 @@
     ];
     passthru.names = [ "compressible" ];
   };
-  by-spec."compression"."1.0.0" =
-    self.by-version."compression"."1.0.0";
-  by-version."compression"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-compression-1.0.0";
+  by-spec."compression"."1.0.6" =
+    self.by-version."compression"."1.0.6";
+  by-version."compression"."1.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compression-1.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
-        name = "compression-1.0.0.tgz";
-        sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020";
+        url = "http://registry.npmjs.org/compression/-/compression-1.0.6.tgz";
+        name = "compression-1.0.6.tgz";
+        sha1 = "efbc5c5870980e9d7e5a9d6e6d7437cccf6a9a8a";
       })
     ];
     buildInputs =
       (self.nativeDeps."compression" or []);
     deps = [
-      self.by-version."bytes"."0.2.1"
-      self.by-version."negotiator"."0.3.0"
-      self.by-version."compressible"."1.0.0"
+      self.by-version."accepts"."1.0.2"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."compressible"."1.0.1"
+      self.by-version."on-headers"."0.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "compression" ];
   };
   by-spec."concat-stream"."^1.4.1" =
-    self.by-version."concat-stream"."1.4.5";
-  by-version."concat-stream"."1.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-concat-stream-1.4.5";
+    self.by-version."concat-stream"."1.4.6";
+  by-version."concat-stream"."1.4.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-concat-stream-1.4.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.5.tgz";
-        name = "concat-stream-1.4.5.tgz";
-        sha1 = "cbf6ffd17c15d58f0baeacbb47d927cf566446a6";
+        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.6.tgz";
+        name = "concat-stream-1.4.6.tgz";
+        sha1 = "8cb736a556a32f020f1ddc82fa3448381c5e5cce";
       })
     ];
     buildInputs =
       (self.nativeDeps."concat-stream" or []);
     deps = [
       self.by-version."inherits"."2.0.1"
-      self.by-version."typedarray"."0.0.5"
+      self.by-version."typedarray"."0.0.6"
       self.by-version."readable-stream"."1.1.13-1"
     ];
     peerDependencies = [
@@ -3301,7 +3586,9 @@
     passthru.names = [ "concat-stream" ];
   };
   by-spec."concat-stream"."~1.4.1" =
-    self.by-version."concat-stream"."1.4.5";
+    self.by-version."concat-stream"."1.4.6";
+  by-spec."concat-stream"."~1.4.5" =
+    self.by-version."concat-stream"."1.4.6";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
@@ -3339,7 +3626,7 @@
       (self.nativeDeps."config-chain" or []);
     deps = [
       self.by-version."proto-list"."1.2.2"
-      self.by-version."ini"."1.1.0"
+      self.by-version."ini"."1.2.1"
     ];
     peerDependencies = [
     ];
@@ -3347,6 +3634,31 @@
   };
   by-spec."config-chain"."~1.1.8" =
     self.by-version."config-chain"."1.1.8";
+  by-spec."configstore"."^0.3.0" =
+    self.by-version."configstore"."0.3.0";
+  by-version."configstore"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-configstore-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/configstore/-/configstore-0.3.0.tgz";
+        name = "configstore-0.3.0.tgz";
+        sha1 = "9bf5a709e6a6df6559068dd0e7eab7d3c0c6791f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."configstore" or []);
+    deps = [
+      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."js-yaml"."3.0.2"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."object-assign"."0.2.2"
+      self.by-version."osenv"."0.0.3"
+      self.by-version."uuid"."1.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "configstore" ];
+  };
   by-spec."configstore"."~0.2.1" =
     self.by-version."configstore"."0.2.3";
   by-version."configstore"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -3372,8 +3684,6 @@
     ];
     passthru.names = [ "configstore" ];
   };
-  by-spec."configstore"."~0.2.2" =
-    self.by-version."configstore"."0.2.3";
   by-spec."connect"."1.x" =
     self.by-version."connect"."1.9.2";
   by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage {
@@ -3419,7 +3729,7 @@
       self.by-version."fresh"."0.2.0"
       self.by-version."pause"."0.0.1"
       self.by-version."uid2"."0.0.3"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
       self.by-version."methods"."0.0.1"
       self.by-version."raw-body"."0.0.3"
       self.by-version."negotiator"."0.3.0"
@@ -3429,42 +3739,47 @@
     ];
     passthru.names = [ "connect" ];
   };
-  by-spec."connect"."2.14.1" =
-    self.by-version."connect"."2.14.1";
-  by-version."connect"."2.14.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-2.14.1";
+  by-spec."connect"."2.19.4" =
+    self.by-version."connect"."2.19.4";
+  by-version."connect"."2.19.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-2.19.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.14.1.tgz";
-        name = "connect-2.14.1.tgz";
-        sha1 = "e6fd676a5735ca703a89eb970f3d283fadecc2c7";
+        url = "http://registry.npmjs.org/connect/-/connect-2.19.4.tgz";
+        name = "connect-2.19.4.tgz";
+        sha1 = "01f8f103b2ec7c7f26fea65645d38f3c89d295f7";
       })
     ];
     buildInputs =
       (self.nativeDeps."connect" or []);
     deps = [
       self.by-version."basic-auth-connect"."1.0.0"
-      self.by-version."cookie-parser"."1.0.1"
+      self.by-version."body-parser"."1.3.0"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-parser"."1.1.0"
       self.by-version."cookie-signature"."1.0.3"
-      self.by-version."compression"."1.0.0"
-      self.by-version."connect-timeout"."1.0.0"
-      self.by-version."csurf"."1.0.0"
-      self.by-version."errorhandler"."1.0.0"
-      self.by-version."express-session"."1.0.2"
+      self.by-version."compression"."1.0.6"
+      self.by-version."connect-timeout"."1.1.0"
+      self.by-version."csurf"."1.2.0"
+      self.by-version."errorhandler"."1.0.2"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."express-session"."1.2.1"
       self.by-version."fresh"."0.2.2"
-      self.by-version."method-override"."1.0.0"
-      self.by-version."morgan"."1.0.0"
+      self.by-version."method-override"."2.0.2"
+      self.by-version."morgan"."1.1.1"
+      self.by-version."multiparty"."3.2.8"
+      self.by-version."on-headers"."0.0.0"
+      self.by-version."parseurl"."1.0.1"
       self.by-version."qs"."0.6.6"
-      self.by-version."response-time"."1.0.0"
-      self.by-version."serve-index"."1.0.1"
-      self.by-version."serve-static"."1.0.2"
-      self.by-version."static-favicon"."1.0.0"
+      self.by-version."response-time"."2.0.0"
+      self.by-version."serve-favicon"."2.0.1"
+      self.by-version."serve-index"."1.1.0"
+      self.by-version."serve-static"."1.2.1"
+      self.by-version."type-is"."1.2.0"
       self.by-version."vhost"."1.0.0"
-      self.by-version."bytes"."0.2.1"
       self.by-version."pause"."0.0.1"
       self.by-version."debug"."0.8.1"
-      self.by-version."raw-body"."1.1.3"
-      self.by-version."multiparty"."2.2.0"
     ];
     peerDependencies = [
     ];
@@ -3491,7 +3806,7 @@
       self.by-version."bytes"."0.1.0"
       self.by-version."send"."0.0.3"
       self.by-version."fresh"."0.1.0"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
     ];
     peerDependencies = [
     ];
@@ -3520,7 +3835,7 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
     ];
     peerDependencies = [
     ];
@@ -3549,54 +3864,14 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "connect" ];
   };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.14.4";
-  by-version."connect"."2.14.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-2.14.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.14.4.tgz";
-        name = "connect-2.14.4.tgz";
-        sha1 = "40e74de3947a5278035c12f21535604555609a5a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
-    deps = [
-      self.by-version."basic-auth-connect"."1.0.0"
-      self.by-version."cookie-parser"."1.0.1"
-      self.by-version."cookie-signature"."1.0.3"
-      self.by-version."compression"."1.0.0"
-      self.by-version."connect-timeout"."1.0.0"
-      self.by-version."csurf"."1.1.0"
-      self.by-version."errorhandler"."1.0.0"
-      self.by-version."express-session"."1.0.2"
-      self.by-version."fresh"."0.2.2"
-      self.by-version."method-override"."1.0.0"
-      self.by-version."morgan"."1.0.0"
-      self.by-version."qs"."0.6.6"
-      self.by-version."response-time"."1.0.0"
-      self.by-version."setimmediate"."1.0.1"
-      self.by-version."serve-index"."1.0.1"
-      self.by-version."serve-static"."1.0.4"
-      self.by-version."static-favicon"."1.0.2"
-      self.by-version."vhost"."1.0.0"
-      self.by-version."bytes"."0.3.0"
-      self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
-      self.by-version."raw-body"."1.1.3"
-      self.by-version."multiparty"."2.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
-  };
+    self.by-version."connect"."2.19.4";
   by-spec."connect"."~2.12.0" =
     self.by-version."connect"."2.12.0";
   by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage {
@@ -3692,14 +3967,14 @@
   };
   "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3";
   by-spec."connect-mongo"."*" =
-    self.by-version."connect-mongo"."0.4.0";
-  by-version."connect-mongo"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-mongo-0.4.0";
+    self.by-version."connect-mongo"."0.4.1";
+  by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-mongo-0.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz";
-        name = "connect-mongo-0.4.0.tgz";
-        sha1 = "4cb33728334a8f10f2d9e43d31369dbc2f856336";
+        url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz";
+        name = "connect-mongo-0.4.1.tgz";
+        sha1 = "01ed3e71558fb3f0fdc97b784ef974f9909ddd11";
       })
     ];
     buildInputs =
@@ -3711,16 +3986,16 @@
     ];
     passthru.names = [ "connect-mongo" ];
   };
-  "connect-mongo" = self.by-version."connect-mongo"."0.4.0";
-  by-spec."connect-timeout"."1.0.0" =
-    self.by-version."connect-timeout"."1.0.0";
-  by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-timeout-1.0.0";
+  "connect-mongo" = self.by-version."connect-mongo"."0.4.1";
+  by-spec."connect-timeout"."1.1.0" =
+    self.by-version."connect-timeout"."1.1.0";
+  by-version."connect-timeout"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-timeout-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
-        name = "connect-timeout-1.0.0.tgz";
-        sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
+        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.1.0.tgz";
+        name = "connect-timeout-1.1.0.tgz";
+        sha1 = "fc80615fc7a5b3863bd0319af2491d2d7fdc5f05";
       })
     ];
     buildInputs =
@@ -3751,20 +4026,21 @@
     ];
     passthru.names = [ "connection-parse" ];
   };
-  by-spec."console-browserify"."0.1.x" =
-    self.by-version."console-browserify"."0.1.6";
-  by-version."console-browserify"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-console-browserify-0.1.6";
+  by-spec."console-browserify"."1.1.x" =
+    self.by-version."console-browserify"."1.1.0";
+  by-version."console-browserify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-console-browserify-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz";
-        name = "console-browserify-0.1.6.tgz";
-        sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c";
+        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+        name = "console-browserify-1.1.0.tgz";
+        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
       })
     ];
     buildInputs =
       (self.nativeDeps."console-browserify" or []);
     deps = [
+      self.by-version."date-now"."0.1.4"
     ];
     peerDependencies = [
     ];
@@ -3851,14 +4127,14 @@
     passthru.names = [ "constants-browserify" ];
   };
   by-spec."convert-source-map"."~0.3.0" =
-    self.by-version."convert-source-map"."0.3.3";
-  by-version."convert-source-map"."0.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-convert-source-map-0.3.3";
+    self.by-version."convert-source-map"."0.3.4";
+  by-version."convert-source-map"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-convert-source-map-0.3.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.3.tgz";
-        name = "convert-source-map-0.3.3.tgz";
-        sha1 = "f77f130ded4e611d313a1bcf78f988990831c69b";
+        url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.4.tgz";
+        name = "convert-source-map-0.3.4.tgz";
+        sha1 = "9bfff1d4a21b9be94da60271ea2b5e6b5a761572";
       })
     ];
     buildInputs =
@@ -3926,25 +4202,6 @@
     ];
     passthru.names = [ "cookie" ];
   };
-  by-spec."cookie"."0.1.1" =
-    self.by-version."cookie"."0.1.1";
-  by-version."cookie"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookie-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie/-/cookie-0.1.1.tgz";
-        name = "cookie-0.1.1.tgz";
-        sha1 = "cbd4b537aa65f800b6c66ead2520ba8d6afbdf54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie" ];
-  };
   by-spec."cookie"."0.1.2" =
     self.by-version."cookie"."0.1.2";
   by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -4002,29 +4259,29 @@
     ];
     passthru.names = [ "cookie-jar" ];
   };
-  by-spec."cookie-parser"."1.0.1" =
-    self.by-version."cookie-parser"."1.0.1";
-  by-version."cookie-parser"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookie-parser-1.0.1";
+  by-spec."cookie-parser"."1.1.0" =
+    self.by-version."cookie-parser"."1.1.0";
+  by-version."cookie-parser"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-parser-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
-        name = "cookie-parser-1.0.1.tgz";
-        sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0";
+        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.1.0.tgz";
+        name = "cookie-parser-1.1.0.tgz";
+        sha1 = "2f8265aa3b55733a85eef207f0e2530c3e8cf705";
       })
     ];
     buildInputs =
       (self.nativeDeps."cookie-parser" or []);
     deps = [
-      self.by-version."cookie"."0.1.0"
+      self.by-version."cookie"."0.1.2"
       self.by-version."cookie-signature"."1.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cookie-parser" ];
   };
-  by-spec."cookie-parser"."~1.0.1" =
-    self.by-version."cookie-parser"."1.0.1";
+  by-spec."cookie-parser"."~1.1.0" =
+    self.by-version."cookie-parser"."1.1.0";
   by-spec."cookie-signature"."1.0.0" =
     self.by-version."cookie-signature"."1.0.0";
   by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -4101,35 +4358,54 @@
     ];
     passthru.names = [ "cookiejar" ];
   };
-  by-spec."cookies".">= 0.2.2" =
-    self.by-version."cookies"."0.4.0";
-  by-version."cookies"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookies-0.4.0";
+  by-spec."cookiejar"."1.3.2" =
+    self.by-version."cookiejar"."1.3.2";
+  by-version."cookiejar"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookiejar-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cookies/-/cookies-0.4.0.tgz";
-        name = "cookies-0.4.0.tgz";
-        sha1 = "c5d1f8b76217ed653135afe32bdad747c2fa9190";
+        url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz";
+        name = "cookiejar-1.3.2.tgz";
+        sha1 = "61d3229e2da20c859032233502958a9b7df58249";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookiejar" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookiejar" ];
+  };
+  by-spec."cookies".">= 0.2.2" =
+    self.by-version."cookies"."0.4.1";
+  by-version."cookies"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookies-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookies/-/cookies-0.4.1.tgz";
+        name = "cookies-0.4.1.tgz";
+        sha1 = "7d43bd00583c985acc032258b97988b7d03b629e";
       })
     ];
     buildInputs =
       (self.nativeDeps."cookies" or []);
     deps = [
-      self.by-version."keygrip"."1.0.0"
+      self.by-version."keygrip"."1.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cookies" ];
   };
   by-spec."copy-paste"."~0.2.0" =
-    self.by-version."copy-paste"."0.2.0";
-  by-version."copy-paste"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-copy-paste-0.2.0";
+    self.by-version."copy-paste"."0.2.2";
+  by-version."copy-paste"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-copy-paste-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.0.tgz";
-        name = "copy-paste-0.2.0.tgz";
-        sha1 = "6a83a3a073fc144adfa83cd03adb8db35953c424";
+        url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.2.tgz";
+        name = "copy-paste-0.2.2.tgz";
+        sha1 = "036942c5ab735eec9a8e0a2308759e7feadb2625";
       })
     ];
     buildInputs =
@@ -4174,7 +4450,7 @@
     buildInputs =
       (self.nativeDeps."couch-login" or []);
     deps = [
-      self.by-version."request"."2.34.0"
+      self.by-version."request"."2.36.0"
     ];
     peerDependencies = [
     ];
@@ -4223,6 +4499,27 @@
     ];
     passthru.names = [ "crc" ];
   };
+  by-spec."crc32-stream"."~0.2.0" =
+    self.by-version."crc32-stream"."0.2.0";
+  by-version."crc32-stream"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-crc32-stream-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.2.0.tgz";
+        name = "crc32-stream-0.2.0.tgz";
+        sha1 = "5c80d480c8682f904b6f15530dbbe0b8c063dbbe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."crc32-stream" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.27-1"
+      self.by-version."buffer-crc32"."0.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "crc32-stream" ];
+  };
   by-spec."crossroads"."~0.12.0" =
     self.by-version."crossroads"."0.12.0";
   by-version."crossroads"."0.12.0" = lib.makeOverridable self.buildNodePackage {
@@ -4418,35 +4715,15 @@
     ];
     passthru.names = [ "css-stringify" ];
   };
-  by-spec."csurf"."1.0.0" =
-    self.by-version."csurf"."1.0.0";
-  by-version."csurf"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-csurf-1.0.0";
+  by-spec."csurf"."1.2.0" =
+    self.by-version."csurf"."1.2.0";
+  by-version."csurf"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-csurf-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/csurf/-/csurf-1.0.0.tgz";
-        name = "csurf-1.0.0.tgz";
-        sha1 = "a68d5718b988032e270abf1f4b34f272753d745b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."csurf" or []);
-    deps = [
-      self.by-version."uid2"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "csurf" ];
-  };
-  by-spec."csurf"."1.1.0" =
-    self.by-version."csurf"."1.1.0";
-  by-version."csurf"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-csurf-1.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
-        name = "csurf-1.1.0.tgz";
-        sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2";
+        url = "http://registry.npmjs.org/csurf/-/csurf-1.2.0.tgz";
+        name = "csurf-1.2.0.tgz";
+        sha1 = "56d1d1e921a4027e6adf87f51e706b825c74ab13";
       })
     ];
     buildInputs =
@@ -4516,7 +4793,27 @@
     ];
     passthru.names = [ "cycle" ];
   };
-  by-spec."dargs"."~0.1.0" =
+  by-spec."d"."~0.1.1" =
+    self.by-version."d"."0.1.1";
+  by-version."d"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-d-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz";
+        name = "d-0.1.1.tgz";
+        sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."d" or []);
+    deps = [
+      self.by-version."es5-ext"."0.10.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "d" ];
+  };
+  by-spec."dargs"."^0.1.0" =
     self.by-version."dargs"."0.1.0";
   by-version."dargs"."0.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-dargs-0.1.0";
@@ -4535,6 +4832,27 @@
     ];
     passthru.names = [ "dargs" ];
   };
+  by-spec."dargs"."~0.1.0" =
+    self.by-version."dargs"."0.1.0";
+  by-spec."date-now"."^0.1.4" =
+    self.by-version."date-now"."0.1.4";
+  by-version."date-now"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-date-now-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+        name = "date-now-0.1.4.tgz";
+        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."date-now" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "date-now" ];
+  };
   by-spec."dateformat"."1.0.2-1.2.3" =
     self.by-version."dateformat"."1.0.2-1.2.3";
   by-version."dateformat"."1.0.2-1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -4555,14 +4873,14 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."dateformat"."~1.0.6" =
-    self.by-version."dateformat"."1.0.7-1.2.3";
-  by-version."dateformat"."1.0.7-1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-dateformat-1.0.7-1.2.3";
+    self.by-version."dateformat"."1.0.8-1.2.3";
+  by-version."dateformat"."1.0.8-1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dateformat-1.0.8-1.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz";
-        name = "dateformat-1.0.7-1.2.3.tgz";
-        sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c";
+        url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.8-1.2.3.tgz";
+        name = "dateformat-1.0.8-1.2.3.tgz";
+        sha1 = "5d60c5d574dc778a7f98139156c6cfc9d851d1e7";
       })
     ];
     buildInputs =
@@ -4574,19 +4892,20 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."0.8.1";
-  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-debug-0.8.1";
+    self.by-version."debug"."1.0.1";
+  by-version."debug"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
-        name = "debug-0.8.1.tgz";
-        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+        url = "http://registry.npmjs.org/debug/-/debug-1.0.1.tgz";
+        name = "debug-1.0.1.tgz";
+        sha1 = "3c03d40462f0be20468e4f77dd3f2bf7a722cfb7";
       })
     ];
     buildInputs =
       (self.nativeDeps."debug" or []);
     deps = [
+      self.by-version."ms"."0.6.2"
     ];
     peerDependencies = [
     ];
@@ -4630,23 +4949,87 @@
     ];
     passthru.names = [ "debug" ];
   };
+  by-spec."debug"."0.8.0" =
+    self.by-version."debug"."0.8.0";
+  by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-0.8.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
+        name = "debug-0.8.0.tgz";
+        sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  by-spec."debug"."0.8.1" =
+    self.by-version."debug"."0.8.1";
+  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-0.8.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
+        name = "debug-0.8.1.tgz";
+        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
+  by-spec."debug"."1.0.0" =
+    self.by-version."debug"."1.0.0";
+  by-version."debug"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/debug/-/debug-1.0.0.tgz";
+        name = "debug-1.0.0.tgz";
+        sha1 = "553678b67494cacc2d5330c24dfb2f275b1ceb5a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."debug" or []);
+    deps = [
+      self.by-version."ms"."0.6.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "debug" ];
+  };
   by-spec."debug".">= 0.7.3 < 1" =
     self.by-version."debug"."0.8.1";
+  by-spec."debug".">= 0.8.0 < 1" =
+    self.by-version."debug"."0.8.1";
+  by-spec."debug"."^0.8.0" =
+    self.by-version."debug"."0.8.1";
   by-spec."debug"."~0.7.0" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.7.2" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.8" =
     self.by-version."debug"."0.8.1";
+  by-spec."debug"."~0.8.0" =
+    self.by-version."debug"."0.8.1";
   by-spec."decompress"."^0.2.0" =
-    self.by-version."decompress"."0.2.3";
-  by-version."decompress"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-0.2.3";
+    self.by-version."decompress"."0.2.4";
+  by-version."decompress"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "decompress-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.3.tgz";
-        name = "decompress-0.2.3.tgz";
-        sha1 = "ad471a0fc51b7193b72f60c9e040ce1a7a4b9fcc";
+        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.4.tgz";
+        name = "decompress-0.2.4.tgz";
+        sha1 = "33d08cc3678d3f84cb0c7606242b4ff1faf8d45a";
       })
     ];
     buildInputs =
@@ -4655,10 +5038,10 @@
       self.by-version."adm-zip"."0.4.4"
       self.by-version."extname"."0.1.2"
       self.by-version."get-stdin"."0.1.0"
-      self.by-version."map-key"."0.1.1"
+      self.by-version."map-key"."0.1.4"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."stream-combiner"."0.0.4"
       self.by-version."tar"."0.1.19"
       self.by-version."tempfile"."0.1.3"
@@ -4668,14 +5051,14 @@
     passthru.names = [ "decompress" ];
   };
   by-spec."decompress-zip"."~0.0.3" =
-    self.by-version."decompress-zip"."0.0.6";
-  by-version."decompress-zip"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-zip-0.0.6";
+    self.by-version."decompress-zip"."0.0.8";
+  by-version."decompress-zip"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "decompress-zip-0.0.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.6.tgz";
-        name = "decompress-zip-0.0.6.tgz";
-        sha1 = "263ef05b304cdcd1172858af453561c53ae017bb";
+        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz";
+        name = "decompress-zip-0.0.8.tgz";
+        sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3";
       })
     ];
     buildInputs =
@@ -4686,12 +5069,15 @@
       self.by-version."binary"."0.3.0"
       self.by-version."touch"."0.0.2"
       self.by-version."readable-stream"."1.1.13-1"
-      self.by-version."nopt"."2.2.0"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."graceful-fs"."3.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "decompress-zip" ];
   };
+  by-spec."decompress-zip"."~0.0.6" =
+    self.by-version."decompress-zip"."0.0.8";
   by-spec."deep-eql"."0.1.3" =
     self.by-version."deep-eql"."0.1.3";
   by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -4772,14 +5158,14 @@
     passthru.names = [ "deep-equal" ];
   };
   by-spec."deep-extend"."~0.2.5" =
-    self.by-version."deep-extend"."0.2.8";
-  by-version."deep-extend"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-deep-extend-0.2.8";
+    self.by-version."deep-extend"."0.2.10";
+  by-version."deep-extend"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-deep-extend-0.2.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz";
-        name = "deep-extend-0.2.8.tgz";
-        sha1 = "6d2893a805286e46d8243137c32fb991b50f4299";
+        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz";
+        name = "deep-extend-0.2.10.tgz";
+        sha1 = "8dd87f56835e91a7da57d07f3c5472165cf5d467";
       })
     ];
     buildInputs =
@@ -4791,7 +5177,7 @@
     passthru.names = [ "deep-extend" ];
   };
   by-spec."deep-extend"."~0.2.8" =
-    self.by-version."deep-extend"."0.2.8";
+    self.by-version."deep-extend"."0.2.10";
   by-spec."deepmerge"."*" =
     self.by-version."deepmerge"."0.2.7";
   by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage {
@@ -4831,6 +5217,26 @@
     ];
     passthru.names = [ "defined" ];
   };
+  by-spec."deflate-crc32-stream"."~0.1.0" =
+    self.by-version."deflate-crc32-stream"."0.1.1";
+  by-version."deflate-crc32-stream"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-deflate-crc32-stream-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deflate-crc32-stream/-/deflate-crc32-stream-0.1.1.tgz";
+        name = "deflate-crc32-stream-0.1.1.tgz";
+        sha1 = "5df9e343174f56e7d6056e8ba1f91e5576c02160";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deflate-crc32-stream" or []);
+    deps = [
+      self.by-version."buffer-crc32"."0.2.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "deflate-crc32-stream" ];
+  };
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -4851,14 +5257,14 @@
     passthru.names = [ "delayed-stream" ];
   };
   by-spec."deps-sort"."~0.1.1" =
-    self.by-version."deps-sort"."0.1.1";
-  by-version."deps-sort"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "deps-sort-0.1.1";
+    self.by-version."deps-sort"."0.1.2";
+  by-version."deps-sort"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "deps-sort-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz";
-        name = "deps-sort-0.1.1.tgz";
-        sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6";
+        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz";
+        name = "deps-sort-0.1.2.tgz";
+        sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a";
       })
     ];
     buildInputs =
@@ -4866,7 +5272,7 @@
     deps = [
       self.by-version."through"."2.3.4"
       self.by-version."JSONStream"."0.6.4"
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.0.10"
     ];
     peerDependencies = [
     ];
@@ -4953,7 +5359,7 @@
     ];
     passthru.names = [ "diff" ];
   };
-  by-spec."diff"."~1.0.3" =
+  by-spec."diff"."^1.0.4" =
     self.by-version."diff"."1.0.8";
   by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage {
     name = "node-diff-1.0.8";
@@ -4972,6 +5378,8 @@
     ];
     passthru.names = [ "diff" ];
   };
+  by-spec."diff"."~1.0.3" =
+    self.by-version."diff"."1.0.8";
   by-spec."diff"."~1.0.4" =
     self.by-version."diff"."1.0.8";
   by-spec."diff"."~1.0.7" =
@@ -4995,36 +5403,36 @@
     ];
     passthru.names = [ "director" ];
   };
-  by-spec."dkim-signer"."~0.1.0" =
-    self.by-version."dkim-signer"."0.1.0";
-  by-version."dkim-signer"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-dkim-signer-0.1.0";
+  by-spec."dkim-signer"."~0.1.1" =
+    self.by-version."dkim-signer"."0.1.2";
+  by-version."dkim-signer"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dkim-signer-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz";
-        name = "dkim-signer-0.1.0.tgz";
-        sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b";
+        url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
+        name = "dkim-signer-0.1.2.tgz";
+        sha1 = "2ff5d61c87d8fbff5a8b131cffc5ec3ba1c25553";
       })
     ];
     buildInputs =
       (self.nativeDeps."dkim-signer" or []);
     deps = [
       self.by-version."punycode"."1.2.4"
-      self.by-version."mimelib"."0.2.14"
+      self.by-version."mimelib"."0.2.16"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "dkim-signer" ];
   };
   by-spec."domain-browser"."~1.1.0" =
-    self.by-version."domain-browser"."1.1.1";
-  by-version."domain-browser"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domain-browser-1.1.1";
+    self.by-version."domain-browser"."1.1.2";
+  by-version."domain-browser"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domain-browser-1.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz";
-        name = "domain-browser-1.1.1.tgz";
-        sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0";
+        url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz";
+        name = "domain-browser-1.1.2.tgz";
+        sha1 = "5a21f30a29a9891533915061426974dc2f14e56b";
       })
     ];
     buildInputs =
@@ -5074,26 +5482,6 @@
     ];
     passthru.names = [ "domhandler" ];
   };
-  by-spec."domhandler"."2.1" =
-    self.by-version."domhandler"."2.1.0";
-  by-version."domhandler"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domhandler-2.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz";
-        name = "domhandler-2.1.0.tgz";
-        sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."domhandler" or []);
-    deps = [
-      self.by-version."domelementtype"."1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "domhandler" ];
-  };
   by-spec."domhandler"."2.2" =
     self.by-version."domhandler"."2.2.0";
   by-version."domhandler"."2.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -5174,33 +5562,55 @@
     ];
     passthru.names = [ "domutils" ];
   };
-  by-spec."download"."~0.1.6" =
-    self.by-version."download"."0.1.16";
-  by-version."download"."0.1.16" = lib.makeOverridable self.buildNodePackage {
-    name = "download-0.1.16";
+  by-spec."domutils"."1.5" =
+    self.by-version."domutils"."1.5.0";
+  by-version."domutils"."1.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domutils-1.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/download/-/download-0.1.16.tgz";
-        name = "download-0.1.16.tgz";
-        sha1 = "46783e7f590d1c0d49eb1915ab8941c74cb45e99";
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.5.0.tgz";
+        name = "domutils-1.5.0.tgz";
+        sha1 = "bfa4ceb8b7ab6f9423fe59154e04da6cc3ff3949";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."domutils" or []);
+    deps = [
+      self.by-version."domelementtype"."1.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "domutils" ];
+  };
+  by-spec."download"."^0.1.6" =
+    self.by-version."download"."0.1.17";
+  by-version."download"."0.1.17" = lib.makeOverridable self.buildNodePackage {
+    name = "download-0.1.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/download/-/download-0.1.17.tgz";
+        name = "download-0.1.17.tgz";
+        sha1 = "c2516c92b05d0447364e9a9e0ea060edef79dc3a";
       })
     ];
     buildInputs =
       (self.nativeDeps."download" or []);
     deps = [
-      self.by-version."decompress"."0.2.3"
-      self.by-version."each-async"."0.1.2"
+      self.by-version."decompress"."0.2.4"
+      self.by-version."each-async"."0.1.3"
       self.by-version."get-stdin"."0.1.0"
-      self.by-version."get-urls"."0.1.1"
+      self.by-version."get-urls"."0.1.2"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."request"."2.34.0"
-      self.by-version."through2"."0.4.1"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."request"."2.36.0"
+      self.by-version."through2"."0.4.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "download" ];
   };
+  by-spec."download"."~0.1.6" =
+    self.by-version."download"."0.1.17";
   by-spec."dox"."~0.4.4" =
     self.by-version."dox"."0.4.4";
   by-version."dox"."0.4.4" = lib.makeOverridable self.buildNodePackage {
@@ -5222,6 +5632,25 @@
     ];
     passthru.names = [ "dox" ];
   };
+  by-spec."drawille"."0.0.3" =
+    self.by-version."drawille"."0.0.3";
+  by-version."drawille"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-drawille-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/drawille/-/drawille-0.0.3.tgz";
+        name = "drawille-0.0.3.tgz";
+        sha1 = "182dda93748911f2583d37b423a1ad04f3337f91";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."drawille" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "drawille" ];
+  };
   by-spec."dtrace-provider"."0.2.8" =
     self.by-version."dtrace-provider"."0.2.8";
   by-version."dtrace-provider"."0.2.8" = lib.makeOverridable self.buildNodePackage {
@@ -5260,15 +5689,35 @@
     ];
     passthru.names = [ "duplexer" ];
   };
-  by-spec."each-async"."^0.1.1" =
-    self.by-version."each-async"."0.1.2";
-  by-version."each-async"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-each-async-0.1.2";
+  by-spec."duplexer2"."0.0.2" =
+    self.by-version."duplexer2"."0.0.2";
+  by-version."duplexer2"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-duplexer2-0.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.2.tgz";
-        name = "each-async-0.1.2.tgz";
-        sha1 = "d5b900bd92705ed5b8cad3307a6536adb0f134c6";
+        url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
+        name = "duplexer2-0.0.2.tgz";
+        sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."duplexer2" or []);
+    deps = [
+      self.by-version."readable-stream"."1.1.13-1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "duplexer2" ];
+  };
+  by-spec."each-async"."^0.1.1" =
+    self.by-version."each-async"."0.1.3";
+  by-version."each-async"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-each-async-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.3.tgz";
+        name = "each-async-0.1.3.tgz";
+        sha1 = "b436025b08da2f86608025519e3096763dedfca3";
       })
     ];
     buildInputs =
@@ -5336,26 +5785,7 @@
     ];
     passthru.names = [ "emitter-component" ];
   };
-  by-spec."emitter-component"."1.0.0" =
-    self.by-version."emitter-component"."1.0.0";
-  by-version."emitter-component"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-emitter-component-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz";
-        name = "emitter-component-1.0.0.tgz";
-        sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."emitter-component" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "emitter-component" ];
-  };
-  by-spec."encoding"."~0.1" =
+  by-spec."encoding"."~0.1.7" =
     self.by-version."encoding"."0.1.7";
   by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage {
     name = "node-encoding-0.1.7";
@@ -5375,6 +5805,26 @@
     ];
     passthru.names = [ "encoding" ];
   };
+  by-spec."end-of-stream"."~0.1.3" =
+    self.by-version."end-of-stream"."0.1.4";
+  by-version."end-of-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-end-of-stream-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.4.tgz";
+        name = "end-of-stream-0.1.4.tgz";
+        sha1 = "4a69b38706ecaaed83c53d22b7f073848ca9a203";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."end-of-stream" or []);
+    deps = [
+      self.by-version."once"."1.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "end-of-stream" ];
+  };
   by-spec."entities"."0.x" =
     self.by-version."entities"."0.5.0";
   by-version."entities"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -5394,6 +5844,44 @@
     ];
     passthru.names = [ "entities" ];
   };
+  by-spec."entities"."1.0" =
+    self.by-version."entities"."1.0.0";
+  by-version."entities"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-entities-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+        name = "entities-1.0.0.tgz";
+        sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."entities" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "entities" ];
+  };
+  by-spec."entities"."~1.1.1" =
+    self.by-version."entities"."1.1.1";
+  by-version."entities"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-entities-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
+        name = "entities-1.1.1.tgz";
+        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."entities" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "entities" ];
+  };
   by-spec."envify"."~1.2.0" =
     self.by-version."envify"."1.2.1";
   by-version."envify"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -5417,15 +5905,15 @@
     ];
     passthru.names = [ "envify" ];
   };
-  by-spec."errorhandler"."1.0.0" =
-    self.by-version."errorhandler"."1.0.0";
-  by-version."errorhandler"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-errorhandler-1.0.0";
+  by-spec."errorhandler"."1.0.2" =
+    self.by-version."errorhandler"."1.0.2";
+  by-version."errorhandler"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-errorhandler-1.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
-        name = "errorhandler-1.0.0.tgz";
-        sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a";
+        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.2.tgz";
+        name = "errorhandler-1.0.2.tgz";
+        sha1 = "587d47bbbbc48cffe132c3acda7215c902558108";
       })
     ];
     buildInputs =
@@ -5436,6 +5924,29 @@
     ];
     passthru.names = [ "errorhandler" ];
   };
+  by-spec."es5-ext"."~0.10.2" =
+    self.by-version."es5-ext"."0.10.4";
+  by-version."es5-ext"."0.10.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-es5-ext-0.10.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.4.tgz";
+        name = "es5-ext-0.10.4.tgz";
+        sha1 = "f4d7d85d45acfbe93379d4c0948fbae6466ec876";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."es5-ext" or []);
+    deps = [
+      self.by-version."es6-iterator"."0.1.1"
+      self.by-version."es6-symbol"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "es5-ext" ];
+  };
+  by-spec."es5-ext"."~0.10.4" =
+    self.by-version."es5-ext"."0.10.4";
   by-spec."es5-ext"."~0.9.2" =
     self.by-version."es5-ext"."0.9.2";
   by-version."es5-ext"."0.9.2" = lib.makeOverridable self.buildNodePackage {
@@ -5455,6 +5966,49 @@
     ];
     passthru.names = [ "es5-ext" ];
   };
+  by-spec."es6-iterator"."~0.1.1" =
+    self.by-version."es6-iterator"."0.1.1";
+  by-version."es6-iterator"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-es6-iterator-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.1.tgz";
+        name = "es6-iterator-0.1.1.tgz";
+        sha1 = "5e136c899aa1c26296414f90859b73934812d275";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."es6-iterator" or []);
+    deps = [
+      self.by-version."d"."0.1.1"
+      self.by-version."es5-ext"."0.10.4"
+      self.by-version."es6-symbol"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "es6-iterator" ];
+  };
+  by-spec."es6-symbol"."0.1.x" =
+    self.by-version."es6-symbol"."0.1.0";
+  by-version."es6-symbol"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-es6-symbol-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.0.tgz";
+        name = "es6-symbol-0.1.0.tgz";
+        sha1 = "ba5878f37a652f6c713244716fc7b24d61d2dc39";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."es6-symbol" or []);
+    deps = [
+      self.by-version."d"."0.1.1"
+      self.by-version."es5-ext"."0.10.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "es6-symbol" ];
+  };
   by-spec."escape-html"."*" =
     self.by-version."escape-html"."1.0.1";
   by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -5478,14 +6032,14 @@
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
   by-spec."escodegen"."1.3.x" =
-    self.by-version."escodegen"."1.3.2";
-  by-version."escodegen"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.3.2";
+    self.by-version."escodegen"."1.3.3";
+  by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.3.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.2.tgz";
-        name = "escodegen-1.3.2.tgz";
-        sha1 = "bb0f434dbd594f2060639a79b4b06259dd5372de";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+        name = "escodegen-1.3.3.tgz";
+        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
       })
     ];
     buildInputs =
@@ -5547,6 +6101,8 @@
     ];
     passthru.names = [ "escodegen" ];
   };
+  by-spec."escodegen"."~1.3.1" =
+    self.by-version."escodegen"."1.3.3";
   by-spec."escope"."~ 1.0.0" =
     self.by-version."escope"."1.0.1";
   by-version."escope"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -5613,15 +6169,15 @@
     ];
     passthru.names = [ "esmangle" ];
   };
-  by-spec."esprima"."1.1.x" =
-    self.by-version."esprima"."1.1.1";
-  by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "esprima-1.1.1";
+  by-spec."esprima"."1.2.x" =
+    self.by-version."esprima"."1.2.2";
+  by-version."esprima"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
-        name = "esprima-1.1.1.tgz";
-        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz";
+        name = "esprima-1.2.2.tgz";
+        sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b";
       })
     ];
     buildInputs =
@@ -5657,6 +6213,23 @@
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.1.1" =
     self.by-version."esprima"."1.1.1";
+  by-version."esprima"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "esprima-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+        name = "esprima-1.1.1.tgz";
+        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."esprima" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "esprima" ];
+  };
   by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
   by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage {
@@ -5842,6 +6415,27 @@
     ];
     passthru.names = [ "event-emitter" ];
   };
+  by-spec."event-emitter"."~0.3.1" =
+    self.by-version."event-emitter"."0.3.1";
+  by-version."event-emitter"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-event-emitter-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.1.tgz";
+        name = "event-emitter-0.3.1.tgz";
+        sha1 = "1425ca9c5649a1a31ba835bd9dba6bfad3880238";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."event-emitter" or []);
+    deps = [
+      self.by-version."es5-ext"."0.10.4"
+      self.by-version."d"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "event-emitter" ];
+  };
   by-spec."event-stream"."~0.5" =
     self.by-version."event-stream"."0.5.3";
   by-version."event-stream"."0.5.3" = lib.makeOverridable self.buildNodePackage {
@@ -5902,15 +6496,34 @@
   };
   by-spec."eventemitter2"."~0.4.13" =
     self.by-version."eventemitter2"."0.4.13";
-  by-spec."events"."~1.0.0" =
-    self.by-version."events"."1.0.0";
-  by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-events-1.0.0";
+  by-spec."eventemitter3"."*" =
+    self.by-version."eventemitter3"."0.1.2";
+  by-version."eventemitter3"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-eventemitter3-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz";
-        name = "events-1.0.0.tgz";
-        sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0";
+        url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.2.tgz";
+        name = "eventemitter3-0.1.2.tgz";
+        sha1 = "4ede96d72b971a217987df4f1d4ca54dd8d20b79";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."eventemitter3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "eventemitter3" ];
+  };
+  by-spec."events"."~1.0.0" =
+    self.by-version."events"."1.0.1";
+  by-version."events"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-events-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/events/-/events-1.0.1.tgz";
+        name = "events-1.0.1.tgz";
+        sha1 = "386f6471cbb609e7925e7bfe7468634b9e069ac2";
       })
     ];
     buildInputs =
@@ -5957,12 +6570,12 @@
       self.by-version."oauth"."0.9.11"
       self.by-version."request"."2.9.203"
       self.by-version."connect"."2.3.9"
-      self.by-version."openid"."0.5.8"
-      self.by-version."xml2js"."0.4.2"
+      self.by-version."openid"."0.5.9"
+      self.by-version."xml2js"."0.4.4"
       self.by-version."node-swt"."0.1.1"
       self.by-version."node-wsfederation"."0.1.1"
       self.by-version."debug"."0.5.0"
-      self.by-version."express"."3.5.1"
+      self.by-version."express"."3.10.3"
     ];
     peerDependencies = [
     ];
@@ -5988,7 +6601,7 @@
     ];
     passthru.names = [ "execSync" ];
   };
-  by-spec."exit"."0.1.x" =
+  by-spec."exit"."0.1.2" =
     self.by-version."exit"."0.1.2";
   by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-exit-0.1.2";
@@ -6007,37 +6620,40 @@
     ];
     passthru.names = [ "exit" ];
   };
+  by-spec."exit"."0.1.x" =
+    self.by-version."exit"."0.1.2";
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
   by-spec."express"."*" =
-    self.by-version."express"."4.0.0";
-  by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-4.0.0";
+    self.by-version."express"."4.4.1";
+  by-version."express"."4.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz";
-        name = "express-4.0.0.tgz";
-        sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094";
+        url = "http://registry.npmjs.org/express/-/express-4.4.1.tgz";
+        name = "express-4.4.1.tgz";
+        sha1 = "9e0364d1c74e076d7409d302429a384b10dfbd42";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
-      self.by-version."parseurl"."1.0.1"
-      self.by-version."accepts"."1.0.0"
-      self.by-version."type-is"."1.0.0"
-      self.by-version."range-parser"."1.0.0"
-      self.by-version."cookie"."0.1.0"
+      self.by-version."accepts"."1.0.2"
       self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."methods"."1.0.1"
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."proxy-addr"."1.0.0"
+      self.by-version."range-parser"."1.0.0"
+      self.by-version."send"."0.4.1"
+      self.by-version."serve-static"."1.2.1"
+      self.by-version."type-is"."1.2.0"
+      self.by-version."cookie"."0.1.2"
       self.by-version."fresh"."0.2.2"
-      self.by-version."methods"."0.1.0"
-      self.by-version."send"."0.2.0"
       self.by-version."cookie-signature"."1.0.3"
       self.by-version."merge-descriptors"."0.0.2"
       self.by-version."utils-merge"."1.0.0"
       self.by-version."escape-html"."1.0.1"
       self.by-version."qs"."0.6.6"
-      self.by-version."serve-static"."1.0.1"
       self.by-version."path-to-regexp"."0.1.2"
       self.by-version."debug"."0.8.1"
     ];
@@ -6045,7 +6661,7 @@
     ];
     passthru.names = [ "express" ];
   };
-  "express" = self.by-version."express"."4.0.0";
+  "express" = self.by-version."express"."4.4.1";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -6093,7 +6709,7 @@
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
     ];
     peerDependencies = [
     ];
@@ -6123,45 +6739,49 @@
       self.by-version."methods"."0.1.0"
       self.by-version."send"."0.1.4"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.5.1";
-  by-version."express"."3.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.5.1";
+    self.by-version."express"."3.10.3";
+  by-version."express"."3.10.3" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.10.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.5.1.tgz";
-        name = "express-3.5.1.tgz";
-        sha1 = "4b333e1117faca336a538f4c724140b9ce1a87e7";
+        url = "http://registry.npmjs.org/express/-/express-3.10.3.tgz";
+        name = "express-3.10.3.tgz";
+        sha1 = "d669d5fa2d79fa6349af5fa6338d646bc346ada5";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
-      self.by-version."connect"."2.14.1"
-      self.by-version."commander"."1.3.2"
-      self.by-version."range-parser"."1.0.0"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."cookie"."0.1.1"
       self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."connect"."2.19.4"
+      self.by-version."commander"."1.3.2"
+      self.by-version."debug"."1.0.0"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."methods"."1.0.1"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."proxy-addr"."1.0.1"
+      self.by-version."range-parser"."1.0.0"
+      self.by-version."send"."0.4.1"
+      self.by-version."vary"."0.1.0"
+      self.by-version."cookie"."0.1.2"
       self.by-version."fresh"."0.2.2"
-      self.by-version."methods"."0.1.0"
-      self.by-version."send"."0.2.0"
       self.by-version."cookie-signature"."1.0.3"
       self.by-version."merge-descriptors"."0.0.2"
-      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
   by-spec."express".">=3.0.0" =
-    self.by-version."express"."4.0.0";
+    self.by-version."express"."4.4.1";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -6186,16 +6806,84 @@
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.0"
+      self.by-version."debug"."1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
+  by-spec."express"."~4.0" =
+    self.by-version."express"."4.0.0";
+  by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz";
+        name = "express-4.0.0.tgz";
+        sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express" or []);
+    deps = [
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."accepts"."1.0.0"
+      self.by-version."type-is"."1.0.0"
+      self.by-version."range-parser"."1.0.0"
+      self.by-version."cookie"."0.1.0"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."methods"."0.1.0"
+      self.by-version."send"."0.2.0"
+      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."merge-descriptors"."0.0.2"
+      self.by-version."utils-merge"."1.0.0"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."qs"."0.6.6"
+      self.by-version."serve-static"."1.0.1"
+      self.by-version."path-to-regexp"."0.1.2"
+      self.by-version."debug"."0.8.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express" ];
+  };
+  by-spec."express"."~4.2.0" =
+    self.by-version."express"."4.2.0";
+  by-version."express"."4.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express/-/express-4.2.0.tgz";
+        name = "express-4.2.0.tgz";
+        sha1 = "3121993a45126693e8bf897aefb4dd783762dc60";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express" or []);
+    deps = [
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."accepts"."1.0.1"
+      self.by-version."type-is"."1.1.0"
+      self.by-version."range-parser"."1.0.0"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."methods"."1.0.0"
+      self.by-version."send"."0.3.0"
+      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."merge-descriptors"."0.0.2"
+      self.by-version."utils-merge"."1.0.0"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."qs"."0.6.6"
+      self.by-version."serve-static"."1.1.0"
+      self.by-version."path-to-regexp"."0.1.2"
       self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
-  by-spec."express"."~3.5" =
-    self.by-version."express"."3.5.1";
-  by-spec."express"."~4.0.0-rc4" =
-    self.by-version."express"."4.0.0";
   by-spec."express-form"."*" =
     self.by-version."express-form"."0.12.2";
   by-version."express-form"."0.12.2" = lib.makeOverridable self.buildNodePackage {
@@ -6215,7 +6903,7 @@
       self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
-      self.by-version."express"."4.0.0"
+      self.by-version."express"."4.4.1"
     ];
     passthru.names = [ "express-form" ];
   };
@@ -6239,40 +6927,41 @@
     ];
     passthru.names = [ "express-partials" ];
   };
-  by-spec."express-session"."1.0.2" =
-    self.by-version."express-session"."1.0.2";
-  by-version."express-session"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-session-1.0.2";
+  by-spec."express-session"."1.2.1" =
+    self.by-version."express-session"."1.2.1";
+  by-version."express-session"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-session-1.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
-        name = "express-session-1.0.2.tgz";
-        sha1 = "004478c742561774411ceb79733155a56b6d49eb";
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.2.1.tgz";
+        name = "express-session-1.2.1.tgz";
+        sha1 = "2741a1661eb3a4a17a7db0a48049fbf05574e465";
       })
     ];
     buildInputs =
       (self.nativeDeps."express-session" or []);
     deps = [
       self.by-version."utils-merge"."1.0.0"
-      self.by-version."cookie"."0.1.0"
+      self.by-version."cookie"."0.1.2"
       self.by-version."cookie-signature"."1.0.3"
+      self.by-version."on-headers"."0.0.0"
       self.by-version."uid2"."0.0.3"
       self.by-version."buffer-crc32"."0.2.1"
-      self.by-version."debug"."0.7.4"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express-session" ];
   };
-  by-spec."express-session"."~1.0.2" =
-    self.by-version."express-session"."1.0.3";
-  by-version."express-session"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-session-1.0.3";
+  by-spec."express-session"."~1.1.0" =
+    self.by-version."express-session"."1.1.0";
+  by-version."express-session"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-session-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.3.tgz";
-        name = "express-session-1.0.3.tgz";
-        sha1 = "a45ec65dda263f74f3b5b9c6da0ac74c36ac0639";
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.1.0.tgz";
+        name = "express-session-1.1.0.tgz";
+        sha1 = "8c010bf58109ea235a65566d2a96703b41ee6eae";
       })
     ];
     buildInputs =
@@ -6283,7 +6972,7 @@
       self.by-version."cookie-signature"."1.0.3"
       self.by-version."uid2"."0.0.3"
       self.by-version."buffer-crc32"."0.2.1"
-      self.by-version."debug"."0.7.4"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -6345,7 +7034,7 @@
       (self.nativeDeps."extname" or []);
     deps = [
       self.by-version."ext-list"."0.1.0"
-      self.by-version."map-key"."0.1.1"
+      self.by-version."map-key"."0.1.4"
       self.by-version."underscore.string"."2.3.3"
     ];
     peerDependencies = [
@@ -6445,33 +7134,15 @@
     buildInputs =
       (self.nativeDeps."faye-websocket" or []);
     deps = [
-      self.by-version."websocket-driver"."0.3.2"
+      self.by-version."websocket-driver"."0.3.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "faye-websocket" ];
   };
   "faye-websocket" = self.by-version."faye-websocket"."0.7.2";
-  by-spec."faye-websocket"."0.7.0" =
-    self.by-version."faye-websocket"."0.7.0";
-  by-version."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-faye-websocket-0.7.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz";
-        name = "faye-websocket-0.7.0.tgz";
-        sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."faye-websocket" or []);
-    deps = [
-      self.by-version."websocket-driver"."0.3.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "faye-websocket" ];
-  };
+  by-spec."faye-websocket"."0.7.2" =
+    self.by-version."faye-websocket"."0.7.2";
   by-spec."fetch-bower"."*" =
     self.by-version."fetch-bower"."2.0.0";
   by-version."fetch-bower"."2.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -6488,8 +7159,8 @@
     deps = [
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-logger"."0.2.1"
-      self.by-version."bower"."1.3.2"
-      self.by-version."glob"."3.2.9"
+      self.by-version."bower"."1.3.5"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
@@ -6520,6 +7191,32 @@
     ];
     passthru.names = [ "fields" ];
   };
+  by-spec."file-utils"."^0.2.0" =
+    self.by-version."file-utils"."0.2.0";
+  by-version."file-utils"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-file-utils-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/file-utils/-/file-utils-0.2.0.tgz";
+        name = "file-utils-0.2.0.tgz";
+        sha1 = "0372c89b19bd96fc9a02a180c91fad29e4dbacaa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."file-utils" or []);
+    deps = [
+      self.by-version."lodash"."2.4.1"
+      self.by-version."iconv-lite"."0.2.11"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."glob"."3.2.11"
+      self.by-version."minimatch"."0.2.14"
+      self.by-version."findup-sync"."0.1.3"
+      self.by-version."isbinaryfile"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "file-utils" ];
+  };
   by-spec."file-utils"."~0.1.1" =
     self.by-version."file-utils"."0.1.5";
   by-version."file-utils"."0.1.5" = lib.makeOverridable self.buildNodePackage {
@@ -6536,8 +7233,8 @@
     deps = [
       self.by-version."lodash"."2.1.0"
       self.by-version."iconv-lite"."0.2.11"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."glob"."3.2.9"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."glob"."3.2.11"
       self.by-version."minimatch"."0.2.14"
       self.by-version."findup-sync"."0.1.3"
       self.by-version."isbinaryfile"."0.1.9"
@@ -6546,8 +7243,8 @@
     ];
     passthru.names = [ "file-utils" ];
   };
-  by-spec."file-utils"."~0.1.5" =
-    self.by-version."file-utils"."0.1.5";
+  by-spec."file-utils"."~0.2.0" =
+    self.by-version."file-utils"."0.2.0";
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
@@ -6562,22 +7259,22 @@
     buildInputs =
       (self.nativeDeps."fileset" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."glob"."3.2.9"
+      self.by-version."minimatch"."0.3.0"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fileset" ];
   };
   by-spec."findit".">=1.1.0 <2.0.0" =
-    self.by-version."findit"."1.1.1";
-  by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-findit-1.1.1";
+    self.by-version."findit"."1.2.0";
+  by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-findit-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz";
-        name = "findit-1.1.1.tgz";
-        sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a";
+        url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
+        name = "findit-1.2.0.tgz";
+        sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
       })
     ];
     buildInputs =
@@ -6609,7 +7306,7 @@
     ];
     passthru.names = [ "findup" ];
   };
-  by-spec."findup-sync"."~0.1.0" =
+  by-spec."findup-sync"."^0.1.2" =
     self.by-version."findup-sync"."0.1.3";
   by-version."findup-sync"."0.1.3" = lib.makeOverridable self.buildNodePackage {
     name = "node-findup-sync-0.1.3";
@@ -6623,15 +7320,36 @@
     buildInputs =
       (self.nativeDeps."findup-sync" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
       self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "findup-sync" ];
   };
+  by-spec."findup-sync"."~0.1.0" =
+    self.by-version."findup-sync"."0.1.3";
   by-spec."findup-sync"."~0.1.2" =
     self.by-version."findup-sync"."0.1.3";
+  by-spec."finished"."1.1.4" =
+    self.by-version."finished"."1.1.4";
+  by-version."finished"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-finished-1.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/finished/-/finished-1.1.4.tgz";
+        name = "finished-1.1.4.tgz";
+        sha1 = "4db9fe20f920bccc2e7126ffa84175c8fcacb5d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."finished" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "finished" ];
+  };
   by-spec."flatiron"."*" =
     self.by-version."flatiron"."0.3.11";
   by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage {
@@ -6698,15 +7416,34 @@
     ];
     passthru.names = [ "forEachAsync" ];
   };
-  by-spec."forever"."*" =
-    self.by-version."forever"."0.11.0";
-  by-version."forever"."0.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-0.11.0";
+  by-spec."foreachasync"."3.x" =
+    self.by-version."foreachasync"."3.0.0";
+  by-version."foreachasync"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-foreachasync-3.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forever/-/forever-0.11.0.tgz";
-        name = "forever-0.11.0.tgz";
-        sha1 = "97de678915c64dacce2ccbfb94620723b308d44f";
+        url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+        name = "foreachasync-3.0.0.tgz";
+        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."foreachasync" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "foreachasync" ];
+  };
+  by-spec."forever"."*" =
+    self.by-version."forever"."0.11.1";
+  by-version."forever"."0.11.1" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-0.11.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/forever/-/forever-0.11.1.tgz";
+        name = "forever-0.11.1.tgz";
+        sha1 = "50ac8744c0a6e0c266524c4746397f74d6b09c5b";
       })
     ];
     buildInputs =
@@ -6729,7 +7466,7 @@
     ];
     passthru.names = [ "forever" ];
   };
-  "forever" = self.by-version."forever"."0.11.0";
+  "forever" = self.by-version."forever"."0.11.1";
   by-spec."forever-agent"."~0.2.0" =
     self.by-version."forever-agent"."0.2.0";
   by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -6821,6 +7558,28 @@
   };
   by-spec."forever-monitor"."1.2.3" =
     self.by-version."forever-monitor"."1.2.3";
+  by-spec."form-data"."0.1.2" =
+    self.by-version."form-data"."0.1.2";
+  by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-form-data-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz";
+        name = "form-data-0.1.2.tgz";
+        sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."form-data" or []);
+    deps = [
+      self.by-version."combined-stream"."0.0.4"
+      self.by-version."mime"."1.2.11"
+      self.by-version."async"."0.2.10"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "form-data" ];
+  };
   by-spec."form-data"."~0.0.3" =
     self.by-version."form-data"."0.0.10";
   by-version."form-data"."0.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -6844,14 +7603,14 @@
     passthru.names = [ "form-data" ];
   };
   by-spec."form-data"."~0.1.0" =
-    self.by-version."form-data"."0.1.2";
-  by-version."form-data"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-form-data-0.1.2";
+    self.by-version."form-data"."0.1.3";
+  by-version."form-data"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-form-data-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz";
-        name = "form-data-0.1.2.tgz";
-        sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445";
+        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
+        name = "form-data-0.1.3.tgz";
+        sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
       })
     ];
     buildInputs =
@@ -6859,7 +7618,7 @@
     deps = [
       self.by-version."combined-stream"."0.0.4"
       self.by-version."mime"."1.2.11"
-      self.by-version."async"."0.2.10"
+      self.by-version."async"."0.9.0"
     ];
     peerDependencies = [
     ];
@@ -7039,7 +7798,7 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."jsonfile"."1.0.1"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
@@ -7059,7 +7818,7 @@
     buildInputs =
       (self.nativeDeps."fs-walk" or []);
     deps = [
-      self.by-version."async"."0.7.0"
+      self.by-version."async"."0.9.0"
     ];
     peerDependencies = [
     ];
@@ -7124,7 +7883,7 @@
     buildInputs =
       (self.nativeDeps."fstream" or []);
     deps = [
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."inherits"."2.0.1"
@@ -7141,45 +7900,45 @@
     self.by-version."fstream"."0.1.25";
   by-spec."fstream"."~0.1.8" =
     self.by-version."fstream"."0.1.25";
-  by-spec."fstream-ignore"."~0.0.5" =
-    self.by-version."fstream-ignore"."0.0.7";
-  by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fstream-ignore-0.0.7";
+  by-spec."fstream-ignore"."~0.0" =
+    self.by-version."fstream-ignore"."0.0.8";
+  by-version."fstream-ignore"."0.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fstream-ignore-0.0.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
-        name = "fstream-ignore-0.0.7.tgz";
-        sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
+        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz";
+        name = "fstream-ignore-0.0.8.tgz";
+        sha1 = "cc4830fb9963178be5d9eb37569a4a0785cf9e53";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream-ignore" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
       self.by-version."fstream"."0.1.25"
       self.by-version."inherits"."2.0.1"
+      self.by-version."minimatch"."0.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fstream-ignore" ];
   };
   by-spec."fstream-ignore"."~0.0.6" =
-    self.by-version."fstream-ignore"."0.0.7";
-  by-spec."fstream-npm"."~0.1.6" =
-    self.by-version."fstream-npm"."0.1.6";
-  by-version."fstream-npm"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fstream-npm-0.1.6";
+    self.by-version."fstream-ignore"."0.0.8";
+  by-spec."fstream-npm"."~0.1.7" =
+    self.by-version."fstream-npm"."0.1.7";
+  by-version."fstream-npm"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fstream-npm-0.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz";
-        name = "fstream-npm-0.1.6.tgz";
-        sha1 = "1369323075d9bd85cfcc9409f33f0d6fe5be104d";
+        url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.7.tgz";
+        name = "fstream-npm-0.1.7.tgz";
+        sha1 = "423dc5d1d1fcb7d878501f43c7e11a33292bd55f";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream-npm" or []);
     deps = [
-      self.by-version."fstream-ignore"."0.0.7"
+      self.by-version."fstream-ignore"."0.0.8"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
@@ -7187,45 +7946,47 @@
     passthru.names = [ "fstream-npm" ];
   };
   by-spec."generator-angular"."*" =
-    self.by-version."generator-angular"."0.8.0";
-  by-version."generator-angular"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-angular-0.8.0";
+    self.by-version."generator-angular"."0.9.0-0";
+  by-version."generator-angular"."0.9.0-0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-angular-0.9.0-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.8.0.tgz";
-        name = "generator-angular-0.8.0.tgz";
-        sha1 = "c2115b1a7a304b884b7f8857cade77dc36b63d13";
+        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.9.0-0.tgz";
+        name = "generator-angular-0.9.0-0.tgz";
+        sha1 = "f954bb283e570fba4e1ef1f30c497b56ffff522a";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-angular" or []);
     deps = [
-      self.by-version."chalk"."0.4.0"
-      self.by-version."wiredep"."1.0.0"
+      self.by-version."wiredep"."1.7.3"
       self.by-version."yeoman-generator"."0.16.0"
+      self.by-version."yosay"."0.2.1"
+      self.by-version."chalk"."0.4.0"
     ];
     peerDependencies = [
-      self.by-version."generator-karma"."0.7.0"
+      self.by-version."generator-karma"."0.8.2"
       self.by-version."yo"."1.1.2"
     ];
     passthru.names = [ "generator-angular" ];
   };
-  "generator-angular" = self.by-version."generator-angular"."0.8.0";
-  by-spec."generator-karma".">=0.6.0" =
-    self.by-version."generator-karma"."0.7.0";
-  by-version."generator-karma"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-karma-0.7.0";
+  "generator-angular" = self.by-version."generator-angular"."0.9.0-0";
+  by-spec."generator-karma".">=0.8.2" =
+    self.by-version."generator-karma"."0.8.2";
+  by-version."generator-karma"."0.8.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-karma-0.8.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.7.0.tgz";
-        name = "generator-karma-0.7.0.tgz";
-        sha1 = "aaa2b6d8905b687343fe6a10b15279afd984048d";
+        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.8.2.tgz";
+        name = "generator-karma-0.8.2.tgz";
+        sha1 = "46c6cd5fa3bf8ff54553f748a4fa75108ed0d74f";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-karma" or []);
     deps = [
-      self.by-version."yeoman-generator"."0.16.0"
+      self.by-version."underscore"."1.6.0"
+      self.by-version."yeoman-generator"."0.17.0"
     ];
     peerDependencies = [
       self.by-version."yo"."1.1.2"
@@ -7298,14 +8059,14 @@
     passthru.names = [ "get-stdin" ];
   };
   by-spec."get-urls"."^0.1.1" =
-    self.by-version."get-urls"."0.1.1";
-  by-version."get-urls"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "get-urls-0.1.1";
+    self.by-version."get-urls"."0.1.2";
+  by-version."get-urls"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "get-urls-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.1.tgz";
-        name = "get-urls-0.1.1.tgz";
-        sha1 = "f94aa79c9e5d99cb843e44c5f67e24954e08fb59";
+        url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.2.tgz";
+        name = "get-urls-0.1.2.tgz";
+        sha1 = "92a3e5ce2b9af2d2764ff5198681db373227b844";
       })
     ];
     buildInputs =
@@ -7373,14 +8134,14 @@
       self.by-version."cli-color"."0.2.3"
       self.by-version."cli-log"."0.0.8"
       self.by-version."github"."0.1.16"
-      self.by-version."copy-paste"."0.2.0"
+      self.by-version."copy-paste"."0.2.2"
       self.by-version."handlebars"."1.3.0"
       self.by-version."inquirer"."0.4.1"
       self.by-version."moment"."2.5.1"
-      self.by-version."nopt"."2.2.0"
+      self.by-version."nopt"."2.2.1"
       self.by-version."open"."0.0.5"
       self.by-version."truncate"."1.0.2"
-      self.by-version."update-notifier"."0.1.8"
+      self.by-version."update-notifier"."0.1.10"
       self.by-version."userhome"."0.1.0"
       self.by-version."which"."1.0.5"
       self.by-version."wordwrap"."0.0.2"
@@ -7449,15 +8210,15 @@
   };
   by-spec."github-url-from-git"."~1.1.1" =
     self.by-version."github-url-from-git"."1.1.1";
-  by-spec."github-url-from-username-repo"."0.0.2" =
-    self.by-version."github-url-from-username-repo"."0.0.2";
-  by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-github-url-from-username-repo-0.0.2";
+  by-spec."github-url-from-username-repo"."^0.1.0" =
+    self.by-version."github-url-from-username-repo"."0.1.0";
+  by-version."github-url-from-username-repo"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-url-from-username-repo-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz";
-        name = "github-url-from-username-repo-0.0.2.tgz";
-        sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd";
+        url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.1.0.tgz";
+        name = "github-url-from-username-repo-0.1.0.tgz";
+        sha1 = "fe398af670692e91af7bcfc5ae1d99ff97b1df89";
       })
     ];
     buildInputs =
@@ -7468,22 +8229,43 @@
     ];
     passthru.names = [ "github-url-from-username-repo" ];
   };
-  by-spec."glob"."3" =
-    self.by-version."glob"."3.2.9";
-  by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-glob-3.2.9";
+  by-spec."github-url-from-username-repo"."^0.2.0" =
+    self.by-version."github-url-from-username-repo"."0.2.0";
+  by-version."github-url-from-username-repo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-url-from-username-repo-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz";
-        name = "glob-3.2.9.tgz";
-        sha1 = "56af2289aa43d07d7702666480373eb814d91d40";
+        url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.2.0.tgz";
+        name = "github-url-from-username-repo-0.2.0.tgz";
+        sha1 = "7590b4fa605b7a6cbb7e06ffcd9d253210f9dbe1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."github-url-from-username-repo" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "github-url-from-username-repo" ];
+  };
+  by-spec."github-url-from-username-repo"."~0.1.0" =
+    self.by-version."github-url-from-username-repo"."0.1.0";
+  by-spec."glob"."3" =
+    self.by-version."glob"."3.2.11";
+  by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-3.2.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+        name = "glob-3.2.11.tgz";
+        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
       })
     ];
     buildInputs =
       (self.nativeDeps."glob" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
       self.by-version."inherits"."2.0.1"
+      self.by-version."minimatch"."0.3.0"
     ];
     peerDependencies = [
     ];
@@ -7512,13 +8294,37 @@
     passthru.names = [ "glob" ];
   };
   by-spec."glob"."3.2.x" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."3.x" =
-    self.by-version."glob"."3.2.9";
-  by-spec."glob".">= 3.1.4" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob".">=3.2.7 <4" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
+  by-spec."glob"."^3.2.0" =
+    self.by-version."glob"."3.2.11";
+  by-spec."glob"."^4.0.2" =
+    self.by-version."glob"."4.0.2";
+  by-version."glob"."4.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-4.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-4.0.2.tgz";
+        name = "glob-4.0.2.tgz";
+        sha1 = "d57dbdf54984dd7635c8247d1f2ebde2e81f4ee1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob" or []);
+    deps = [
+      self.by-version."inherits"."2.0.1"
+      self.by-version."minimatch"."0.3.0"
+      self.by-version."once"."1.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  by-spec."glob"."~ 3.2.1" =
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.1.21" =
     self.by-version."glob"."3.1.21";
   by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage {
@@ -7542,17 +8348,19 @@
     passthru.names = [ "glob" ];
   };
   by-spec."glob"."~3.2.0" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.1" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
+  by-spec."glob"."~3.2.10" =
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.6" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.7" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.8" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.9" =
-    self.by-version."glob"."3.2.9";
+    self.by-version."glob"."3.2.11";
   by-spec."graceful-fs"."2" =
     self.by-version."graceful-fs"."2.0.3";
   by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -7572,6 +8380,25 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
+  by-spec."graceful-fs"."2 || 3" =
+    self.by-version."graceful-fs"."3.0.1";
+  by-version."graceful-fs"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-graceful-fs-3.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.1.tgz";
+        name = "graceful-fs-3.0.1.tgz";
+        sha1 = "93352b5b951b009ef541271204122b612e46edaf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -7612,23 +8439,25 @@
   };
   by-spec."graceful-fs"."~1.2.0" =
     self.by-version."graceful-fs"."1.2.3";
-  by-spec."graceful-fs"."~2" =
-    self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.0" =
     self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.1" =
     self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.2" =
     self.by-version."graceful-fs"."2.0.3";
+  by-spec."graceful-fs"."~2.0.3" =
+    self.by-version."graceful-fs"."2.0.3";
+  by-spec."graceful-fs"."~3.0.0" =
+    self.by-version."graceful-fs"."3.0.1";
   by-spec."gridfs-stream"."*" =
-    self.by-version."gridfs-stream"."0.4.1";
-  by-version."gridfs-stream"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-gridfs-stream-0.4.1";
+    self.by-version."gridfs-stream"."0.5.1";
+  by-version."gridfs-stream"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gridfs-stream-0.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.1.tgz";
-        name = "gridfs-stream-0.4.1.tgz";
-        sha1 = "1bcccb1b05b57946363b5e53fbe2bc95dd8877bb";
+        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.1.tgz";
+        name = "gridfs-stream-0.5.1.tgz";
+        sha1 = "5fd94b0da4df1a602f7b0a02fb2365460d91b90c";
       })
     ];
     buildInputs =
@@ -7639,7 +8468,28 @@
     ];
     passthru.names = [ "gridfs-stream" ];
   };
-  "gridfs-stream" = self.by-version."gridfs-stream"."0.4.1";
+  "gridfs-stream" = self.by-version."gridfs-stream"."0.5.1";
+  by-spec."grouped-queue"."^0.2.1" =
+    self.by-version."grouped-queue"."0.2.1";
+  by-version."grouped-queue"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grouped-queue-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grouped-queue/-/grouped-queue-0.2.1.tgz";
+        name = "grouped-queue-0.2.1.tgz";
+        sha1 = "ede20396d6c7f313b6d44e438d7d646153fca9a9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grouped-queue" or []);
+    deps = [
+      self.by-version."lodash"."2.4.1"
+      self.by-version."setimmediate"."1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grouped-queue" ];
+  };
   by-spec."growl"."1.7.x" =
     self.by-version."growl"."1.7.0";
   by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage {
@@ -7660,14 +8510,14 @@
     passthru.names = [ "growl" ];
   };
   by-spec."grunt"."0.4.x" =
-    self.by-version."grunt"."0.4.4";
-  by-version."grunt"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-0.4.4";
+    self.by-version."grunt"."0.4.5";
+  by-version."grunt"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-0.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.4.tgz";
-        name = "grunt-0.4.4.tgz";
-        sha1 = "f37fa46e2e52e37f9a0370542a74281c09c73f53";
+        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz";
+        name = "grunt-0.4.5.tgz";
+        sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
       })
     ];
     buildInputs =
@@ -7684,27 +8534,28 @@
       self.by-version."iconv-lite"."0.2.11"
       self.by-version."minimatch"."0.2.14"
       self.by-version."nopt"."1.0.10"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."lodash"."0.9.2"
       self.by-version."underscore.string"."2.2.1"
       self.by-version."which"."1.0.5"
       self.by-version."js-yaml"."2.0.5"
       self.by-version."exit"."0.1.2"
       self.by-version."getobject"."0.1.0"
-      self.by-version."grunt-legacy-util"."0.1.2"
+      self.by-version."grunt-legacy-util"."0.2.0"
+      self.by-version."grunt-legacy-log"."0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "grunt" ];
   };
   by-spec."grunt"."^0.4.0" =
-    self.by-version."grunt"."0.4.4";
+    self.by-version."grunt"."0.4.5";
   by-spec."grunt"."~0.4" =
-    self.by-version."grunt"."0.4.4";
+    self.by-version."grunt"."0.4.5";
   by-spec."grunt"."~0.4.0" =
-    self.by-version."grunt"."0.4.4";
+    self.by-version."grunt"."0.4.5";
   by-spec."grunt"."~0.4.1" =
-    self.by-version."grunt"."0.4.4";
+    self.by-version."grunt"."0.4.5";
   by-spec."grunt-bower-task"."*" =
     self.by-version."grunt-bower-task"."0.3.4";
   by-version."grunt-bower-task"."0.3.4" = lib.makeOverridable self.buildNodePackage {
@@ -7775,7 +8626,7 @@
       self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-cssmin" ];
   };
@@ -7794,63 +8645,63 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-jshint" or []);
     deps = [
-      self.by-version."jshint"."2.5.0"
+      self.by-version."jshint"."2.5.1"
       self.by-version."hooker"."0.2.3"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-jshint" ];
   };
   "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.10.0";
   by-spec."grunt-contrib-less"."*" =
-    self.by-version."grunt-contrib-less"."0.11.0";
-  by-version."grunt-contrib-less"."0.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-less-0.11.0";
+    self.by-version."grunt-contrib-less"."0.11.1";
+  by-version."grunt-contrib-less"."0.11.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-less-0.11.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.0.tgz";
-        name = "grunt-contrib-less-0.11.0.tgz";
-        sha1 = "601cbdda0591f7fde7fe50278cd904fedede90ed";
+        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.1.tgz";
+        name = "grunt-contrib-less-0.11.1.tgz";
+        sha1 = "0671654e491a5c783893c2b49471c24992aca34e";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
-      self.by-version."less"."1.7.0"
+      self.by-version."less"."1.7.1"
       self.by-version."chalk"."0.4.0"
       self.by-version."maxmin"."0.1.0"
       self.by-version."lodash"."2.4.1"
       self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-less" ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.0";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.1";
   by-spec."grunt-contrib-requirejs"."*" =
-    self.by-version."grunt-contrib-requirejs"."0.4.3";
-  by-version."grunt-contrib-requirejs"."0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-requirejs-0.4.3";
+    self.by-version."grunt-contrib-requirejs"."0.4.4";
+  by-version."grunt-contrib-requirejs"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-requirejs-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.3.tgz";
-        name = "grunt-contrib-requirejs-0.4.3.tgz";
-        sha1 = "ac243dc312af5c85cd095169da1b3177bfe89c59";
+        url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz";
+        name = "grunt-contrib-requirejs-0.4.4.tgz";
+        sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-requirejs" or []);
     deps = [
-      self.by-version."requirejs"."2.1.11"
+      self.by-version."requirejs"."2.1.14"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-requirejs" ];
   };
-  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3";
+  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4";
   by-spec."grunt-contrib-uglify"."*" =
     self.by-version."grunt-contrib-uglify"."0.4.0";
   by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -7870,20 +8721,20 @@
       self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-uglify" ];
   };
   "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0";
   by-spec."grunt-karma"."*" =
-    self.by-version."grunt-karma"."0.8.2";
-  by-version."grunt-karma"."0.8.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-karma-0.8.2";
+    self.by-version."grunt-karma"."0.8.3";
+  by-version."grunt-karma"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-karma-0.8.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.2.tgz";
-        name = "grunt-karma-0.8.2.tgz";
-        sha1 = "0f422d357e4556fb96ab68c6d9a2be46908f1c84";
+        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.3.tgz";
+        name = "grunt-karma-0.8.3.tgz";
+        sha1 = "e9ecf718153af1914aa53602a37f85de04310e7f";
       })
     ];
     buildInputs =
@@ -7892,21 +8743,44 @@
       self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
-      self.by-version."karma"."0.12.9"
+      self.by-version."grunt"."0.4.5"
+      self.by-version."karma"."0.12.16"
     ];
     passthru.names = [ "grunt-karma" ];
   };
-  "grunt-karma" = self.by-version."grunt-karma"."0.8.2";
-  by-spec."grunt-legacy-util"."~0.1.2" =
-    self.by-version."grunt-legacy-util"."0.1.2";
-  by-version."grunt-legacy-util"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-legacy-util-0.1.2";
+  "grunt-karma" = self.by-version."grunt-karma"."0.8.3";
+  by-spec."grunt-legacy-log"."~0.1.0" =
+    self.by-version."grunt-legacy-log"."0.1.1";
+  by-version."grunt-legacy-log"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-legacy-log-0.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.1.2.tgz";
-        name = "grunt-legacy-util-0.1.2.tgz";
-        sha1 = "be84d337ef4a0137dc8566092a46528fd8957ebd";
+        url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz";
+        name = "grunt-legacy-log-0.1.1.tgz";
+        sha1 = "d41f1a6abc9b0b1256a2b5ff02f4c3298dfcd57a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."grunt-legacy-log" or []);
+    deps = [
+      self.by-version."hooker"."0.2.3"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."underscore.string"."2.3.3"
+      self.by-version."colors"."0.6.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "grunt-legacy-log" ];
+  };
+  by-spec."grunt-legacy-util"."~0.2.0" =
+    self.by-version."grunt-legacy-util"."0.2.0";
+  by-version."grunt-legacy-util"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-legacy-util-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
+        name = "grunt-legacy-util-0.2.0.tgz";
+        sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
       })
     ];
     buildInputs =
@@ -7941,11 +8815,32 @@
       self.by-version."replace"."0.2.9"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-sed" ];
   };
   "grunt-sed" = self.by-version."grunt-sed"."0.1.1";
+  by-spec."gruntfile-editor"."^0.1.0" =
+    self.by-version."gruntfile-editor"."0.1.0";
+  by-version."gruntfile-editor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gruntfile-editor-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gruntfile-editor/-/gruntfile-editor-0.1.0.tgz";
+        name = "gruntfile-editor-0.1.0.tgz";
+        sha1 = "b6cd84776dbf0681c16c95a8fce1f8ebb1b4e49e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."gruntfile-editor" or []);
+    deps = [
+      self.by-version."ast-query"."0.2.4"
+      self.by-version."lodash"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "gruntfile-editor" ];
+  };
   by-spec."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " =
     self.by-version."guifi-earth"."0.2.1";
   by-version."guifi-earth"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -7962,8 +8857,8 @@
     deps = [
       self.by-version."coffee-script"."1.7.1"
       self.by-version."jade"."1.3.1"
-      self.by-version."q"."2.0.1"
-      self.by-version."xml2js"."0.4.2"
+      self.by-version."q"."2.0.2"
+      self.by-version."xml2js"."0.4.4"
       self.by-version."msgpack"."0.2.3"
     ];
     peerDependencies = [
@@ -7985,7 +8880,7 @@
     buildInputs =
       (self.nativeDeps."gzip-size" or []);
     deps = [
-      self.by-version."concat-stream"."1.4.5"
+      self.by-version."concat-stream"."1.4.6"
       self.by-version."zlib-browserify"."0.0.3"
     ];
     peerDependencies = [
@@ -8006,7 +8901,7 @@
     buildInputs =
       (self.nativeDeps."gzippo" or []);
     deps = [
-      self.by-version."send"."0.2.0"
+      self.by-version."send"."0.4.1"
     ];
     peerDependencies = [
     ];
@@ -8206,44 +9101,45 @@
     passthru.names = [ "he" ];
   };
   by-spec."hipache"."*" =
-    self.by-version."hipache"."0.2.9";
-  by-version."hipache"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "hipache-0.2.9";
+    self.by-version."hipache"."0.3.1";
+  by-version."hipache"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "hipache-0.3.1";
     src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/hipache/-/hipache-0.2.9.tgz";
-        name = "hipache-0.2.9.tgz";
-        sha1 = "48a7fa7170be328b264d6e413bfb76d130e03b2a";
+      (fetchurl {
+        url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
+        name = "hipache-0.3.1.tgz";
+        sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5";
       })
     ];
     buildInputs =
       (self.nativeDeps."hipache" or []);
     deps = [
-      self.by-version."http-proxy"."0.10.3"
-      self.by-version."redis"."0.8.6"
-      self.by-version."lru-cache"."2.2.4"
-      self.by-version."optimist"."0.3.7"
+      self.by-version."http-proxy"."1.0.2"
+      self.by-version."redis"."0.10.3"
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "hipache" ];
   };
-  "hipache" = self.by-version."hipache"."0.2.9";
+  "hipache" = self.by-version."hipache"."0.3.1";
   by-spec."hiredis"."*" =
-    self.by-version."hiredis"."0.1.16";
-  by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage {
-    name = "node-hiredis-0.1.16";
+    self.by-version."hiredis"."0.1.17";
+  by-version."hiredis"."0.1.17" = lib.makeOverridable self.buildNodePackage {
+    name = "node-hiredis-0.1.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz";
-        name = "hiredis-0.1.16.tgz";
-        sha1 = "f6cee1add2589b8b71cef3c4d3936a9fcd638640";
+        url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz";
+        name = "hiredis-0.1.17.tgz";
+        sha1 = "60a33a968efc9a974e7ebb832f33aa965d3d354e";
       })
     ];
     buildInputs =
       (self.nativeDeps."hiredis" or []);
     deps = [
       self.by-version."bindings"."1.2.0"
+      self.by-version."nan"."1.1.2"
     ];
     peerDependencies = [
     ];
@@ -8325,6 +9221,25 @@
     ];
     passthru.names = [ "hooks" ];
   };
+  by-spec."hooks"."0.3.2" =
+    self.by-version."hooks"."0.3.2";
+  by-version."hooks"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-hooks-0.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/hooks/-/hooks-0.3.2.tgz";
+        name = "hooks-0.3.2.tgz";
+        sha1 = "a31f060c2026cea6cf1ca3eb178430e718e1c4a3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."hooks" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "hooks" ];
+  };
   by-spec."htmlparser2"."3.1.4" =
     self.by-version."htmlparser2"."3.1.4";
   by-version."htmlparser2"."3.1.4" = lib.makeOverridable self.buildNodePackage {
@@ -8348,24 +9263,25 @@
     ];
     passthru.names = [ "htmlparser2" ];
   };
-  by-spec."htmlparser2"."3.3.x" =
-    self.by-version."htmlparser2"."3.3.0";
-  by-version."htmlparser2"."3.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-htmlparser2-3.3.0";
+  by-spec."htmlparser2"."3.7.x" =
+    self.by-version."htmlparser2"."3.7.2";
+  by-version."htmlparser2"."3.7.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-htmlparser2-3.7.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz";
-        name = "htmlparser2-3.3.0.tgz";
-        sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe";
+        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.2.tgz";
+        name = "htmlparser2-3.7.2.tgz";
+        sha1 = "5f959dbc97e84a8418a9877c20f5f6f02a6482b0";
       })
     ];
     buildInputs =
       (self.nativeDeps."htmlparser2" or []);
     deps = [
-      self.by-version."domhandler"."2.1.0"
-      self.by-version."domutils"."1.1.6"
+      self.by-version."domhandler"."2.2.0"
+      self.by-version."domutils"."1.5.0"
       self.by-version."domelementtype"."1.1.1"
-      self.by-version."readable-stream"."1.0.27-1"
+      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."entities"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -8394,6 +9310,8 @@
     ];
     passthru.names = [ "htmlparser2" ];
   };
+  by-spec."htmlparser2"."~3.7.0" =
+    self.by-version."htmlparser2"."3.7.2";
   by-spec."http-auth"."2.0.7" =
     self.by-version."http-auth"."2.0.7";
   by-version."http-auth"."2.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -8436,24 +9354,21 @@
     ];
     passthru.names = [ "http-browserify" ];
   };
-  by-spec."http-proxy"."git+https://github.com/samalba/node-http-proxy.git" =
-    self.by-version."http-proxy"."0.10.3";
-  by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage {
-    name = "http-proxy-0.10.3";
+  by-spec."http-proxy"."1.0.2" =
+    self.by-version."http-proxy"."1.0.2";
+  by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-http-proxy-1.0.2";
     src = [
-      (fetchgit {
-        url = "https://github.com/samalba/node-http-proxy.git";
-        rev = "8e277989d2d05edaee65e524fb4fba9142c52aa5";
-        sha256 = "8ce0e05c73e517eefc6d9bf8b61349351aee119c2fb60763f23170607cc0e41f";
+      (fetchurl {
+        url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz";
+        name = "http-proxy-1.0.2.tgz";
+        sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254";
       })
     ];
     buildInputs =
       (self.nativeDeps."http-proxy" or []);
     deps = [
-      self.by-version."colors"."0.6.2"
-      self.by-version."optimist"."0.3.7"
-      self.by-version."pkginfo"."0.2.3"
-      self.by-version."utile"."0.1.7"
+      self.by-version."eventemitter3"."0.1.2"
     ];
     peerDependencies = [
     ];
@@ -8584,26 +9499,26 @@
     passthru.names = [ "i" ];
   };
   by-spec."i18next"."*" =
-    self.by-version."i18next"."1.7.3";
-  by-version."i18next"."1.7.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-i18next-1.7.3";
+    self.by-version."i18next"."1.7.4";
+  by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-i18next-1.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.3.tgz";
-        name = "i18next-1.7.3.tgz";
-        sha1 = "8a064866c8e6e87b4664a32fe81b9be34b4a3894";
+        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz";
+        name = "i18next-1.7.4.tgz";
+        sha1 = "b61629c9de95a5c076acb2f954f8a882ac0772af";
       })
     ];
     buildInputs =
       (self.nativeDeps."i18next" or []);
     deps = [
-      self.by-version."cookies"."0.4.0"
+      self.by-version."cookies"."0.4.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "i18next" ];
   };
-  "i18next" = self.by-version."i18next"."1.7.3";
+  "i18next" = self.by-version."i18next"."1.7.4";
   by-spec."ibrik"."~1.1.1" =
     self.by-version."ibrik"."1.1.1";
   by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -8620,7 +9535,7 @@
     deps = [
       self.by-version."lodash"."2.4.1"
       self.by-version."coffee-script-redux"."2.0.0-beta8"
-      self.by-version."istanbul"."0.2.7"
+      self.by-version."istanbul"."0.2.10"
       self.by-version."estraverse"."1.5.0"
       self.by-version."escodegen"."1.1.0"
       self.by-version."which"."1.0.5"
@@ -8631,7 +9546,7 @@
     ];
     passthru.names = [ "ibrik" ];
   };
-  by-spec."iconv-lite"."~0.2.10" =
+  by-spec."iconv-lite"."^0.2.10" =
     self.by-version."iconv-lite"."0.2.11";
   by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage {
     name = "node-iconv-lite-0.2.11";
@@ -8650,6 +9565,8 @@
     ];
     passthru.names = [ "iconv-lite" ];
   };
+  by-spec."iconv-lite"."~0.2.10" =
+    self.by-version."iconv-lite"."0.2.11";
   by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
   by-spec."ieee754"."~1.1.1" =
@@ -8690,6 +9607,26 @@
     ];
     passthru.names = [ "indexof" ];
   };
+  by-spec."inflight"."~1.0.1" =
+    self.by-version."inflight"."1.0.1";
+  by-version."inflight"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inflight-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inflight/-/inflight-1.0.1.tgz";
+        name = "inflight-1.0.1.tgz";
+        sha1 = "01f6911821535243c790ac0f998f54e9023ffb6f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inflight" or []);
+    deps = [
+      self.by-version."once"."1.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inflight" ];
+  };
   by-spec."inherits"."1" =
     self.by-version."inherits"."1.0.0";
   by-version."inherits"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -8739,6 +9676,29 @@
   by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-spec."ini"."1" =
+    self.by-version."ini"."1.2.1";
+  by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ini-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz";
+        name = "ini-1.2.1.tgz";
+        sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ini" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ini" ];
+  };
+  by-spec."ini"."1.x.x" =
+    self.by-version."ini"."1.2.1";
+  by-spec."ini"."^1.2.0" =
+    self.by-version."ini"."1.2.1";
+  by-spec."ini"."~1.1.0" =
     self.by-version."ini"."1.1.0";
   by-version."ini"."1.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-ini-1.1.0";
@@ -8757,29 +9717,27 @@
     ];
     passthru.names = [ "ini" ];
   };
-  by-spec."ini"."1.x.x" =
-    self.by-version."ini"."1.1.0";
-  by-spec."ini"."~1.1.0" =
-    self.by-version."ini"."1.1.0";
-  by-spec."init-package-json"."0.0.15" =
-    self.by-version."init-package-json"."0.0.15";
-  by-version."init-package-json"."0.0.15" = lib.makeOverridable self.buildNodePackage {
-    name = "node-init-package-json-0.0.15";
+  by-spec."ini"."~1.2.0" =
+    self.by-version."ini"."1.2.1";
+  by-spec."init-package-json"."0.0.17" =
+    self.by-version."init-package-json"."0.0.17";
+  by-version."init-package-json"."0.0.17" = lib.makeOverridable self.buildNodePackage {
+    name = "node-init-package-json-0.0.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.15.tgz";
-        name = "init-package-json-0.0.15.tgz";
-        sha1 = "d40f0201e4de6aa2b3fdc4208ae162766703ebed";
+        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.17.tgz";
+        name = "init-package-json-0.0.17.tgz";
+        sha1 = "395f2cb8d1c5af93ba6ec19dafa64717047f90c3";
       })
     ];
     buildInputs =
       (self.nativeDeps."init-package-json" or []);
     deps = [
-      self.by-version."promzard"."0.2.1"
+      self.by-version."promzard"."0.2.2"
       self.by-version."read"."1.0.5"
-      self.by-version."read-package-json"."1.1.8"
-      self.by-version."semver"."2.2.1"
-      self.by-version."glob"."3.2.9"
+      self.by-version."read-package-json"."1.2.2"
+      self.by-version."semver"."2.3.0"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
@@ -8805,6 +9763,32 @@
     ];
     passthru.names = [ "inline-source-map" ];
   };
+  by-spec."inquirer"."^0.5.0" =
+    self.by-version."inquirer"."0.5.1";
+  by-version."inquirer"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inquirer-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.5.1.tgz";
+        name = "inquirer-0.5.1.tgz";
+        sha1 = "e9f2cd1ee172c7a32e054b78a03d4ddb0d7707f1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."inquirer" or []);
+    deps = [
+      self.by-version."async"."0.8.0"
+      self.by-version."cli-color"."0.3.2"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."mute-stream"."0.0.4"
+      self.by-version."readline2"."0.1.0"
+      self.by-version."through"."2.3.4"
+      self.by-version."chalk"."0.4.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "inquirer" ];
+  };
   by-spec."inquirer"."~0.3.0" =
     self.by-version."inquirer"."0.3.5";
   by-version."inquirer"."0.3.5" = lib.makeOverridable self.buildNodePackage {
@@ -8871,8 +9855,8 @@
     buildInputs =
       (self.nativeDeps."insert-module-globals" or []);
     deps = [
-      self.by-version."JSONStream"."0.7.2"
-      self.by-version."concat-stream"."1.4.5"
+      self.by-version."JSONStream"."0.7.4"
+      self.by-version."concat-stream"."1.4.6"
       self.by-version."lexical-scope"."1.1.0"
       self.by-version."process"."0.6.0"
       self.by-version."through"."2.3.4"
@@ -8881,6 +9865,31 @@
     ];
     passthru.names = [ "insert-module-globals" ];
   };
+  by-spec."insert-module-globals"."~6.0.0" =
+    self.by-version."insert-module-globals"."6.0.0";
+  by-version."insert-module-globals"."6.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "insert-module-globals-6.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.0.0.tgz";
+        name = "insert-module-globals-6.0.0.tgz";
+        sha1 = "ee8aeb9dee16819e33aa14588a558824af0c15dc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."insert-module-globals" or []);
+    deps = [
+      self.by-version."JSONStream"."0.7.4"
+      self.by-version."concat-stream"."1.4.6"
+      self.by-version."lexical-scope"."1.1.0"
+      self.by-version."process"."0.6.0"
+      self.by-version."through"."2.3.4"
+      self.by-version."xtend"."3.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "insert-module-globals" ];
+  };
   by-spec."insight"."~0.3.0" =
     self.by-version."insight"."0.3.1";
   by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -8926,6 +9935,25 @@
     ];
     passthru.names = [ "intersect" ];
   };
+  by-spec."ipaddr.js"."0.1.2" =
+    self.by-version."ipaddr.js"."0.1.2";
+  by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ipaddr.js-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
+        name = "ipaddr.js-0.1.2.tgz";
+        sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ipaddr.js" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ipaddr.js" ];
+  };
   by-spec."ironhorse"."*" =
     self.by-version."ironhorse"."0.0.9";
   by-version."ironhorse"."0.0.9" = lib.makeOverridable self.buildNodePackage {
@@ -8944,18 +9972,18 @@
       self.by-version."winston"."0.7.3"
       self.by-version."nconf"."0.6.9"
       self.by-version."fs-walk"."0.0.1"
-      self.by-version."async"."0.7.0"
-      self.by-version."express"."4.0.0"
+      self.by-version."async"."0.9.0"
+      self.by-version."express"."4.4.1"
       self.by-version."jade"."1.3.1"
       self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
       self.by-version."js-yaml"."3.0.2"
-      self.by-version."mongoose"."3.8.8"
-      self.by-version."gridfs-stream"."0.4.1"
-      self.by-version."temp"."0.7.0"
-      self.by-version."kue"."0.7.5"
-      self.by-version."redis"."0.10.1"
-      self.by-version."hiredis"."0.1.16"
+      self.by-version."mongoose"."3.9.0"
+      self.by-version."gridfs-stream"."0.5.1"
+      self.by-version."temp"."0.8.0"
+      self.by-version."kue"."0.7.9"
+      self.by-version."redis"."0.10.3"
+      self.by-version."hiredis"."0.1.17"
     ];
     peerDependencies = [
     ];
@@ -8963,14 +9991,14 @@
   };
   "ironhorse" = self.by-version."ironhorse"."0.0.9";
   by-spec."is-promise"."~1" =
-    self.by-version."is-promise"."1.0.0";
-  by-version."is-promise"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-is-promise-1.0.0";
+    self.by-version."is-promise"."1.0.1";
+  by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-is-promise-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz";
-        name = "is-promise-1.0.0.tgz";
-        sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f";
+        url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
+        name = "is-promise-1.0.1.tgz";
+        sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
       })
     ];
     buildInputs =
@@ -9019,6 +10047,25 @@
     ];
     passthru.names = [ "isarray" ];
   };
+  by-spec."isbinaryfile"."^2.0.0" =
+    self.by-version."isbinaryfile"."2.0.1";
+  by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-isbinaryfile-2.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.1.tgz";
+        name = "isbinaryfile-2.0.1.tgz";
+        sha1 = "b92369bfdaf616027133e077c5ba145f36699d55";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."isbinaryfile" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "isbinaryfile" ];
+  };
   by-spec."isbinaryfile"."~0.1.8" =
     self.by-version."isbinaryfile"."0.1.9";
   by-version."isbinaryfile"."0.1.9" = lib.makeOverridable self.buildNodePackage {
@@ -9042,45 +10089,28 @@
     self.by-version."isbinaryfile"."0.1.9";
   by-spec."isbinaryfile"."~2.0.0" =
     self.by-version."isbinaryfile"."2.0.1";
-  by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-isbinaryfile-2.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/isbinaryfile/-/isbinaryfile-2.0.1.tgz";
-        name = "isbinaryfile-2.0.1.tgz";
-        sha1 = "b92369bfdaf616027133e077c5ba145f36699d55";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."isbinaryfile" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "isbinaryfile" ];
-  };
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.2.7";
-  by-version."istanbul"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "istanbul-0.2.7";
+    self.by-version."istanbul"."0.2.10";
+  by-version."istanbul"."0.2.10" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.2.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.7.tgz";
-        name = "istanbul-0.2.7.tgz";
-        sha1 = "bb482e1d06a0fea00993a10b2ee266fc740642bc";
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.10.tgz";
+        name = "istanbul-0.2.10.tgz";
+        sha1 = "40b922b7a0dd4917609b9c26bb9a0bef5f98013a";
       })
     ];
     buildInputs =
       (self.nativeDeps."istanbul" or []);
     deps = [
-      self.by-version."esprima"."1.1.1"
-      self.by-version."escodegen"."1.3.2"
+      self.by-version."esprima"."1.2.2"
+      self.by-version."escodegen"."1.3.3"
       self.by-version."handlebars"."1.3.0"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."nopt"."2.2.1"
       self.by-version."fileset"."0.1.5"
       self.by-version."which"."1.0.5"
-      self.by-version."async"."0.2.10"
+      self.by-version."async"."0.8.0"
       self.by-version."abbrev"."1.0.5"
       self.by-version."wordwrap"."0.0.2"
       self.by-version."resolve"."0.6.3"
@@ -9090,11 +10120,11 @@
     ];
     passthru.names = [ "istanbul" ];
   };
-  "istanbul" = self.by-version."istanbul"."0.2.7";
-  by-spec."istanbul"."~0.2.3" =
-    self.by-version."istanbul"."0.2.7";
+  "istanbul" = self.by-version."istanbul"."0.2.10";
+  by-spec."istanbul"."~0.2.10" =
+    self.by-version."istanbul"."0.2.10";
   by-spec."istanbul"."~0.2.4" =
-    self.by-version."istanbul"."0.2.7";
+    self.by-version."istanbul"."0.2.10";
   by-spec."jade"."*" =
     self.by-version."jade"."1.3.1";
   by-version."jade"."1.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -9369,35 +10399,35 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.5.0";
-  by-version."jshint"."2.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "jshint-2.5.0";
+    self.by-version."jshint"."2.5.1";
+  by-version."jshint"."2.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "jshint-2.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.0.tgz";
-        name = "jshint-2.5.0.tgz";
-        sha1 = "82fd1a235ffce75fad1b40b2a38bef47beac8c54";
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.1.tgz";
+        name = "jshint-2.5.1.tgz";
+        sha1 = "8e96d27377806767d40f16676fbec113d33520ec";
       })
     ];
     buildInputs =
       (self.nativeDeps."jshint" or []);
     deps = [
-      self.by-version."shelljs"."0.1.4"
-      self.by-version."underscore"."1.4.4"
-      self.by-version."cli"."0.4.5"
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."htmlparser2"."3.3.0"
-      self.by-version."console-browserify"."0.1.6"
+      self.by-version."shelljs"."0.3.0"
+      self.by-version."underscore"."1.6.0"
+      self.by-version."cli"."0.6.3"
+      self.by-version."minimatch"."0.3.0"
+      self.by-version."htmlparser2"."3.7.2"
+      self.by-version."console-browserify"."1.1.0"
       self.by-version."exit"."0.1.2"
-      self.by-version."strip-json-comments"."0.1.1"
+      self.by-version."strip-json-comments"."0.1.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "jshint" ];
   };
-  "jshint" = self.by-version."jshint"."2.5.0";
+  "jshint" = self.by-version."jshint"."2.5.1";
   by-spec."jshint"."~2.5.0" =
-    self.by-version."jshint"."2.5.0";
+    self.by-version."jshint"."2.5.1";
   by-spec."json-schema"."0.2.2" =
     self.by-version."json-schema"."0.2.2";
   by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -9595,28 +10625,47 @@
     ];
     passthru.names = [ "junk" ];
   };
-  by-spec."karma"."*" =
-    self.by-version."karma"."0.12.9";
-  by-version."karma"."0.12.9" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.12.9";
+  by-spec."junk"."~0.3.0" =
+    self.by-version."junk"."0.3.0";
+  by-version."junk"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-junk-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.12.9.tgz";
-        name = "karma-0.12.9.tgz";
-        sha1 = "9431735e50fcbd8ca04963a0e4da0b6550b41998";
+        url = "http://registry.npmjs.org/junk/-/junk-0.3.0.tgz";
+        name = "junk-0.3.0.tgz";
+        sha1 = "6c89c636f6e99898d8efbfc50430db40be71e10c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."junk" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "junk" ];
+  };
+  by-spec."karma"."*" =
+    self.by-version."karma"."0.12.16";
+  by-version."karma"."0.12.16" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.12.16";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/karma/-/karma-0.12.16.tgz";
+        name = "karma-0.12.16.tgz";
+        sha1 = "631bca7582b8b773162111708fcab69f8e2c5a37";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma" or []);
     deps = [
       self.by-version."di"."0.0.1"
-      self.by-version."socket.io"."0.9.16"
+      self.by-version."socket.io"."0.9.17"
       self.by-version."chokidar"."0.8.2"
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
       self.by-version."minimatch"."0.2.14"
       self.by-version."http-proxy"."0.10.4"
       self.by-version."optimist"."0.6.1"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."q"."0.9.7"
       self.by-version."colors"."0.6.2"
       self.by-version."lodash"."2.4.1"
@@ -9631,24 +10680,24 @@
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.12.9";
+  "karma" = self.by-version."karma"."0.12.16";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.12.9";
+    self.by-version."karma"."0.12.16";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.12.9";
+    self.by-version."karma"."0.12.16";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.12.9";
+    self.by-version."karma"."0.12.16";
   by-spec."karma"."~0.12.0" =
-    self.by-version."karma"."0.12.9";
+    self.by-version."karma"."0.12.16";
   by-spec."karma-chrome-launcher"."*" =
-    self.by-version."karma-chrome-launcher"."0.1.3";
-  by-version."karma-chrome-launcher"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-chrome-launcher-0.1.3";
+    self.by-version."karma-chrome-launcher"."0.1.4";
+  by-version."karma-chrome-launcher"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-chrome-launcher-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.3.tgz";
-        name = "karma-chrome-launcher-0.1.3.tgz";
-        sha1 = "b7f82dd9c83c84d26355bf31159739706973a3ec";
+        url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.4.tgz";
+        name = "karma-chrome-launcher-0.1.4.tgz";
+        sha1 = "492f6b8ceed3dacb829b147514c9106660f1b185";
       })
     ];
     buildInputs =
@@ -9656,35 +10705,36 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
+      self.by-version."karma"."0.12.16"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
-  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.3";
+  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.4";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.2.1";
-  by-version."karma-coverage"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-coverage-0.2.1";
+    self.by-version."karma-coverage"."0.2.4";
+  by-version."karma-coverage"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-coverage-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.1.tgz";
-        name = "karma-coverage-0.2.1.tgz";
-        sha1 = "3b1bce268711a631e008e108930906eceae0a623";
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.4.tgz";
+        name = "karma-coverage-0.2.4.tgz";
+        sha1 = "5d9c3da5ab1ad27f6aaaa11796e6235dd37a0757";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-coverage" or []);
     deps = [
-      self.by-version."istanbul"."0.2.7"
+      self.by-version."istanbul"."0.2.10"
       self.by-version."ibrik"."1.1.1"
-      self.by-version."dateformat"."1.0.7-1.2.3"
+      self.by-version."dateformat"."1.0.8-1.2.3"
+      self.by-version."minimatch"."0.3.0"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
+      self.by-version."karma"."0.12.16"
     ];
     passthru.names = [ "karma-coverage" ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.2.1";
+  "karma-coverage" = self.by-version."karma-coverage"."0.2.4";
   by-spec."karma-junit-reporter"."*" =
     self.by-version."karma-junit-reporter"."0.2.2";
   by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -9702,7 +10752,7 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
+      self.by-version."karma"."0.12.16"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
@@ -9723,21 +10773,21 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
-      self.by-version."mocha"."1.18.2"
+      self.by-version."karma"."0.12.16"
+      self.by-version."mocha"."1.20.1"
     ];
     passthru.names = [ "karma-mocha" ];
   };
   "karma-mocha" = self.by-version."karma-mocha"."0.1.3";
   by-spec."karma-requirejs"."*" =
-    self.by-version."karma-requirejs"."0.2.1";
-  by-version."karma-requirejs"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-requirejs-0.2.1";
+    self.by-version."karma-requirejs"."0.2.2";
+  by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-requirejs-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz";
-        name = "karma-requirejs-0.2.1.tgz";
-        sha1 = "7f3ac5df67bccd9d832a928ec658d733ec983c5d";
+        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz";
+        name = "karma-requirejs-0.2.2.tgz";
+        sha1 = "e497ca0868e2e09a9b8e3f646745c31a935fe8b6";
       })
     ];
     buildInputs =
@@ -9745,46 +10795,46 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
-      self.by-version."requirejs"."2.1.11"
+      self.by-version."karma"."0.12.16"
+      self.by-version."requirejs"."2.1.14"
     ];
     passthru.names = [ "karma-requirejs" ];
   };
-  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1";
+  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2";
   by-spec."karma-sauce-launcher"."*" =
-    self.by-version."karma-sauce-launcher"."0.2.7";
-  by-version."karma-sauce-launcher"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-sauce-launcher-0.2.7";
+    self.by-version."karma-sauce-launcher"."0.2.8";
+  by-version."karma-sauce-launcher"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-sauce-launcher-0.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.7.tgz";
-        name = "karma-sauce-launcher-0.2.7.tgz";
-        sha1 = "a87a0b2e3612b298f3f6c2a96839940af85ac849";
+        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.8.tgz";
+        name = "karma-sauce-launcher-0.2.8.tgz";
+        sha1 = "3d80015d93cae8a1d041ae2f5568ef646ea7125d";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.19"
+      self.by-version."wd"."0.2.27"
       self.by-version."sauce-connect-launcher"."0.4.2"
       self.by-version."q"."0.9.7"
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.9"
+      self.by-version."karma"."0.12.16"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.7";
-  by-spec."keen.io"."~0.0.4" =
-    self.by-version."keen.io"."0.0.4";
-  by-version."keen.io"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-keen.io-0.0.4";
+  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.8";
+  by-spec."keen.io"."~0.1.2" =
+    self.by-version."keen.io"."0.1.2";
+  by-version."keen.io"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-keen.io-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.4.tgz";
-        name = "keen.io-0.0.4.tgz";
-        sha1 = "041caa79371a6bec51288e222f3bb2e05c7e6b25";
+        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.2.tgz";
+        name = "keen.io-0.1.2.tgz";
+        sha1 = "a55b9d1d8b4354a8845f2a224eb3a6f7271378b2";
       })
     ];
     buildInputs =
@@ -9855,14 +10905,14 @@
     passthru.names = [ "kew" ];
   };
   by-spec."keygrip"."~1.0.0" =
-    self.by-version."keygrip"."1.0.0";
-  by-version."keygrip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-keygrip-1.0.0";
+    self.by-version."keygrip"."1.0.1";
+  by-version."keygrip"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-keygrip-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.0.tgz";
-        name = "keygrip-1.0.0.tgz";
-        sha1 = "b771120e8e697b8692b76866a84cdff3912fc379";
+        url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
+        name = "keygrip-1.0.1.tgz";
+        sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
       })
     ];
     buildInputs =
@@ -9914,14 +10964,14 @@
     passthru.names = [ "knockout" ];
   };
   by-spec."knox"."*" =
-    self.by-version."knox"."0.8.9";
-  by-version."knox"."0.8.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-knox-0.8.9";
+    self.by-version."knox"."0.8.10";
+  by-version."knox"."0.8.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-knox-0.8.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/knox/-/knox-0.8.9.tgz";
-        name = "knox-0.8.9.tgz";
-        sha1 = "b96ec0b4ec1be75d8006f80cb302bfa818d7001c";
+        url = "http://registry.npmjs.org/knox/-/knox-0.8.10.tgz";
+        name = "knox-0.8.10.tgz";
+        sha1 = "6a2edcdac1d2ae379d1e1994d559b95c283b2588";
       })
     ];
     buildInputs =
@@ -9936,22 +10986,22 @@
     ];
     passthru.names = [ "knox" ];
   };
-  "knox" = self.by-version."knox"."0.8.9";
+  "knox" = self.by-version."knox"."0.8.10";
   by-spec."kue"."*" =
-    self.by-version."kue"."0.7.5";
-  by-version."kue"."0.7.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-kue-0.7.5";
+    self.by-version."kue"."0.7.9";
+  by-version."kue"."0.7.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-kue-0.7.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/kue/-/kue-0.7.5.tgz";
-        name = "kue-0.7.5.tgz";
-        sha1 = "d815a8a35b22dd28df3f54f0b874403a257dc807";
+        url = "http://registry.npmjs.org/kue/-/kue-0.7.9.tgz";
+        name = "kue-0.7.9.tgz";
+        sha1 = "7c4478db567fb45dbfe893a59699f0ef2fa0c935";
       })
     ];
     buildInputs =
       (self.nativeDeps."kue" or []);
     deps = [
-      self.by-version."redis"."0.10.1"
+      self.by-version."redis"."0.10.3"
       self.by-version."express"."3.1.2"
       self.by-version."jade"."1.1.5"
       self.by-version."stylus"."0.42.2"
@@ -9962,7 +11012,7 @@
     ];
     passthru.names = [ "kue" ];
   };
-  "kue" = self.by-version."kue"."0.7.5";
+  "kue" = self.by-version."kue"."0.7.9";
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
@@ -10035,7 +11085,7 @@
     buildInputs =
       (self.nativeDeps."lcov-result-merger" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
@@ -10043,19 +11093,20 @@
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
   by-spec."less"."*" =
-    self.by-version."less"."1.7.0";
-  by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "less-1.7.0";
+    self.by-version."less"."1.7.1";
+  by-version."less"."1.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.7.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz";
-        name = "less-1.7.0.tgz";
-        sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84";
+        url = "http://registry.npmjs.org/less/-/less-1.7.1.tgz";
+        name = "less-1.7.1.tgz";
+        sha1 = "6f5580029b52c3ac590e85e2b079827a66f6cc74";
       })
     ];
     buildInputs =
       (self.nativeDeps."less" or []);
     deps = [
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."mime"."1.2.11"
       self.by-version."request"."2.34.0"
       self.by-version."mkdirp"."0.3.5"
@@ -10066,11 +11117,11 @@
     ];
     passthru.names = [ "less" ];
   };
-  "less" = self.by-version."less"."1.7.0";
+  "less" = self.by-version."less"."1.7.1";
   by-spec."less"."^1.7.0" =
-    self.by-version."less"."1.7.0";
+    self.by-version."less"."1.7.1";
   by-spec."less"."~1.7.0" =
-    self.by-version."less"."1.7.0";
+    self.by-version."less"."1.7.1";
   by-spec."lexical-scope"."~1.1.0" =
     self.by-version."lexical-scope"."1.1.0";
   by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -10645,6 +11696,8 @@
     ];
     passthru.names = [ "lru-cache" ];
   };
+  by-spec."lru-cache"."2.5.x" =
+    self.by-version."lru-cache"."2.5.0";
   by-spec."lru-cache"."~1.0.2" =
     self.by-version."lru-cache"."1.0.6";
   by-version."lru-cache"."1.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -10685,6 +11738,26 @@
   };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.0";
+  by-spec."lru-queue"."0.1.x" =
+    self.by-version."lru-queue"."0.1.0";
+  by-version."lru-queue"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lru-queue-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
+        name = "lru-queue-0.1.0.tgz";
+        sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lru-queue" or []);
+    deps = [
+      self.by-version."es5-ext"."0.10.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lru-queue" ];
+  };
   by-spec."lsmod"."~0.0.3" =
     self.by-version."lsmod"."0.0.3";
   by-version."lsmod"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -10705,45 +11778,46 @@
     passthru.names = [ "lsmod" ];
   };
   by-spec."mailcomposer".">= 0.1.27" =
-    self.by-version."mailcomposer"."0.2.9";
-  by-version."mailcomposer"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mailcomposer-0.2.9";
+    self.by-version."mailcomposer"."0.2.11";
+  by-version."mailcomposer"."0.2.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mailcomposer-0.2.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.9.tgz";
-        name = "mailcomposer-0.2.9.tgz";
-        sha1 = "2b6417a4fb5de8ffcaf1a27e1b024463903f908e";
+        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.11.tgz";
+        name = "mailcomposer-0.2.11.tgz";
+        sha1 = "37ddfdb63aa2e37481c001ab5bb17aaa5c234c89";
       })
     ];
     buildInputs =
       (self.nativeDeps."mailcomposer" or []);
     deps = [
-      self.by-version."mimelib"."0.2.14"
+      self.by-version."mimelib"."0.2.16"
       self.by-version."mime"."1.2.11"
       self.by-version."he"."0.3.6"
       self.by-version."punycode"."1.2.4"
       self.by-version."follow-redirects"."0.0.3"
-      self.by-version."dkim-signer"."0.1.0"
+      self.by-version."dkim-signer"."0.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mailcomposer" ];
   };
   by-spec."map-key"."^0.1.1" =
-    self.by-version."map-key"."0.1.1";
-  by-version."map-key"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-map-key-0.1.1";
+    self.by-version."map-key"."0.1.4";
+  by-version."map-key"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-map-key-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/map-key/-/map-key-0.1.1.tgz";
-        name = "map-key-0.1.1.tgz";
-        sha1 = "cf0d6ad80ae145477d25904c9eb44b23ac471c8b";
+        url = "http://registry.npmjs.org/map-key/-/map-key-0.1.4.tgz";
+        name = "map-key-0.1.4.tgz";
+        sha1 = "4cfae88e90b663d2c588ca5a6852f89ae049ad6b";
       })
     ];
     buildInputs =
       (self.nativeDeps."map-key" or []);
     deps = [
-      self.by-version."mout"."0.9.1"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."underscore.string"."2.3.3"
     ];
     peerDependencies = [
     ];
@@ -10784,7 +11858,7 @@
       (self.nativeDeps."maxmin" or []);
     deps = [
       self.by-version."gzip-size"."0.1.1"
-      self.by-version."pretty-bytes"."0.1.0"
+      self.by-version."pretty-bytes"."0.1.1"
       self.by-version."chalk"."0.4.0"
     ];
     peerDependencies = [
@@ -10819,6 +11893,31 @@
     passthru.names = [ "meat" ];
   };
   "meat" = self.by-version."meat"."0.2.5";
+  by-spec."memoizee"."0.3.x" =
+    self.by-version."memoizee"."0.3.3";
+  by-version."memoizee"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-memoizee-0.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.3.tgz";
+        name = "memoizee-0.3.3.tgz";
+        sha1 = "1e1abceea17b733b495212449ef9a26fe022d2b6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."memoizee" or []);
+    deps = [
+      self.by-version."d"."0.1.1"
+      self.by-version."es5-ext"."0.10.4"
+      self.by-version."event-emitter"."0.3.1"
+      self.by-version."lru-queue"."0.1.0"
+      self.by-version."next-tick"."0.2.2"
+      self.by-version."timers-ext"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "memoizee" ];
+  };
   by-spec."memoizee"."~0.2.5" =
     self.by-version."memoizee"."0.2.6";
   by-version."memoizee"."0.2.6" = lib.makeOverridable self.buildNodePackage {
@@ -10860,45 +11959,28 @@
     ];
     passthru.names = [ "merge-descriptors" ];
   };
-  by-spec."method-override"."1.0.0" =
-    self.by-version."method-override"."1.0.0";
-  by-version."method-override"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-method-override-1.0.0";
+  by-spec."method-override"."2.0.2" =
+    self.by-version."method-override"."2.0.2";
+  by-version."method-override"."2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-method-override-2.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
-        name = "method-override-1.0.0.tgz";
-        sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61";
+        url = "http://registry.npmjs.org/method-override/-/method-override-2.0.2.tgz";
+        name = "method-override-2.0.2.tgz";
+        sha1 = "00531278c79789640bf27e97e26a3a5a1f7cca73";
       })
     ];
     buildInputs =
       (self.nativeDeps."method-override" or []);
     deps = [
-      self.by-version."methods"."0.1.0"
+      self.by-version."methods"."1.0.1"
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."vary"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "method-override" ];
   };
-  by-spec."methods"."*" =
-    self.by-version."methods"."0.1.0";
-  by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-methods-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
-        name = "methods-0.1.0.tgz";
-        sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."methods" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "methods" ];
-  };
   by-spec."methods"."0.0.1" =
     self.by-version."methods"."0.0.1";
   by-version."methods"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -10920,6 +12002,61 @@
   };
   by-spec."methods"."0.1.0" =
     self.by-version."methods"."0.1.0";
+  by-version."methods"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-methods-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
+        name = "methods-0.1.0.tgz";
+        sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
+  by-spec."methods"."1.0.0" =
+    self.by-version."methods"."1.0.0";
+  by-version."methods"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-methods-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz";
+        name = "methods-1.0.0.tgz";
+        sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
+  by-spec."methods"."1.0.1" =
+    self.by-version."methods"."1.0.1";
+  by-version."methods"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-methods-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
+        name = "methods-1.0.1.tgz";
+        sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."methods" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "methods" ];
+  };
   by-spec."mime"."*" =
     self.by-version."mime"."1.2.11";
   by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
@@ -11017,10 +12154,10 @@
     ];
     passthru.names = [ "mime" ];
   };
-  by-spec."mime"."1.2.x" =
-    self.by-version."mime"."1.2.11";
   by-spec."mime".">= 0.0.1" =
     self.by-version."mime"."1.2.11";
+  by-spec."mime"."^1.2.9" =
+    self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.11" =
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.2" =
@@ -11029,15 +12166,15 @@
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.9" =
     self.by-version."mime"."1.2.11";
-  by-spec."mimelib"."~0.2.14" =
-    self.by-version."mimelib"."0.2.14";
-  by-version."mimelib"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mimelib-0.2.14";
+  by-spec."mimelib"."~0.2.15" =
+    self.by-version."mimelib"."0.2.16";
+  by-version."mimelib"."0.2.16" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mimelib-0.2.16";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz";
-        name = "mimelib-0.2.14.tgz";
-        sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831";
+        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.16.tgz";
+        name = "mimelib-0.2.16.tgz";
+        sha1 = "2df4fc292c381b662d81d0b926f6795e6aa1c4f4";
       })
     ];
     buildInputs =
@@ -11051,14 +12188,14 @@
     passthru.names = [ "mimelib" ];
   };
   by-spec."minimatch"."0" =
-    self.by-version."minimatch"."0.2.14";
-  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-minimatch-0.2.14";
+    self.by-version."minimatch"."0.3.0";
+  by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimatch-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
-        name = "minimatch-0.2.14.tgz";
-        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+        name = "minimatch-0.3.0.tgz";
+        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
       })
     ];
     buildInputs =
@@ -11093,25 +12230,46 @@
   };
   by-spec."minimatch"."0.2.x" =
     self.by-version."minimatch"."0.2.14";
+  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimatch-0.2.14";
+    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 []);
+    deps = [
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."sigmund"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimatch" ];
+  };
+  by-spec."minimatch"."0.3" =
+    self.by-version."minimatch"."0.3.0";
   by-spec."minimatch"."0.x" =
-    self.by-version."minimatch"."0.2.14";
+    self.by-version."minimatch"."0.3.0";
   by-spec."minimatch"."0.x.x" =
-    self.by-version."minimatch"."0.2.14";
+    self.by-version."minimatch"."0.3.0";
   by-spec."minimatch".">=0.2.4" =
-    self.by-version."minimatch"."0.2.14";
+    self.by-version."minimatch"."0.3.0";
+  by-spec."minimatch"."^0.3.0" =
+    self.by-version."minimatch"."0.3.0";
   by-spec."minimatch"."~0.2" =
     self.by-version."minimatch"."0.2.14";
-  by-spec."minimatch"."~0.2.0" =
-    self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.11" =
     self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.12" =
     self.by-version."minimatch"."0.2.14";
-  by-spec."minimatch"."~0.2.14" =
-    self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.9" =
     self.by-version."minimatch"."0.2.14";
-  by-spec."minimist"."~0.0.1" =
+  by-spec."minimatch"."~0.3.0" =
+    self.by-version."minimatch"."0.3.0";
+  by-spec."minimist"."0.0.8" =
     self.by-version."minimist"."0.0.8";
   by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
     name = "node-minimist-0.0.8";
@@ -11130,19 +12288,78 @@
     ];
     passthru.names = [ "minimist" ];
   };
-  by-spec."minimist"."~0.0.5" =
-    self.by-version."minimist"."0.0.8";
-  by-spec."minimist"."~0.0.7" =
-    self.by-version."minimist"."0.0.8";
-  by-spec."ministyle"."~0.1.3" =
-    self.by-version."ministyle"."0.1.3";
-  by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ministyle-0.1.3";
+  by-spec."minimist"."0.0.9" =
+    self.by-version."minimist"."0.0.9";
+  by-version."minimist"."0.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.0.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz";
-        name = "ministyle-0.1.3.tgz";
-        sha1 = "d7a639f29e9450b9d5ebf2255d1fa8d1d9d89900";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.9.tgz";
+        name = "minimist-0.0.9.tgz";
+        sha1 = "04e6034ffbf572be2fe42cf1da2c696be0901917";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  by-spec."minimist"."^0.1.0" =
+    self.by-version."minimist"."0.1.0";
+  by-version."minimist"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
+        name = "minimist-0.1.0.tgz";
+        sha1 = "99df657a52574c21c9057497df742790b2b4c0de";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  by-spec."minimist"."~0.0.1" =
+    self.by-version."minimist"."0.0.10";
+  by-version."minimist"."0.0.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-minimist-0.0.10";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+        name = "minimist-0.0.10.tgz";
+        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."minimist" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "minimist" ];
+  };
+  by-spec."minimist"."~0.0.5" =
+    self.by-version."minimist"."0.0.10";
+  by-spec."minimist"."~0.0.7" =
+    self.by-version."minimist"."0.0.10";
+  by-spec."minimist"."~0.0.9" =
+    self.by-version."minimist"."0.0.10";
+  by-spec."ministyle"."~0.1.3" =
+    self.by-version."ministyle"."0.1.4";
+  by-version."ministyle"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ministyle-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
+        name = "ministyle-0.1.4.tgz";
+        sha1 = "b10481eb16aa8f7b6cd983817393a44da0e5a0cd";
       })
     ];
     buildInputs =
@@ -11174,6 +12391,29 @@
     passthru.names = [ "miniwrite" ];
   };
   by-spec."mkdirp"."*" =
+    self.by-version."mkdirp"."0.5.0";
+  by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mkdirp-0.5.0";
+    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 []);
+    deps = [
+      self.by-version."minimist"."0.0.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mkdirp" ];
+  };
+  "mkdirp" = self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."0" =
+    self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."0.3" =
     self.by-version."mkdirp"."0.3.5";
   by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
     name = "node-mkdirp-0.3.5";
@@ -11192,11 +12432,6 @@
     ];
     passthru.names = [ "mkdirp" ];
   };
-  "mkdirp" = self.by-version."mkdirp"."0.3.5";
-  by-spec."mkdirp"."0" =
-    self.by-version."mkdirp"."0.3.5";
-  by-spec."mkdirp"."0.3" =
-    self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."0.3.0" =
     self.by-version."mkdirp"."0.3.0";
   by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -11220,16 +12455,24 @@
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."0.3.x" =
     self.by-version."mkdirp"."0.3.5";
+  by-spec."mkdirp"."0.5.0" =
+    self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."0.5.x" =
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."0.x.x" =
-    self.by-version."mkdirp"."0.3.5";
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."^0.3.5" =
     self.by-version."mkdirp"."0.3.5";
+  by-spec."mkdirp"."^0.5.0" =
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."~0.3.3" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.4" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.5" =
     self.by-version."mkdirp"."0.3.5";
+  by-spec."mkdirp"."~0.5.0" =
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkpath"."~0.1.0" =
     self.by-version."mkpath"."0.1.0";
   by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -11250,14 +12493,14 @@
     passthru.names = [ "mkpath" ];
   };
   by-spec."mocha"."*" =
-    self.by-version."mocha"."1.18.2";
-  by-version."mocha"."1.18.2" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.18.2";
+    self.by-version."mocha"."1.20.1";
+  by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.20.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.18.2.tgz";
-        name = "mocha-1.18.2.tgz";
-        sha1 = "800848f8f7884c61eefcfa2a27304ba9e5446d0b";
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz";
+        name = "mocha-1.20.1.tgz";
+        sha1 = "f343832d9fe0c7d97c64fc70448f5136df9fed5b";
       })
     ];
     buildInputs =
@@ -11267,7 +12510,7 @@
       self.by-version."growl"."1.7.0"
       self.by-version."jade"."0.26.3"
       self.by-version."diff"."1.0.7"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -11275,7 +12518,7 @@
     ];
     passthru.names = [ "mocha" ];
   };
-  "mocha" = self.by-version."mocha"."1.18.2";
+  "mocha" = self.by-version."mocha"."1.20.1";
   by-spec."mocha"."1.13.x" =
     self.by-version."mocha"."1.13.0";
   by-version."mocha"."1.13.0" = lib.makeOverridable self.buildNodePackage {
@@ -11294,7 +12537,7 @@
       self.by-version."growl"."1.7.0"
       self.by-version."jade"."0.26.3"
       self.by-version."diff"."1.0.7"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -11303,14 +12546,14 @@
     passthru.names = [ "mocha" ];
   };
   by-spec."mocha-phantomjs"."*" =
-    self.by-version."mocha-phantomjs"."3.3.2";
-  by-version."mocha-phantomjs"."3.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-phantomjs-3.3.2";
+    self.by-version."mocha-phantomjs"."3.4.1";
+  by-version."mocha-phantomjs"."3.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-phantomjs-3.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.3.2.tgz";
-        name = "mocha-phantomjs-3.3.2.tgz";
-        sha1 = "2d7cc9926f0fbbeb341697d7f2a031151c601722";
+        url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.4.1.tgz";
+        name = "mocha-phantomjs-3.4.1.tgz";
+        sha1 = "c48fc97b993a0f89be30baa3732050f14cdf1036";
       })
     ];
     buildInputs =
@@ -11318,13 +12561,13 @@
     deps = [
       self.by-version."mocha"."1.13.0"
       self.by-version."commander"."1.2.0"
-      self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
+      self.by-version."phantomjs"."1.9.7-8"
     ];
     passthru.names = [ "mocha-phantomjs" ];
   };
-  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.3.2";
+  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.4.1";
   by-spec."mocha-unfunk-reporter"."*" =
     self.by-version."mocha-unfunk-reporter"."0.4.0";
   by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -11342,40 +12585,13 @@
       self.by-version."jsesc"."0.4.3"
       self.by-version."unfunk-diff"."0.0.2"
       self.by-version."miniwrite"."0.1.3"
-      self.by-version."ministyle"."0.1.3"
+      self.by-version."ministyle"."0.1.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mocha-unfunk-reporter" ];
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
-  by-spec."module-deps"."~1.10.0" =
-    self.by-version."module-deps"."1.10.0";
-  by-version."module-deps"."1.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "module-deps-1.10.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.10.0.tgz";
-        name = "module-deps-1.10.0.tgz";
-        sha1 = "57a9cac9dbd092428ec5249f6cf37fb249d77db6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."module-deps" or []);
-    deps = [
-      self.by-version."JSONStream"."0.7.2"
-      self.by-version."browser-resolve"."1.2.4"
-      self.by-version."concat-stream"."1.4.5"
-      self.by-version."detective"."3.1.0"
-      self.by-version."minimist"."0.0.8"
-      self.by-version."parents"."0.0.2"
-      self.by-version."resolve"."0.6.3"
-      self.by-version."through"."2.3.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "module-deps" ];
-  };
   by-spec."module-deps"."~1.8.0" =
     self.by-version."module-deps"."1.8.1";
   by-version."module-deps"."1.8.1" = lib.makeOverridable self.buildNodePackage {
@@ -11390,11 +12606,11 @@
     buildInputs =
       (self.nativeDeps."module-deps" or []);
     deps = [
-      self.by-version."JSONStream"."0.7.2"
+      self.by-version."JSONStream"."0.7.4"
       self.by-version."browser-resolve"."1.2.4"
-      self.by-version."concat-stream"."1.4.5"
+      self.by-version."concat-stream"."1.4.6"
       self.by-version."detective"."3.1.0"
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.0.10"
       self.by-version."parents"."0.0.2"
       self.by-version."resolve"."0.6.3"
       self.by-version."through"."2.3.4"
@@ -11403,6 +12619,38 @@
     ];
     passthru.names = [ "module-deps" ];
   };
+  by-spec."module-deps"."~2.1.1" =
+    self.by-version."module-deps"."2.1.2";
+  by-version."module-deps"."2.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "module-deps-2.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/module-deps/-/module-deps-2.1.2.tgz";
+        name = "module-deps-2.1.2.tgz";
+        sha1 = "9cfb8cc4f2b13d648c5baa553d0cbc79692967c5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."module-deps" or []);
+    deps = [
+      self.by-version."JSONStream"."0.7.4"
+      self.by-version."browser-resolve"."1.2.4"
+      self.by-version."concat-stream"."1.4.6"
+      self.by-version."detective"."3.1.0"
+      self.by-version."duplexer2"."0.0.2"
+      self.by-version."inherits"."2.0.1"
+      self.by-version."minimist"."0.0.10"
+      self.by-version."parents"."0.0.2"
+      self.by-version."resolve"."0.6.3"
+      self.by-version."stream-combiner"."0.1.0"
+      self.by-version."through2"."0.4.2"
+      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."subarg"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "module-deps" ];
+  };
   by-spec."moment"."2.1.0" =
     self.by-version."moment"."2.1.0";
   by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -11460,28 +12708,48 @@
     ];
     passthru.names = [ "moment" ];
   };
-  by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.2";
-  by-version."mongodb"."1.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.2";
+  by-spec."moment"."~2.6.0" =
+    self.by-version."moment"."2.6.0";
+  by-version."moment"."2.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-moment-2.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.2.tgz";
-        name = "mongodb-1.4.2.tgz";
-        sha1 = "68b5a5ac7ee146dcbdf17d01f60ffe88e61e76aa";
+        url = "http://registry.npmjs.org/moment/-/moment-2.6.0.tgz";
+        name = "moment-2.6.0.tgz";
+        sha1 = "0765b72b841dd213fa91914c0f6765122719f061";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."moment" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "moment" ];
+  };
+  by-spec."mongodb"."*" =
+    self.by-version."mongodb"."1.4.5";
+  by-version."mongodb"."1.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.5";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.5.tgz";
+        name = "mongodb-1.4.5.tgz";
+        sha1 = "efde318ef9739cf92466c38e35e3104f4a051e57";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongodb" or []);
     deps = [
-      self.by-version."bson"."0.2.7"
+      self.by-version."bson"."0.2.8"
       self.by-version."kerberos"."0.0.3"
+      self.by-version."readable-stream"."1.1.13-1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.2";
+  "mongodb" = self.by-version."mongodb"."1.4.5";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -11523,7 +12791,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  by-spec."mongodb"."1.3.23" =
+  by-spec."mongodb"."1.3.x" =
     self.by-version."mongodb"."1.3.23";
   by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage {
     name = "node-mongodb-1.3.23";
@@ -11544,31 +12812,31 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  by-spec."mongodb"."1.3.x" =
-    self.by-version."mongodb"."1.3.23";
+  by-spec."mongodb"."1.4.5" =
+    self.by-version."mongodb"."1.4.5";
   by-spec."mongoose"."*" =
-    self.by-version."mongoose"."3.8.8";
-  by-version."mongoose"."3.8.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongoose-3.8.8";
+    self.by-version."mongoose"."3.9.0";
+  by-version."mongoose"."3.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongoose-3.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.8.tgz";
-        name = "mongoose-3.8.8.tgz";
-        sha1 = "ab046f1fa17b0bdf090a04b6d034d87d240a47c2";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.9.0.tgz";
+        name = "mongoose-3.9.0.tgz";
+        sha1 = "e888b414025ee1fd4ce1eeef48031ceed896fc30";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongoose" or []);
     deps = [
-      self.by-version."hooks"."0.2.1"
-      self.by-version."mongodb"."1.3.23"
+      self.by-version."hooks"."0.3.2"
+      self.by-version."mongodb"."1.4.5"
       self.by-version."ms"."0.1.0"
       self.by-version."sliced"."0.0.5"
       self.by-version."muri"."0.3.1"
-      self.by-version."mpromise"."0.4.3"
+      self.by-version."mpromise"."0.5.0"
       self.by-version."mpath"."0.1.1"
       self.by-version."regexp-clone"."0.0.1"
-      self.by-version."mquery"."0.5.3"
+      self.by-version."mquery"."0.7.0"
     ];
     peerDependencies = [
     ];
@@ -11708,45 +12976,26 @@
     ];
     passthru.names = [ "monocle" ];
   };
-  by-spec."morgan"."1.0.0" =
-    self.by-version."morgan"."1.0.0";
-  by-version."morgan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-morgan-1.0.0";
+  by-spec."morgan"."1.1.1" =
+    self.by-version."morgan"."1.1.1";
+  by-version."morgan"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-morgan-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
-        name = "morgan-1.0.0.tgz";
-        sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d";
+        url = "http://registry.npmjs.org/morgan/-/morgan-1.1.1.tgz";
+        name = "morgan-1.1.1.tgz";
+        sha1 = "cde45d2e807ebcc439745846ea80392e69098146";
       })
     ];
     buildInputs =
       (self.nativeDeps."morgan" or []);
     deps = [
-      self.by-version."bytes"."0.2.1"
+      self.by-version."bytes"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "morgan" ];
   };
-  by-spec."mout"."^0.9.0" =
-    self.by-version."mout"."0.9.1";
-  by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mout-0.9.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz";
-        name = "mout-0.9.1.tgz";
-        sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mout" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mout" ];
-  };
   by-spec."mout"."~0.6.0" =
     self.by-version."mout"."0.6.0";
   by-version."mout"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -11787,6 +13036,25 @@
   };
   by-spec."mout"."~0.9.0" =
     self.by-version."mout"."0.9.1";
+  by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mout-0.9.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz";
+        name = "mout-0.9.1.tgz";
+        sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mout" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mout" ];
+  };
+  by-spec."mout"."~0.9.1" =
+    self.by-version."mout"."0.9.1";
   by-spec."mpath"."0.1.1" =
     self.by-version."mpath"."0.1.1";
   by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -11826,15 +13094,15 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  by-spec."mpromise"."0.4.3" =
-    self.by-version."mpromise"."0.4.3";
-  by-version."mpromise"."0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mpromise-0.4.3";
+  by-spec."mpromise"."0.5.0" =
+    self.by-version."mpromise"."0.5.0";
+  by-version."mpromise"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mpromise-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz";
-        name = "mpromise-0.4.3.tgz";
-        sha1 = "edc47a75a2a177b0e9382735db52dbec3808cc33";
+        url = "http://registry.npmjs.org/mpromise/-/mpromise-0.5.0.tgz";
+        name = "mpromise-0.5.0.tgz";
+        sha1 = "8ff8f6aba6534bffa6fff296e13348cd065091b5";
       })
     ];
     buildInputs =
@@ -11845,15 +13113,15 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  by-spec."mquery"."0.5.3" =
-    self.by-version."mquery"."0.5.3";
-  by-version."mquery"."0.5.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mquery-0.5.3";
+  by-spec."mquery"."0.7.0" =
+    self.by-version."mquery"."0.7.0";
+  by-version."mquery"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mquery-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mquery/-/mquery-0.5.3.tgz";
-        name = "mquery-0.5.3.tgz";
-        sha1 = "b8a04d096ecf90bf17a81cc39b80dd4e5abcecec";
+        url = "http://registry.npmjs.org/mquery/-/mquery-0.7.0.tgz";
+        name = "mquery-0.7.0.tgz";
+        sha1 = "2d205abe097aff0f898d3ad9e43bd031031cdb1e";
       })
     ];
     buildInputs =
@@ -11886,6 +13154,25 @@
     ];
     passthru.names = [ "ms" ];
   };
+  by-spec."ms"."0.6.2" =
+    self.by-version."ms"."0.6.2";
+  by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ms-0.6.2";
+    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 []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ms" ];
+  };
   by-spec."msgpack".">= 0.0.1" =
     self.by-version."msgpack"."0.2.3";
   by-version."msgpack"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -11926,6 +13213,27 @@
     ];
     passthru.names = [ "multiparty" ];
   };
+  by-spec."multiparty"."3.2.8" =
+    self.by-version."multiparty"."3.2.8";
+  by-version."multiparty"."3.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-multiparty-3.2.8";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/multiparty/-/multiparty-3.2.8.tgz";
+        name = "multiparty-3.2.8.tgz";
+        sha1 = "bde21301dad294286e155b2b60710c6ae04ae64f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."multiparty" or []);
+    deps = [
+      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."stream-counter"."0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "multiparty" ];
+  };
   by-spec."muri"."0.3.1" =
     self.by-version."muri"."0.3.1";
   by-version."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -12004,6 +13312,25 @@
     ];
     passthru.names = [ "mv" ];
   };
+  by-spec."nan".">=1.0.0" =
+    self.by-version."nan"."1.2.0";
+  by-version."nan"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz";
+        name = "nan-1.2.0.tgz";
+        sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
   by-spec."nan"."~0.3.0" =
     self.by-version."nan"."0.3.2";
   by-version."nan"."0.3.2" = lib.makeOverridable self.buildNodePackage {
@@ -12061,6 +13388,44 @@
     ];
     passthru.names = [ "nan" ];
   };
+  by-spec."nan"."~1.0.0" =
+    self.by-version."nan"."1.0.0";
+  by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+        name = "nan-1.0.0.tgz";
+        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
+  by-spec."nan"."~1.1.0" =
+    self.by-version."nan"."1.1.2";
+  by-version."nan"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-1.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz";
+        name = "nan-1.1.2.tgz";
+        sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nan" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nan" ];
+  };
   by-spec."natural"."0.1.17" =
     self.by-version."natural"."0.1.17";
   by-version."natural"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -12098,7 +13463,7 @@
       (self.nativeDeps."nconf" or []);
     deps = [
       self.by-version."async"."0.2.9"
-      self.by-version."ini"."1.1.0"
+      self.by-version."ini"."1.2.1"
       self.by-version."optimist"."0.6.0"
     ];
     peerDependencies = [
@@ -12190,15 +13555,15 @@
     ];
     passthru.names = [ "negotiator" ];
   };
-  by-spec."negotiator"."0.4.2" =
-    self.by-version."negotiator"."0.4.2";
-  by-version."negotiator"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-negotiator-0.4.2";
+  by-spec."negotiator"."0.4.5" =
+    self.by-version."negotiator"."0.4.5";
+  by-version."negotiator"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-negotiator-0.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
-        name = "negotiator-0.4.2.tgz";
-        sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37";
+        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.5.tgz";
+        name = "negotiator-0.4.5.tgz";
+        sha1 = "0e738eb225e3a166ee7d69ebcfdc702ba236a77b";
       })
     ];
     buildInputs =
@@ -12211,6 +13576,8 @@
   };
   by-spec."negotiator"."~0.3.0" =
     self.by-version."negotiator"."0.3.0";
+  by-spec."negotiator"."~0.4.0" =
+    self.by-version."negotiator"."0.4.5";
   by-spec."net-ping"."1.1.7" =
     self.by-version."net-ping"."1.1.7";
   by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage {
@@ -12250,6 +13617,25 @@
     ];
     passthru.names = [ "next-tick" ];
   };
+  by-spec."next-tick"."~0.2.2" =
+    self.by-version."next-tick"."0.2.2";
+  by-version."next-tick"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-next-tick-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz";
+        name = "next-tick-0.2.2.tgz";
+        sha1 = "75da4a927ee5887e39065880065b7336413b310d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."next-tick" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "next-tick" ];
+  };
   by-spec."nib"."0.5.0" =
     self.by-version."nib"."0.5.0";
   by-version."nib"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -12326,14 +13712,14 @@
     passthru.names = [ "node-appc" ];
   };
   by-spec."node-expat"."*" =
-    self.by-version."node-expat"."2.1.4";
-  by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-node-expat-2.1.4";
+    self.by-version."node-expat"."2.2.0";
+  by-version."node-expat"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-node-expat-2.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz";
-        name = "node-expat-2.1.4.tgz";
-        sha1 = "e55a82249b71afbce09ffa880705ec37553c5121";
+        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.2.0.tgz";
+        name = "node-expat-2.2.0.tgz";
+        sha1 = "8e946c2707c11fbd52516bbe7e14190665adfef9";
       })
     ];
     buildInputs =
@@ -12345,31 +13731,31 @@
     ];
     passthru.names = [ "node-expat" ];
   };
-  "node-expat" = self.by-version."node-expat"."2.1.4";
+  "node-expat" = self.by-version."node-expat"."2.2.0";
   by-spec."node-gyp"."*" =
-    self.by-version."node-gyp"."0.13.0";
-  by-version."node-gyp"."0.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-gyp-0.13.0";
+    self.by-version."node-gyp"."0.13.1";
+  by-version."node-gyp"."0.13.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gyp-0.13.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz";
-        name = "node-gyp-0.13.0.tgz";
-        sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e";
+        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz";
+        name = "node-gyp-0.13.1.tgz";
+        sha1 = "5a484dd2dc13d5b894a8fe781a250c07eae7bffa";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-gyp" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."fstream"."0.1.25"
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."npmlog"."0.0.6"
-      self.by-version."osenv"."0.0.3"
-      self.by-version."request"."2.34.0"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."minimatch"."0.3.0"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."npmlog"."0.1.0"
+      self.by-version."osenv"."0.1.0"
+      self.by-version."request"."2.36.0"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."semver"."2.2.1"
       self.by-version."tar"."0.1.19"
       self.by-version."which"."1.0.5"
@@ -12378,59 +13764,61 @@
     ];
     passthru.names = [ "node-gyp" ];
   };
-  "node-gyp" = self.by-version."node-gyp"."0.13.0";
+  "node-gyp" = self.by-version."node-gyp"."0.13.1";
   by-spec."node-gyp"."~0.13.0" =
-    self.by-version."node-gyp"."0.13.0";
+    self.by-version."node-gyp"."0.13.1";
   by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.7.3";
-  by-version."node-inspector"."0.7.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inspector-0.7.3";
+    self.by-version."node-inspector"."0.7.4";
+  by-version."node-inspector"."0.7.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inspector-0.7.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.3.tgz";
-        name = "node-inspector-0.7.3.tgz";
-        sha1 = "988317f9a7e645d1bb78e40bb2289db82a077e73";
+        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz";
+        name = "node-inspector-0.7.4.tgz";
+        sha1 = "3d07234f0834e7f1e21a1669eceaa224a7be43f2";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-inspector" or []);
     deps = [
-      self.by-version."express"."3.5.1"
-      self.by-version."async"."0.4.1"
-      self.by-version."glob"."3.2.9"
+      self.by-version."express"."4.0.0"
+      self.by-version."async"."0.8.0"
+      self.by-version."glob"."3.2.11"
       self.by-version."rc"."0.3.5"
       self.by-version."strong-data-uri"."0.1.1"
       self.by-version."debug"."0.8.1"
       self.by-version."ws"."0.4.31"
       self.by-version."opener"."1.3.0"
-      self.by-version."yargs"."1.1.3"
+      self.by-version."yargs"."1.2.2"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-inspector" ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.7.3";
+  "node-inspector" = self.by-version."node-inspector"."0.7.4";
   by-spec."node-protobuf"."*" =
-    self.by-version."node-protobuf"."1.0.10";
-  by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage {
-    name = "node-node-protobuf-1.0.10";
+    self.by-version."node-protobuf"."1.1.0";
+  by-version."node-protobuf"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-node-protobuf-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.10.tgz";
-        name = "node-protobuf-1.0.10.tgz";
-        sha1 = "a8a02d55129efe1776bc3e038d7e6c676c001fcd";
+        url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.1.0.tgz";
+        name = "node-protobuf-1.1.0.tgz";
+        sha1 = "9d30eabb363efb1855c2dfeb2d2e5246c115589d";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-protobuf" or []);
     deps = [
+      self.by-version."bindings"."1.2.0"
+      self.by-version."nan"."1.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-protobuf" ];
   };
-  "node-protobuf" = self.by-version."node-protobuf"."1.0.10";
+  "node-protobuf" = self.by-version."node-protobuf"."1.1.0";
   by-spec."node-swt".">=0.1.1" =
     self.by-version."node-swt"."0.1.1";
   by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -12581,7 +13969,7 @@
     buildInputs =
       (self.nativeDeps."node-wsfederation" or []);
     deps = [
-      self.by-version."xml2js"."0.4.2"
+      self.by-version."xml2js"."0.4.4"
     ];
     peerDependencies = [
     ];
@@ -12620,8 +14008,8 @@
     buildInputs =
       (self.nativeDeps."nodemailer" or []);
     deps = [
-      self.by-version."mailcomposer"."0.2.9"
-      self.by-version."simplesmtp"."0.3.25"
+      self.by-version."mailcomposer"."0.2.11"
+      self.by-version."simplesmtp"."0.3.32"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -12629,27 +14017,28 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.0.17";
-  by-version."nodemon"."1.0.17" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-1.0.17";
+    self.by-version."nodemon"."1.2.0";
+  by-version."nodemon"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.17.tgz";
-        name = "nodemon-1.0.17.tgz";
-        sha1 = "910a3f3cb66c06a3499498455cf4e0119f75799c";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.0.tgz";
+        name = "nodemon-1.2.0.tgz";
+        sha1 = "fd64fbbd2730c828fe897026ada53ab5ae42727c";
       })
     ];
     buildInputs =
       (self.nativeDeps."nodemon" or []);
     deps = [
-      self.by-version."update-notifier"."0.1.8"
-      self.by-version."minimatch"."0.2.14"
+      self.by-version."update-notifier"."0.1.10"
+      self.by-version."minimatch"."0.3.0"
+      self.by-version."ps-tree"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."1.0.17";
+  "nodemon" = self.by-version."nodemon"."1.2.0";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -12672,14 +14061,34 @@
     passthru.names = [ "nomnom" ];
   };
   by-spec."nopt"."2" =
-    self.by-version."nopt"."2.2.0";
-  by-version."nopt"."2.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-2.2.0";
+    self.by-version."nopt"."2.2.1";
+  by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.0.tgz";
-        name = "nopt-2.2.0.tgz";
-        sha1 = "3d106676f3607ac466af9bf82bd707b1501d3bd5";
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
+        name = "nopt-2.2.1.tgz";
+        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt" or []);
+    deps = [
+      self.by-version."abbrev"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
+  by-spec."nopt"."2 || 3" =
+    self.by-version."nopt"."3.0.0";
+  by-version."nopt"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-3.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-3.0.0.tgz";
+        name = "nopt-3.0.0.tgz";
+        sha1 = "4fcf4bf09123d5ee6b2f70214a4d95789b875c79";
       })
     ];
     buildInputs =
@@ -12712,9 +14121,11 @@
     passthru.names = [ "nopt" ];
   };
   by-spec."nopt"."2.2.x" =
-    self.by-version."nopt"."2.2.0";
+    self.by-version."nopt"."2.2.1";
   by-spec."nopt"."^2.2.0" =
-    self.by-version."nopt"."2.2.0";
+    self.by-version."nopt"."2.2.1";
+  by-spec."nopt"."^2.2.1" =
+    self.by-version."nopt"."2.2.1";
   by-spec."nopt"."~1.0.10" =
     self.by-version."nopt"."1.0.10";
   by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -12758,38 +14169,62 @@
   by-spec."nopt"."~2.1.2" =
     self.by-version."nopt"."2.1.2";
   by-spec."nopt"."~2.2.0" =
-    self.by-version."nopt"."2.2.0";
-  by-spec."normalize-package-data"."~0.2.9" =
-    self.by-version."normalize-package-data"."0.2.12";
-  by-version."normalize-package-data"."0.2.12" = lib.makeOverridable self.buildNodePackage {
-    name = "node-normalize-package-data-0.2.12";
+    self.by-version."nopt"."2.2.1";
+  by-spec."nopt"."~2.2.1" =
+    self.by-version."nopt"."2.2.1";
+  by-spec."normalize-package-data"."^0.2.13" =
+    self.by-version."normalize-package-data"."0.2.13";
+  by-version."normalize-package-data"."0.2.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-normalize-package-data-0.2.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.12.tgz";
-        name = "normalize-package-data-0.2.12.tgz";
-        sha1 = "c8284cf0cb0466ea60ee64276b9070722c1da768";
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.13.tgz";
+        name = "normalize-package-data-0.2.13.tgz";
+        sha1 = "50f9fd9e77b1c8411cd231db2962e73963de774d";
       })
     ];
     buildInputs =
       (self.nativeDeps."normalize-package-data" or []);
     deps = [
-      self.by-version."semver"."2.2.1"
       self.by-version."github-url-from-git"."1.1.1"
-      self.by-version."github-url-from-username-repo"."0.0.2"
+      self.by-version."github-url-from-username-repo"."0.1.0"
+      self.by-version."semver"."2.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "normalize-package-data" ];
+  };
+  by-spec."normalize-package-data"."^0.3.0" =
+    self.by-version."normalize-package-data"."0.3.0";
+  by-version."normalize-package-data"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-normalize-package-data-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.3.0.tgz";
+        name = "normalize-package-data-0.3.0.tgz";
+        sha1 = "70ea9e5b6caf69faa9d83e42f71489642372d815";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."normalize-package-data" or []);
+    deps = [
+      self.by-version."github-url-from-git"."1.1.1"
+      self.by-version."github-url-from-username-repo"."0.2.0"
+      self.by-version."semver"."2.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.4.7";
-  by-version."npm"."1.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.4.7";
+    self.by-version."npm"."1.4.14";
+  by-version."npm"."1.4.14" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.4.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.4.7.tgz";
-        name = "npm-1.4.7.tgz";
-        sha1 = "7e3c4385973ffb58c9bf15eebe2668c0ce3fafe0";
+        url = "http://registry.npmjs.org/npm/-/npm-1.4.14.tgz";
+        name = "npm-1.4.14.tgz";
+        sha1 = "b779a930fb7a1260f9784fb1e04b1e6898653bd9";
       })
     ];
     buildInputs =
@@ -12801,6 +14236,7 @@
       self.by-version."ansistyles"."0.1.3"
       self.by-version."archy"."0.0.2"
       self.by-version."block-stream"."0.0.7"
+      self.by-version."char-spinner"."1.0.1"
       self.by-version."child-process-close"."0.1.1"
       self.by-version."chmodr"."0.1.0"
       self.by-version."chownr"."0.0.1"
@@ -12808,36 +14244,38 @@
       self.by-version."columnify"."0.1.2"
       self.by-version."editor"."0.0.5"
       self.by-version."fstream"."0.1.25"
-      self.by-version."fstream-npm"."0.1.6"
+      self.by-version."fstream-npm"."0.1.7"
       self.by-version."github-url-from-git"."1.1.1"
-      self.by-version."github-url-from-username-repo"."0.0.2"
-      self.by-version."glob"."3.2.9"
+      self.by-version."github-url-from-username-repo"."0.1.0"
+      self.by-version."glob"."3.2.11"
       self.by-version."graceful-fs"."2.0.3"
-      self.by-version."ini"."1.1.0"
-      self.by-version."init-package-json"."0.0.15"
+      self.by-version."inflight"."1.0.1"
+      self.by-version."ini"."1.2.1"
+      self.by-version."init-package-json"."0.0.17"
       self.by-version."lockfile"."0.4.2"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."minimatch"."0.2.14"
+      self.by-version."minimatch"."0.3.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."node-gyp"."0.13.0"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."npm-install-checks"."1.0.0"
-      self.by-version."npm-registry-client"."0.4.7"
-      self.by-version."npm-user-validate"."0.0.3"
-      self.by-version."npmconf"."0.1.14"
+      self.by-version."node-gyp"."0.13.1"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."npm-cache-filename"."1.0.1"
+      self.by-version."npm-install-checks"."1.0.2"
+      self.by-version."npm-registry-client"."1.0.1"
+      self.by-version."npm-user-validate"."0.1.0"
+      self.by-version."npmconf"."1.0.2"
       self.by-version."npmlog"."0.0.6"
       self.by-version."once"."1.3.0"
       self.by-version."opener"."1.3.0"
-      self.by-version."osenv"."0.0.3"
+      self.by-version."osenv"."0.1.0"
       self.by-version."path-is-inside"."1.0.1"
       self.by-version."read"."1.0.5"
-      self.by-version."read-installed"."2.0.2"
-      self.by-version."read-package-json"."1.1.8"
+      self.by-version."read-installed"."2.0.5"
+      self.by-version."read-package-json"."1.1.9"
       self.by-version."request"."2.30.0"
       self.by-version."retry"."0.6.0"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."semver"."2.2.1"
-      self.by-version."sha"."1.2.3"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."2.3.0"
+      self.by-version."sha"."1.2.4"
       self.by-version."slide"."1.1.5"
       self.by-version."sorted-object"."1.0.0"
       self.by-version."tar"."0.1.19"
@@ -12849,23 +14287,44 @@
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.4.7";
-  by-spec."npm-install-checks"."~1.0.0" =
-    self.by-version."npm-install-checks"."1.0.0";
-  by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-install-checks-1.0.0";
+  "npm" = self.by-version."npm"."1.4.14";
+  by-spec."npm-cache-filename"."^1.0.0" =
+    self.by-version."npm-cache-filename"."1.0.1";
+  by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-cache-filename-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.0.tgz";
-        name = "npm-install-checks-1.0.0.tgz";
-        sha1 = "7e1469b5e0c693b2ae2a8830b5fc4e7bf76c88fd";
+        url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz";
+        name = "npm-cache-filename-1.0.1.tgz";
+        sha1 = "9b640f0c1a5ba1145659685372a9ff71f70c4323";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-cache-filename" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-cache-filename" ];
+  };
+  by-spec."npm-cache-filename"."~1.0.1" =
+    self.by-version."npm-cache-filename"."1.0.1";
+  by-spec."npm-install-checks"."~1.0.0" =
+    self.by-version."npm-install-checks"."1.0.2";
+  by-version."npm-install-checks"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-install-checks-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.2.tgz";
+        name = "npm-install-checks-1.0.2.tgz";
+        sha1 = "ebba769753fc8551308333ef411920743a6809f6";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-install-checks" or []);
     deps = [
-      self.by-version."npmlog"."0.0.6"
-      self.by-version."semver"."2.2.1"
+      self.by-version."npmlog"."0.1.0"
+      self.by-version."semver"."2.3.0"
     ];
     peerDependencies = [
     ];
@@ -12885,58 +14344,59 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.34.0"
+      self.by-version."request"."2.36.0"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."semver"."2.0.11"
       self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.20"
-      self.by-version."npmlog"."0.0.6"
+      self.by-version."npmlog"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.4.7" =
-    self.by-version."npm-registry-client"."0.4.7";
-  by-version."npm-registry-client"."0.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-0.4.7";
+  by-spec."npm-registry-client"."~1.0.0" =
+    self.by-version."npm-registry-client"."1.0.1";
+  by-version."npm-registry-client"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.7.tgz";
-        name = "npm-registry-client-0.4.7.tgz";
-        sha1 = "f4369b59890da7882527eb7c427dd95d43707afb";
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-1.0.1.tgz";
+        name = "npm-registry-client-1.0.1.tgz";
+        sha1 = "c5f6a87d285f2005a35d3f67d9c724bce551b0f1";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.34.0"
-      self.by-version."graceful-fs"."2.0.3"
-      self.by-version."semver"."2.2.1"
-      self.by-version."slide"."1.1.5"
       self.by-version."chownr"."0.0.1"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."npm-cache-filename"."1.0.1"
+      self.by-version."request"."2.36.0"
       self.by-version."retry"."0.6.0"
-      self.by-version."npmlog"."0.0.6"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."2.3.0"
+      self.by-version."slide"."1.1.5"
+      self.by-version."npmlog"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-user-validate"."0.0.3" =
-    self.by-version."npm-user-validate"."0.0.3";
-  by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-user-validate-0.0.3";
+  by-spec."npm-user-validate"."~0.1.0" =
+    self.by-version."npm-user-validate"."0.1.0";
+  by-version."npm-user-validate"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-user-validate-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
-        name = "npm-user-validate-0.0.3.tgz";
-        sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e";
+        url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.0.tgz";
+        name = "npm-user-validate-0.1.0.tgz";
+        sha1 = "358a5b5148ed3f79771d980388c6e34c4a61f638";
       })
     ];
     buildInputs =
@@ -12961,14 +14421,14 @@
     buildInputs =
       (self.nativeDeps."npm2nix" or []);
     deps = [
-      self.by-version."semver"."2.2.1"
+      self.by-version."semver"."2.3.0"
       self.by-version."argparse"."0.1.15"
       self.by-version."npm-registry-client"."0.2.27"
       self.by-version."npmconf"."0.1.1"
       self.by-version."tar"."0.1.17"
       self.by-version."temp"."0.6.0"
       self.by-version."fs.extra"."1.2.1"
-      self.by-version."findit"."1.1.1"
+      self.by-version."findit"."1.2.0"
     ];
     peerDependencies = [
     ];
@@ -12994,7 +14454,7 @@
       self.by-version."once"."1.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.2.0"
+      self.by-version."nopt"."2.2.1"
       self.by-version."semver"."1.1.4"
       self.by-version."ini"."1.1.0"
     ];
@@ -13021,23 +14481,23 @@
       self.by-version."once"."1.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."semver"."2.2.1"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."semver"."2.3.0"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~0.1.13" =
-    self.by-version."npmconf"."0.1.14";
-  by-version."npmconf"."0.1.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npmconf-0.1.14";
+  by-spec."npmconf"."~0.1.2" =
+    self.by-version."npmconf"."0.1.16";
+  by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmconf-0.1.16";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.14.tgz";
-        name = "npmconf-0.1.14.tgz";
-        sha1 = "aea4bc12c5a84191a32cd350e325da4fe8b127e7";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
+        name = "npmconf-0.1.16.tgz";
+        sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
       })
     ];
     buildInputs =
@@ -13048,19 +14508,67 @@
       self.by-version."once"."1.3.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."osenv"."0.0.3"
-      self.by-version."nopt"."2.2.0"
-      self.by-version."semver"."2.2.1"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."semver"."2.3.0"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~0.1.14" =
-    self.by-version."npmconf"."0.1.14";
-  by-spec."npmconf"."~0.1.2" =
-    self.by-version."npmconf"."0.1.14";
+  by-spec."npmconf"."~1.0.0" =
+    self.by-version."npmconf"."1.0.2";
+  by-version."npmconf"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmconf-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-1.0.2.tgz";
+        name = "npmconf-1.0.2.tgz";
+        sha1 = "161a11fe5605f667edbf1aad797fd2d04c8c44e4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmconf" or []);
+    deps = [
+      self.by-version."config-chain"."1.1.8"
+      self.by-version."inherits"."2.0.1"
+      self.by-version."ini"."1.2.1"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."nopt"."3.0.0"
+      self.by-version."once"."1.3.0"
+      self.by-version."osenv"."0.0.3"
+      self.by-version."semver"."2.3.0"
+      self.by-version."uid-number"."0.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmconf" ];
+  };
+  by-spec."npmconf"."~1.0.1" =
+    self.by-version."npmconf"."1.0.2";
   by-spec."npmlog"."*" =
+    self.by-version."npmlog"."0.1.0";
+  by-version."npmlog"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmlog-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.0.tgz";
+        name = "npmlog-0.1.0.tgz";
+        sha1 = "c88336df9426979b86d848d35357f4e6a558bd90";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npmlog" or []);
+    deps = [
+      self.by-version."ansi"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmlog" ];
+  };
+  by-spec."npmlog"."0" =
+    self.by-version."npmlog"."0.1.0";
+  by-spec."npmlog"."0.0.6" =
     self.by-version."npmlog"."0.0.6";
   by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage {
     name = "node-npmlog-0.0.6";
@@ -13080,10 +14588,8 @@
     ];
     passthru.names = [ "npmlog" ];
   };
-  by-spec."npmlog"."0" =
-    self.by-version."npmlog"."0.0.6";
-  by-spec."npmlog"."0.0.6" =
-    self.by-version."npmlog"."0.0.6";
+  by-spec."npmlog"."0.1" =
+    self.by-version."npmlog"."0.1.0";
   by-spec."nssocket"."~0.5.1" =
     self.by-version."nssocket"."0.5.1";
   by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -13133,7 +14639,7 @@
       (fetchurl {
         url = "https://github.com/ciaranj/node-oauth/tarball/master";
         name = "oauth-0.9.11.tgz";
-        sha256 = "14cc7a064e3eda0948ac8db72fae140cb7b0fdbe031375d02cd6d0359c8b8faa";
+        sha256 = "71c7d2bd27de05fb0d6f233672c53765ecc028f100b5f1d4e7845f4637f47db4";
       })
     ];
     buildInputs =
@@ -13222,6 +14728,25 @@
   };
   by-spec."object-assign"."~0.1.2" =
     self.by-version."object-assign"."0.1.2";
+  by-spec."object-assign"."~0.2.1" =
+    self.by-version."object-assign"."0.2.2";
+  by-version."object-assign"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-object-assign-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/object-assign/-/object-assign-0.2.2.tgz";
+        name = "object-assign-0.2.2.tgz";
+        sha1 = "e0a78bc56af9c092051167f6b8f23249e7dde1a6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."object-assign" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "object-assign" ];
+  };
   by-spec."object-keys"."~0.4.0" =
     self.by-version."object-keys"."0.4.0";
   by-version."object-keys"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -13241,6 +14766,25 @@
     ];
     passthru.names = [ "object-keys" ];
   };
+  by-spec."on-headers"."0.0.0" =
+    self.by-version."on-headers"."0.0.0";
+  by-version."on-headers"."0.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-on-headers-0.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/on-headers/-/on-headers-0.0.0.tgz";
+        name = "on-headers-0.0.0.tgz";
+        sha1 = "ee2817f8344325785cd9c2df2b242bbc17caf4c4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."on-headers" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "on-headers" ];
+  };
   by-spec."once"."1.1.1" =
     self.by-version."once"."1.1.1";
   by-version."once"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -13260,9 +14804,7 @@
     ];
     passthru.names = [ "once" ];
   };
-  by-spec."once"."~1.1.1" =
-    self.by-version."once"."1.1.1";
-  by-spec."once"."~1.3.0" =
+  by-spec."once"."^1.3.0" =
     self.by-version."once"."1.3.0";
   by-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-once-1.3.0";
@@ -13281,6 +14823,10 @@
     ];
     passthru.names = [ "once" ];
   };
+  by-spec."once"."~1.1.1" =
+    self.by-version."once"."1.1.1";
+  by-spec."once"."~1.3.0" =
+    self.by-version."once"."1.3.0";
   by-spec."open"."0.0.2" =
     self.by-version."open"."0.0.2";
   by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -13340,6 +14886,8 @@
   };
   by-spec."open"."~0.0.4" =
     self.by-version."open"."0.0.5";
+  by-spec."open"."~0.0.5" =
+    self.by-version."open"."0.0.5";
   by-spec."opener"."~1.3.0" =
     self.by-version."opener"."1.3.0";
   by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -13360,14 +14908,14 @@
     passthru.names = [ "opener" ];
   };
   by-spec."openid".">=0.2.0" =
-    self.by-version."openid"."0.5.8";
-  by-version."openid"."0.5.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-openid-0.5.8";
+    self.by-version."openid"."0.5.9";
+  by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-openid-0.5.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/openid/-/openid-0.5.8.tgz";
-        name = "openid-0.5.8.tgz";
-        sha1 = "e1e3b26235cb8964ef850c074529b9d031550e85";
+        url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz";
+        name = "openid-0.5.9.tgz";
+        sha1 = "f44dd2609764c458c65fb22c03db068579e4bfa8";
       })
     ];
     buildInputs =
@@ -13378,6 +14926,25 @@
     ];
     passthru.names = [ "openid" ];
   };
+  by-spec."opn"."~0.1.1" =
+    self.by-version."opn"."0.1.2";
+  by-version."opn"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "opn-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/opn/-/opn-0.1.2.tgz";
+        name = "opn-0.1.2.tgz";
+        sha1 = "c527832cfd964d52096b524d0035ecaece51db4f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."opn" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "opn" ];
+  };
   by-spec."optimist"."*" =
     self.by-version."optimist"."0.6.1";
   by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage {
@@ -13393,7 +14960,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.0.10"
     ];
     peerDependencies = [
     ];
@@ -13420,7 +14987,30 @@
     ];
     passthru.names = [ "optimist" ];
   };
-  by-spec."optimist"."0.3.x" =
+  by-spec."optimist"."0.6.0" =
+    self.by-version."optimist"."0.6.0";
+  by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-optimist-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+        name = "optimist-0.6.0.tgz";
+        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optimist" or []);
+    deps = [
+      self.by-version."wordwrap"."0.0.2"
+      self.by-version."minimist"."0.0.10"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optimist" ];
+  };
+  by-spec."optimist"."0.6.x" =
+    self.by-version."optimist"."0.6.1";
+  by-spec."optimist"."~0.3" =
     self.by-version."optimist"."0.3.7";
   by-version."optimist"."0.3.7" = lib.makeOverridable self.buildNodePackage {
     name = "node-optimist-0.3.7";
@@ -13440,31 +15030,6 @@
     ];
     passthru.names = [ "optimist" ];
   };
-  by-spec."optimist"."0.6.0" =
-    self.by-version."optimist"."0.6.0";
-  by-version."optimist"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-optimist-0.6.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
-        name = "optimist-0.6.0.tgz";
-        sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optimist" or []);
-    deps = [
-      self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.8"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "optimist" ];
-  };
-  by-spec."optimist"."0.6.x" =
-    self.by-version."optimist"."0.6.1";
-  by-spec."optimist"."~0.3" =
-    self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.3.5" =
     self.by-version."optimist"."0.3.7";
   by-spec."optimist"."~0.6.0" =
@@ -13550,7 +15115,45 @@
     ];
     passthru.names = [ "os-browserify" ];
   };
+  by-spec."os-utils"."0.0.14" =
+    self.by-version."os-utils"."0.0.14";
+  by-version."os-utils"."0.0.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-os-utils-0.0.14";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/os-utils/-/os-utils-0.0.14.tgz";
+        name = "os-utils-0.0.14.tgz";
+        sha1 = "29e511697b1982b8c627722175fe39797ef64156";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."os-utils" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "os-utils" ];
+  };
   by-spec."osenv"."0" =
+    self.by-version."osenv"."0.1.0";
+  by-version."osenv"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-osenv-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz";
+        name = "osenv-0.1.0.tgz";
+        sha1 = "61668121eec584955030b9f470b1d2309504bfcb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."osenv" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "osenv" ];
+  };
+  by-spec."osenv"."0.0.3" =
     self.by-version."osenv"."0.0.3";
   by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
     name = "node-osenv-0.0.3";
@@ -13569,8 +15172,6 @@
     ];
     passthru.names = [ "osenv" ];
   };
-  by-spec."osenv"."0.0.3" =
-    self.by-version."osenv"."0.0.3";
   by-spec."osenv"."~0.0.3" =
     self.by-version."osenv"."0.0.3";
   by-spec."owl-deepcopy"."*" =
@@ -13615,15 +15216,34 @@
     ];
     passthru.names = [ "p-throttler" ];
   };
-  by-spec."pako"."~0.2.0" =
-    self.by-version."pako"."0.2.0";
-  by-version."pako"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-pako-0.2.0";
+  by-spec."pad-component"."0.0.1" =
+    self.by-version."pad-component"."0.0.1";
+  by-version."pad-component"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-pad-component-0.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/pako/-/pako-0.2.0.tgz";
-        name = "pako-0.2.0.tgz";
-        sha1 = "bb93787e8c60587c8b13cd3cd8802e9d6f5dd8d5";
+        url = "http://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz";
+        name = "pad-component-0.0.1.tgz";
+        sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pad-component" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pad-component" ];
+  };
+  by-spec."pako"."~0.2.0" =
+    self.by-version."pako"."0.2.3";
+  by-version."pako"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-pako-0.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pako/-/pako-0.2.3.tgz";
+        name = "pako-0.2.3.tgz";
+        sha1 = "da97260282d270c43f210d9e9bf9abdf54072641";
       })
     ];
     buildInputs =
@@ -13860,14 +15480,14 @@
     passthru.names = [ "pause" ];
   };
   by-spec."phantomjs"."*" =
-    self.by-version."phantomjs"."1.9.7-4";
-  by-version."phantomjs"."1.9.7-4" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.7-4";
+    self.by-version."phantomjs"."1.9.7-8";
+  by-version."phantomjs"."1.9.7-8" = lib.makeOverridable self.buildNodePackage {
+    name = "phantomjs-1.9.7-8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-4.tgz";
-        name = "phantomjs-1.9.7-4.tgz";
-        sha1 = "975b84f17b4b3bb28161d28303cb793b98c9d0dd";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-8.tgz";
+        name = "phantomjs-1.9.7-8.tgz";
+        sha1 = "f1858d1626bb62f8bbb2a06e733ea95c50c2deb5";
       })
     ];
     buildInputs =
@@ -13878,16 +15498,19 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."npmconf"."0.0.24"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."request"."2.36.0"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "phantomjs" ];
   };
-  "phantomjs" = self.by-version."phantomjs"."1.9.7-4";
-  by-spec."phantomjs"."~1.9.1-2" =
-    self.by-version."phantomjs"."1.9.7-4";
+  "phantomjs" = self.by-version."phantomjs"."1.9.7-8";
+  by-spec."phantomjs"."~1.9.1" =
+    self.by-version."phantomjs"."1.9.7-8";
+  by-spec."phantomjs"."~1.9.7" =
+    self.by-version."phantomjs"."1.9.7-8";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -14010,14 +15633,14 @@
     passthru.names = [ "posix-getopt" ];
   };
   by-spec."pretty-bytes"."^0.1.0" =
-    self.by-version."pretty-bytes"."0.1.0";
-  by-version."pretty-bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "pretty-bytes-0.1.0";
+    self.by-version."pretty-bytes"."0.1.1";
+  by-version."pretty-bytes"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "pretty-bytes-0.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz";
-        name = "pretty-bytes-0.1.0.tgz";
-        sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e";
+        url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.1.tgz";
+        name = "pretty-bytes-0.1.1.tgz";
+        sha1 = "c99fc780053e49397155295f2fd1a196e8c3937a";
       })
     ];
     buildInputs =
@@ -14028,6 +15651,25 @@
     ];
     passthru.names = [ "pretty-bytes" ];
   };
+  by-spec."process"."^0.7.0" =
+    self.by-version."process"."0.7.0";
+  by-version."process"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-process-0.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/process/-/process-0.7.0.tgz";
+        name = "process-0.7.0.tgz";
+        sha1 = "c52208161a34adf3812344ae85d3e6150469389d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."process" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "process" ];
+  };
   by-spec."process"."~0.5.1" =
     self.by-version."process"."0.5.2";
   by-version."process"."0.5.2" = lib.makeOverridable self.buildNodePackage {
@@ -14080,7 +15722,7 @@
     buildInputs =
       (self.nativeDeps."promise" or []);
     deps = [
-      self.by-version."is-promise"."1.0.0"
+      self.by-version."is-promise"."1.0.1"
     ];
     peerDependencies = [
     ];
@@ -14102,7 +15744,7 @@
     deps = [
       self.by-version."pkginfo"."0.3.0"
       self.by-version."read"."1.0.5"
-      self.by-version."revalidator"."0.1.7"
+      self.by-version."revalidator"."0.1.8"
       self.by-version."utile"."0.2.1"
       self.by-version."winston"."0.6.2"
     ];
@@ -14131,14 +15773,14 @@
     passthru.names = [ "promptly" ];
   };
   by-spec."promzard"."~0.2.0" =
-    self.by-version."promzard"."0.2.1";
-  by-version."promzard"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-promzard-0.2.1";
+    self.by-version."promzard"."0.2.2";
+  by-version."promzard"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-promzard-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/promzard/-/promzard-0.2.1.tgz";
-        name = "promzard-0.2.1.tgz";
-        sha1 = "c4c7cbe5182465c13b43540be9daf47098b4e75b";
+        url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz";
+        name = "promzard-0.2.2.tgz";
+        sha1 = "918b9f2b29458cb001781a8856502e4a79b016e0";
       })
     ];
     buildInputs =
@@ -14170,14 +15812,14 @@
     passthru.names = [ "proto-list" ];
   };
   by-spec."protobufjs".">= 1.1.4" =
-    self.by-version."protobufjs"."2.0.5";
-  by-version."protobufjs"."2.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "protobufjs-2.0.5";
+    self.by-version."protobufjs"."2.2.1";
+  by-version."protobufjs"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "protobufjs-2.2.1";
     src = [
       (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz";
-        name = "protobufjs-2.0.5.tgz";
-        sha1 = "7f351178c959b333d2327b773325ca4b2627a242";
+        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.2.1.tgz";
+        name = "protobufjs-2.2.1.tgz";
+        sha1 = "ce22d3f51f6685b8e783a7d7c2e956ada6147495";
       })
     ];
     buildInputs =
@@ -14190,6 +15832,46 @@
     ];
     passthru.names = [ "protobufjs" ];
   };
+  by-spec."proxy-addr"."1.0.0" =
+    self.by-version."proxy-addr"."1.0.0";
+  by-version."proxy-addr"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-proxy-addr-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.0.tgz";
+        name = "proxy-addr-1.0.0.tgz";
+        sha1 = "478617ab0fba70e0c3dae9cf57469e36dd2febaf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."proxy-addr" or []);
+    deps = [
+      self.by-version."ipaddr.js"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "proxy-addr" ];
+  };
+  by-spec."proxy-addr"."1.0.1" =
+    self.by-version."proxy-addr"."1.0.1";
+  by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-proxy-addr-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
+        name = "proxy-addr-1.0.1.tgz";
+        sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."proxy-addr" or []);
+    deps = [
+      self.by-version."ipaddr.js"."0.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "proxy-addr" ];
+  };
   by-spec."ps-tree"."0.0.x" =
     self.by-version."ps-tree"."0.0.3";
   by-version."ps-tree"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -14210,6 +15892,8 @@
     ];
     passthru.names = [ "ps-tree" ];
   };
+  by-spec."ps-tree"."~0.0.3" =
+    self.by-version."ps-tree"."0.0.3";
   by-spec."punycode"."1.2.4" =
     self.by-version."punycode"."1.2.4";
   by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -14252,6 +15936,8 @@
   };
   by-spec."punycode"."~1.2.3" =
     self.by-version."punycode"."1.2.4";
+  by-spec."punycode"."~1.2.4" =
+    self.by-version."punycode"."1.2.4";
   by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" =
     self.by-version."pure-css"."0.5.0-rc-1";
   by-version."pure-css"."0.5.0-rc-1" = lib.makeOverridable self.buildNodePackage {
@@ -14273,14 +15959,14 @@
   };
   "pure-css" = self.by-version."pure-css"."0.5.0-rc-1";
   by-spec."q".">= 0.0.1" =
-    self.by-version."q"."2.0.1";
-  by-version."q"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-q-2.0.1";
+    self.by-version."q"."2.0.2";
+  by-version."q"."2.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-q-2.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/q/-/q-2.0.1.tgz";
-        name = "q-2.0.1.tgz";
-        sha1 = "ae9dc1edd970e72820a1ca716ecc1b0fc96c1c5a";
+        url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz";
+        name = "q-2.0.2.tgz";
+        sha1 = "4629e6cc668ff8554cfa775dab5aba50bad8f56d";
       })
     ];
     buildInputs =
@@ -14478,8 +16164,6 @@
     self.by-version."qs"."0.5.6";
   by-spec."qs"."~0.6.0" =
     self.by-version."qs"."0.6.6";
-  by-spec."qs"."~0.6.6" =
-    self.by-version."qs"."0.6.6";
   by-spec."querystring".">=0.1.0 <0.2.0" =
     self.by-version."querystring"."0.1.0";
   by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -14518,15 +16202,34 @@
     ];
     passthru.names = [ "querystring-es3" ];
   };
-  by-spec."rai"."~0.1" =
-    self.by-version."rai"."0.1.9";
-  by-version."rai"."0.1.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rai-0.1.9";
+  by-spec."querystring-es3"."~0.2.0" =
+    self.by-version."querystring-es3"."0.2.1-0";
+  by-version."querystring-es3"."0.2.1-0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-querystring-es3-0.2.1-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz";
-        name = "rai-0.1.9.tgz";
-        sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc";
+        url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1-0.tgz";
+        name = "querystring-es3-0.2.1-0.tgz";
+        sha1 = "bd38cbd701040e7ef66c94a93db4a5b45be39565";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."querystring-es3" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "querystring-es3" ];
+  };
+  by-spec."rai"."~0.1.11" =
+    self.by-version."rai"."0.1.11";
+  by-version."rai"."0.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rai-0.1.11";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz";
+        name = "rai-0.1.11.tgz";
+        sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228";
       })
     ];
     buildInputs =
@@ -14639,41 +16342,21 @@
     ];
     passthru.names = [ "raw-body" ];
   };
-  by-spec."raw-body"."1.1.3" =
-    self.by-version."raw-body"."1.1.3";
-  by-version."raw-body"."1.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-raw-body-1.1.3";
+  by-spec."raw-body"."1.1.6" =
+    self.by-version."raw-body"."1.1.6";
+  by-version."raw-body"."1.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-raw-body-1.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.3.tgz";
-        name = "raw-body-1.1.3.tgz";
-        sha1 = "3d2f91e2449259cc67b8c3ce9f061db5b987935b";
+        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.6.tgz";
+        name = "raw-body-1.1.6.tgz";
+        sha1 = "98e9df9a7e2df994931b7cdb4b2a6b9694a74f02";
       })
     ];
     buildInputs =
       (self.nativeDeps."raw-body" or []);
     deps = [
-      self.by-version."bytes"."0.2.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "raw-body" ];
-  };
-  by-spec."raw-body"."~1.1.2" =
-    self.by-version."raw-body"."1.1.4";
-  by-version."raw-body"."1.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-raw-body-1.1.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
-        name = "raw-body-1.1.4.tgz";
-        sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."raw-body" or []);
-    deps = [
-      self.by-version."bytes"."0.3.0"
+      self.by-version."bytes"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -14732,15 +16415,15 @@
     buildInputs =
       (self.nativeDeps."rc" or []);
     deps = [
-      self.by-version."minimist"."0.0.8"
-      self.by-version."deep-extend"."0.2.8"
+      self.by-version."minimist"."0.0.10"
+      self.by-version."deep-extend"."0.2.10"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rc" ];
   };
-  by-spec."rc"."~0.3.4" =
+  by-spec."rc"."~0.3.5" =
     self.by-version."rc"."0.3.5";
   by-spec."react"."*" =
     self.by-version."react"."0.10.0";
@@ -14783,61 +16466,107 @@
     ];
     passthru.names = [ "read" ];
   };
+  by-spec."read"."1.0.5" =
+    self.by-version."read"."1.0.5";
   by-spec."read"."1.0.x" =
     self.by-version."read"."1.0.5";
   by-spec."read"."~1.0.1" =
     self.by-version."read"."1.0.5";
   by-spec."read"."~1.0.4" =
     self.by-version."read"."1.0.5";
-  by-spec."read-installed"."~2.0.1" =
-    self.by-version."read-installed"."2.0.2";
-  by-version."read-installed"."2.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-installed-2.0.2";
+  by-spec."read-installed"."~2.0.4" =
+    self.by-version."read-installed"."2.0.5";
+  by-version."read-installed"."2.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-installed-2.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.2.tgz";
-        name = "read-installed-2.0.2.tgz";
-        sha1 = "e69e7e1946af932b2fa454465639ebea4d63773c";
+        url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.5.tgz";
+        name = "read-installed-2.0.5.tgz";
+        sha1 = "761eda1fd2dc322f8e77844a8bf1ddedbcfc754b";
       })
     ];
     buildInputs =
       (self.nativeDeps."read-installed" or []);
     deps = [
-      self.by-version."read-package-json"."1.1.8"
-      self.by-version."semver"."2.2.1"
+      self.by-version."read-package-json"."1.2.2"
+      self.by-version."semver"."2.3.0"
       self.by-version."slide"."1.1.5"
       self.by-version."util-extend"."1.0.1"
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."graceful-fs"."3.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-installed" ];
   };
   by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.1.8";
-  by-version."read-package-json"."1.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-package-json-1.1.8";
+    self.by-version."read-package-json"."1.2.2";
+  by-version."read-package-json"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-package-json-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.8.tgz";
-        name = "read-package-json-1.1.8.tgz";
-        sha1 = "234928819444283fd63f9d93ce03ba00668e94f9";
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.2.tgz";
+        name = "read-package-json-1.2.2.tgz";
+        sha1 = "545fc9044d135bf5fe0a67c6eab368c3186cbafe";
       })
     ];
     buildInputs =
       (self.nativeDeps."read-package-json" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."4.0.2"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."normalize-package-data"."0.2.12"
+      self.by-version."normalize-package-data"."0.3.0"
+      self.by-version."graceful-fs"."3.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "read-package-json" ];
+  };
+  by-spec."read-package-json"."~1.1.9" =
+    self.by-version."read-package-json"."1.1.9";
+  by-version."read-package-json"."1.1.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-package-json-1.1.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.9.tgz";
+        name = "read-package-json-1.1.9.tgz";
+        sha1 = "9c319185e5f8461661c01f8d4e5e80b468aa18ee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."read-package-json" or []);
+    deps = [
+      self.by-version."glob"."3.2.11"
+      self.by-version."lru-cache"."2.5.0"
+      self.by-version."normalize-package-data"."0.2.13"
       self.by-version."graceful-fs"."2.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-package-json" ];
   };
-  by-spec."read-package-json"."~1.1.8" =
-    self.by-version."read-package-json"."1.1.8";
+  by-spec."readable-stream"."*" =
+    self.by-version."readable-stream"."1.1.13-1";
+  by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-readable-stream-1.1.13-1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz";
+        name = "readable-stream-1.1.13-1.tgz";
+        sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."readable-stream" or []);
+    deps = [
+      self.by-version."core-util-is"."1.0.1"
+      self.by-version."isarray"."0.0.1"
+      self.by-version."string_decoder"."0.10.25"
+      self.by-version."inherits"."2.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "readable-stream" ];
+  };
   by-spec."readable-stream"."1.0" =
     self.by-version."readable-stream"."1.0.27-1";
   by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage {
@@ -14861,35 +16590,22 @@
     ];
     passthru.names = [ "readable-stream" ];
   };
+  by-spec."readable-stream"."1.0.27-1" =
+    self.by-version."readable-stream"."1.0.27-1";
   by-spec."readable-stream"."1.1" =
     self.by-version."readable-stream"."1.1.13-1";
-  by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-readable-stream-1.1.13-1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz";
-        name = "readable-stream-1.1.13-1.tgz";
-        sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."readable-stream" or []);
-    deps = [
-      self.by-version."core-util-is"."1.0.1"
-      self.by-version."isarray"."0.0.1"
-      self.by-version."string_decoder"."0.10.25"
-      self.by-version."inherits"."2.0.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "readable-stream" ];
-  };
+  by-spec."readable-stream"."^1.0.27-1" =
+    self.by-version."readable-stream"."1.1.13-1";
   by-spec."readable-stream"."~1.0.17" =
     self.by-version."readable-stream"."1.0.27-1";
   by-spec."readable-stream"."~1.0.2" =
     self.by-version."readable-stream"."1.0.27-1";
   by-spec."readable-stream"."~1.0.24" =
     self.by-version."readable-stream"."1.0.27-1";
+  by-spec."readable-stream"."~1.0.26" =
+    self.by-version."readable-stream"."1.0.27-1";
+  by-spec."readable-stream"."~1.0.26-4" =
+    self.by-version."readable-stream"."1.0.27-1";
   by-spec."readable-stream"."~1.1.8" =
     self.by-version."readable-stream"."1.1.13-1";
   by-spec."readable-stream"."~1.1.9" =
@@ -14908,7 +16624,7 @@
     buildInputs =
       (self.nativeDeps."readdirp" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
+      self.by-version."minimatch"."0.3.0"
     ];
     peerDependencies = [
     ];
@@ -14976,14 +16692,14 @@
     passthru.names = [ "redeyed" ];
   };
   by-spec."redis"."*" =
-    self.by-version."redis"."0.10.1";
-  by-version."redis"."0.10.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redis-0.10.1";
+    self.by-version."redis"."0.10.3";
+  by-version."redis"."0.10.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-redis-0.10.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.10.1.tgz";
-        name = "redis-0.10.1.tgz";
-        sha1 = "4f09258931d961377239fdbd495e1d99a263a8ec";
+        url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
+        name = "redis-0.10.3.tgz";
+        sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
       })
     ];
     buildInputs =
@@ -14994,7 +16710,9 @@
     ];
     passthru.names = [ "redis" ];
   };
-  "redis" = self.by-version."redis"."0.10.1";
+  "redis" = self.by-version."redis"."0.10.3";
+  by-spec."redis"."0.10.x" =
+    self.by-version."redis"."0.10.3";
   by-spec."redis"."0.7.2" =
     self.by-version."redis"."0.7.2";
   by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
@@ -15009,7 +16727,7 @@
     buildInputs =
       (self.nativeDeps."redis" or []);
     deps = [
-      self.by-version."hiredis"."0.1.16"
+      self.by-version."hiredis"."0.1.17"
     ];
     peerDependencies = [
     ];
@@ -15034,27 +16752,8 @@
     ];
     passthru.names = [ "redis" ];
   };
-  by-spec."redis"."0.8.x" =
-    self.by-version."redis"."0.8.6";
-  by-version."redis"."0.8.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redis-0.8.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.8.6.tgz";
-        name = "redis-0.8.6.tgz";
-        sha1 = "a7ae8f0d6fad24bdeaffe28158d6cd1f1c9d30b8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."redis" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "redis" ];
-  };
   by-spec."redis"."~0.10.0" =
-    self.by-version."redis"."0.10.1";
+    self.by-version."redis"."0.10.3";
   by-spec."reds"."~0.2.4" =
     self.by-version."reds"."0.2.4";
   by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -15137,14 +16836,14 @@
     passthru.names = [ "replace" ];
   };
   by-spec."request"."2" =
-    self.by-version."request"."2.34.0";
-  by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.34.0";
+    self.by-version."request"."2.36.0";
+  by-version."request"."2.36.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-request-2.36.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
-        name = "request-2.34.0.tgz";
-        sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
+        url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz";
+        name = "request-2.36.0.tgz";
+        sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
       })
     ];
     buildInputs =
@@ -15152,12 +16851,12 @@
     deps = [
       self.by-version."qs"."0.6.6"
       self.by-version."json-stringify-safe"."5.0.0"
+      self.by-version."mime"."1.2.11"
       self.by-version."forever-agent"."0.5.2"
       self.by-version."node-uuid"."1.4.1"
-      self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.12.1"
-      self.by-version."form-data"."0.1.2"
-      self.by-version."tunnel-agent"."0.3.0"
+      self.by-version."form-data"."0.1.3"
+      self.by-version."tunnel-agent"."0.4.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
       self.by-version."hawk"."1.0.0"
@@ -15168,9 +16867,9 @@
     passthru.names = [ "request" ];
   };
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.34.0";
+    self.by-version."request"."2.36.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.34.0";
+    self.by-version."request"."2.36.0";
   by-spec."request"."2.16.2" =
     self.by-version."request"."2.16.2";
   by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage {
@@ -15231,6 +16930,8 @@
     ];
     passthru.names = [ "request" ];
   };
+  by-spec."request"."2.36.0" =
+    self.by-version."request"."2.36.0";
   by-spec."request"."2.9.x" =
     self.by-version."request"."2.9.203";
   by-version."request"."2.9.203" = lib.makeOverridable self.buildNodePackage {
@@ -15250,12 +16951,12 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request".">=2.33.0" =
-    self.by-version."request"."2.34.0";
   by-spec."request"."^2.34.0" =
-    self.by-version."request"."2.34.0";
+    self.by-version."request"."2.36.0";
+  by-spec."request"."^2.36.0" =
+    self.by-version."request"."2.36.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.34.0";
+    self.by-version."request"."2.36.0";
   by-spec."request"."~2.27.0" =
     self.by-version."request"."2.27.0";
   by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
@@ -15281,7 +16982,7 @@
       self.by-version."cookie-jar"."0.3.0"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."form-data"."0.1.2"
+      self.by-version."form-data"."0.1.3"
     ];
     peerDependencies = [
     ];
@@ -15307,7 +17008,7 @@
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.9.15"
-      self.by-version."form-data"."0.1.2"
+      self.by-version."form-data"."0.1.3"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
@@ -15318,15 +17019,15 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request"."~2.33.0" =
-    self.by-version."request"."2.33.0";
-  by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.33.0";
+  by-spec."request"."~2.34.0" =
+    self.by-version."request"."2.34.0";
+  by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-request-2.34.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz";
-        name = "request-2.33.0.tgz";
-        sha1 = "5167878131726070ec633752ea230a2379dc65ff";
+        url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
+        name = "request-2.34.0.tgz";
+        sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
       })
     ];
     buildInputs =
@@ -15338,7 +17039,7 @@
       self.by-version."node-uuid"."1.4.1"
       self.by-version."mime"."1.2.11"
       self.by-version."tough-cookie"."0.12.1"
-      self.by-version."form-data"."0.1.2"
+      self.by-version."form-data"."0.1.3"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
@@ -15349,6 +17050,8 @@
     ];
     passthru.names = [ "request" ];
   };
+  by-spec."request"."~2.36.0" =
+    self.by-version."request"."2.36.0";
   by-spec."request-progress"."~0.3.0" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -15390,14 +17093,14 @@
     passthru.names = [ "request-replay" ];
   };
   by-spec."requirejs"."~2.1" =
-    self.by-version."requirejs"."2.1.11";
-  by-version."requirejs"."2.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "requirejs-2.1.11";
+    self.by-version."requirejs"."2.1.14";
+  by-version."requirejs"."2.1.14" = lib.makeOverridable self.buildNodePackage {
+    name = "requirejs-2.1.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.11.tgz";
-        name = "requirejs-2.1.11.tgz";
-        sha1 = "0eafaa6b46ca9b5b1e13406f119c020190a24442";
+        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.14.tgz";
+        name = "requirejs-2.1.14.tgz";
+        sha1 = "de00290aa526192ff8df4dc0ba9370ce399a76b0";
       })
     ];
     buildInputs =
@@ -15409,7 +17112,7 @@
     passthru.names = [ "requirejs" ];
   };
   by-spec."requirejs"."~2.1.0" =
-    self.by-version."requirejs"."2.1.11";
+    self.by-version."requirejs"."2.1.14";
   by-spec."resolve"."0.6.3" =
     self.by-version."resolve"."0.6.3";
   by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage {
@@ -15456,20 +17159,23 @@
     self.by-version."resolve"."0.6.3";
   by-spec."resolve"."~0.6.1" =
     self.by-version."resolve"."0.6.3";
-  by-spec."response-time"."1.0.0" =
-    self.by-version."response-time"."1.0.0";
-  by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-response-time-1.0.0";
+  by-spec."resolve"."~0.6.3" =
+    self.by-version."resolve"."0.6.3";
+  by-spec."response-time"."2.0.0" =
+    self.by-version."response-time"."2.0.0";
+  by-version."response-time"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-response-time-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
-        name = "response-time-1.0.0.tgz";
-        sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9";
+        url = "http://registry.npmjs.org/response-time/-/response-time-2.0.0.tgz";
+        name = "response-time-2.0.0.tgz";
+        sha1 = "65cb39fd50de2f4ffdbdd285f1855966bd6fcb36";
       })
     ];
     buildInputs =
       (self.nativeDeps."response-time" or []);
     deps = [
+      self.by-version."on-headers"."0.0.0"
     ];
     peerDependencies = [
     ];
@@ -15512,26 +17218,26 @@
     passthru.names = [ "restify" ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."1.12.0-0";
-  by-version."rethinkdb"."1.12.0-0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rethinkdb-1.12.0-0";
+    self.by-version."rethinkdb"."1.12.0-1";
+  by-version."rethinkdb"."1.12.0-1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rethinkdb-1.12.0-1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-0.tgz";
-        name = "rethinkdb-1.12.0-0.tgz";
-        sha1 = "cad01e869bd12dcd09f235c5ec8f5ccf26cc6f81";
+        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-1.tgz";
+        name = "rethinkdb-1.12.0-1.tgz";
+        sha1 = "c6dfb03a0ca179d0bf798b8de0c13938b9d64595";
       })
     ];
     buildInputs =
       (self.nativeDeps."rethinkdb" or []);
     deps = [
-      self.by-version."protobufjs"."2.0.5"
+      self.by-version."protobufjs"."2.2.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rethinkdb" ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.12.0-0";
+  "rethinkdb" = self.by-version."rethinkdb"."1.12.0-1";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -15554,14 +17260,14 @@
   by-spec."retry"."~0.6.0" =
     self.by-version."retry"."0.6.0";
   by-spec."revalidator"."0.1.x" =
-    self.by-version."revalidator"."0.1.7";
-  by-version."revalidator"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-revalidator-0.1.7";
+    self.by-version."revalidator"."0.1.8";
+  by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-revalidator-0.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.7.tgz";
-        name = "revalidator-0.1.7.tgz";
-        sha1 = "f0b68b01bc5c5e0e9e6d864154d7098f24fec1db";
+        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
+        name = "revalidator-0.1.8.tgz";
+        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
       })
     ];
     buildInputs =
@@ -15615,14 +17321,14 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.2.6";
-  by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.2.6";
+    self.by-version."rimraf"."2.2.8";
+  by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
-        name = "rimraf-2.2.6.tgz";
-        sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        name = "rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       })
     ];
     buildInputs =
@@ -15634,11 +17340,13 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2.x.x" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
+  by-spec."rimraf"."^2.2.0" =
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."^2.2.2" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.0.2" =
     self.by-version."rimraf"."2.0.3";
   by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -15680,13 +17388,15 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."~2.2.0" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.2" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.5" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.6" =
-    self.by-version."rimraf"."2.2.6";
+    self.by-version."rimraf"."2.2.8";
+  by-spec."rimraf"."~2.2.8" =
+    self.by-version."rimraf"."2.2.8";
   by-spec."ruglify"."~1.0.0" =
     self.by-version."ruglify"."1.0.0";
   by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -15772,7 +17482,7 @@
       self.by-version."lodash"."1.3.1"
       self.by-version."async"."0.2.10"
       self.by-version."adm-zip"."0.4.4"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
@@ -15816,7 +17526,7 @@
     ];
     passthru.names = [ "sax" ];
   };
-  by-spec."sax".">=0.4.2" =
+  by-spec."sax"."0.6.x" =
     self.by-version."sax"."0.6.0";
   by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-sax-0.6.0";
@@ -15835,6 +17545,8 @@
     ];
     passthru.names = [ "sax" ];
   };
+  by-spec."sax".">=0.4.2" =
+    self.by-version."sax"."0.6.0";
   by-spec."scmp"."~0.0.3" =
     self.by-version."scmp"."0.0.3";
   by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -15855,14 +17567,14 @@
     passthru.names = [ "scmp" ];
   };
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.41.0";
-  by-version."selenium-webdriver"."2.41.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-selenium-webdriver-2.41.0";
+    self.by-version."selenium-webdriver"."2.42.0";
+  by-version."selenium-webdriver"."2.42.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-selenium-webdriver-2.42.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.41.0.tgz";
-        name = "selenium-webdriver-2.41.0.tgz";
-        sha1 = "d084dfbc73bdf33aedc7d731eaab028affad7f16";
+        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.42.0.tgz";
+        name = "selenium-webdriver-2.42.0.tgz";
+        sha1 = "a7ec4ca8779378f6b2627ba342f529c8d1187195";
       })
     ];
     buildInputs =
@@ -15873,16 +17585,16 @@
     ];
     passthru.names = [ "selenium-webdriver" ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.41.0";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.42.0";
   by-spec."semver"."*" =
-    self.by-version."semver"."2.2.1";
-  by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "semver-2.2.1";
+    self.by-version."semver"."2.3.0";
+  by-version."semver"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
-        name = "semver-2.2.1.tgz";
-        sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213";
+        url = "http://registry.npmjs.org/semver/-/semver-2.3.0.tgz";
+        name = "semver-2.3.0.tgz";
+        sha1 = "d31b2903ebe2a1806c05b8e763916a7183108a15";
       })
     ];
     buildInputs =
@@ -15893,7 +17605,7 @@
     ];
     passthru.names = [ "semver" ];
   };
-  "semver" = self.by-version."semver"."2.2.1";
+  "semver" = self.by-version."semver"."2.3.0";
   by-spec."semver"."1.1.0" =
     self.by-version."semver"."1.1.0";
   by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -15933,15 +17645,17 @@
     passthru.names = [ "semver" ];
   };
   by-spec."semver"."2" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.0";
+  by-spec."semver"."2 >=2.2.1" =
+    self.by-version."semver"."2.3.0";
   by-spec."semver"."2.x" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.0";
   by-spec."semver".">=2.0.10 <3.0.0" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.0";
   by-spec."semver".">=2.2.1 <3" =
-    self.by-version."semver"."2.2.1";
-  by-spec."semver"."^2.2.1" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.0";
+  by-spec."semver"."^2.3.0" =
+    self.by-version."semver"."2.3.0";
   by-spec."semver"."~1.1.0" =
     self.by-version."semver"."1.1.4";
   by-spec."semver"."~1.1.4" =
@@ -15986,23 +17700,43 @@
   };
   by-spec."semver"."~2.2.1" =
     self.by-version."semver"."2.2.1";
-  by-spec."send"."*" =
-    self.by-version."send"."0.2.0";
-  by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-send-0.2.0";
+  by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz";
-        name = "send-0.2.0.tgz";
-        sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58";
+        url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
+        name = "semver-2.2.1.tgz";
+        sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."semver" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "semver" ];
+  };
+  by-spec."semver"."~2.3.0" =
+    self.by-version."semver"."2.3.0";
+  by-spec."send"."*" =
+    self.by-version."send"."0.4.1";
+  by-version."send"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.4.1.tgz";
+        name = "send-0.4.1.tgz";
+        sha1 = "6e9a5d41cb9c0fb3514226446fa319aed46d433d";
       })
     ];
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
       self.by-version."debug"."0.8.1"
-      self.by-version."mime"."1.2.11"
+      self.by-version."finished"."1.1.4"
       self.by-version."fresh"."0.2.2"
+      self.by-version."mime"."1.2.11"
       self.by-version."range-parser"."1.0.0"
     ];
     peerDependencies = [
@@ -16023,7 +17757,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -16046,7 +17780,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -16069,7 +17803,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.0"
       self.by-version."range-parser"."0.0.4"
@@ -16080,6 +17814,53 @@
   };
   by-spec."send"."0.2.0" =
     self.by-version."send"."0.2.0";
+  by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz";
+        name = "send-0.2.0.tgz";
+        sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send" or []);
+    deps = [
+      self.by-version."debug"."1.0.1"
+      self.by-version."mime"."1.2.11"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."range-parser"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  by-spec."send"."0.3.0" =
+    self.by-version."send"."0.3.0";
+  by-version."send"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz";
+        name = "send-0.3.0.tgz";
+        sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send" or []);
+    deps = [
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."debug"."0.8.0"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."mime"."1.2.11"
+      self.by-version."range-parser"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "send" ];
+  };
+  by-spec."send"."0.4.1" =
+    self.by-version."send"."0.4.1";
   by-spec."sequence"."2.2.1" =
     self.by-version."sequence"."2.2.1";
   by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -16101,22 +17882,42 @@
   };
   by-spec."sequence"."2.x" =
     self.by-version."sequence"."2.2.1";
-  by-spec."serve-index"."1.0.1" =
-    self.by-version."serve-index"."1.0.1";
-  by-version."serve-index"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-index-1.0.1";
+  by-spec."serve-favicon"."2.0.1" =
+    self.by-version."serve-favicon"."2.0.1";
+  by-version."serve-favicon"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-favicon-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
-        name = "serve-index-1.0.1.tgz";
-        sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6";
+        url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.0.1.tgz";
+        name = "serve-favicon-2.0.1.tgz";
+        sha1 = "4826975d9f173ca3a4158e9698161f75dec7afec";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."serve-favicon" or []);
+    deps = [
+      self.by-version."fresh"."0.2.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "serve-favicon" ];
+  };
+  by-spec."serve-index"."1.1.0" =
+    self.by-version."serve-index"."1.1.0";
+  by-version."serve-index"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-index-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.1.0.tgz";
+        name = "serve-index-1.1.0.tgz";
+        sha1 = "4843b22d78eae51406adb8fa370c373b9499501d";
       })
     ];
     buildInputs =
       (self.nativeDeps."serve-index" or []);
     deps = [
+      self.by-version."accepts"."1.0.2"
       self.by-version."batch"."0.5.0"
-      self.by-version."negotiator"."0.4.2"
     ];
     peerDependencies = [
     ];
@@ -16142,58 +17943,60 @@
     ];
     passthru.names = [ "serve-static" ];
   };
-  by-spec."serve-static"."1.0.2" =
-    self.by-version."serve-static"."1.0.2";
-  by-version."serve-static"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-static-1.0.2";
+  by-spec."serve-static"."1.1.0" =
+    self.by-version."serve-static"."1.1.0";
+  by-version."serve-static"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.2.tgz";
-        name = "serve-static-1.0.2.tgz";
-        sha1 = "4129f6727b09fb031134fa6d185683e30bfbef54";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."serve-static" or []);
-    deps = [
-      self.by-version."send"."0.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "serve-static" ];
-  };
-  by-spec."serve-static"."1.0.4" =
-    self.by-version."serve-static"."1.0.4";
-  by-version."serve-static"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-static-1.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.4.tgz";
-        name = "serve-static-1.0.4.tgz";
-        sha1 = "426fedebe77bad21f373f1efcae09746639fba06";
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz";
+        name = "serve-static-1.1.0.tgz";
+        sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643";
       })
     ];
     buildInputs =
       (self.nativeDeps."serve-static" or []);
     deps = [
       self.by-version."parseurl"."1.0.1"
-      self.by-version."send"."0.2.0"
+      self.by-version."send"."0.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "serve-static" ];
   };
-  by-spec."serve-static"."~1.0.3" =
-    self.by-version."serve-static"."1.0.4";
-  by-spec."setimmediate"."1.0.1" =
-    self.by-version."setimmediate"."1.0.1";
-  by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-setimmediate-1.0.1";
+  by-spec."serve-static"."1.2.1" =
+    self.by-version."serve-static"."1.2.1";
+  by-version."serve-static"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
-        name = "setimmediate-1.0.1.tgz";
-        sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.2.1.tgz";
+        name = "serve-static-1.2.1.tgz";
+        sha1 = "a800a9de23dbd1ffb1258edb986128ee4a4ea03d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."serve-static" or []);
+    deps = [
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."send"."0.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "serve-static" ];
+  };
+  by-spec."serve-static"."~1.1.0" =
+    self.by-version."serve-static"."1.1.0";
+  by-spec."setimmediate"."~1.0.1" =
+    self.by-version."setimmediate"."1.0.2";
+  by-version."setimmediate"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-setimmediate-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz";
+        name = "setimmediate-1.0.2.tgz";
+        sha1 = "d8221c4fdfeb2561556c5184fa05fb7ce0af73bd";
       })
     ];
     buildInputs =
@@ -16205,20 +18008,20 @@
     passthru.names = [ "setimmediate" ];
   };
   by-spec."sha"."~1.2.1" =
-    self.by-version."sha"."1.2.3";
-  by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sha-1.2.3";
+    self.by-version."sha"."1.2.4";
+  by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sha-1.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz";
-        name = "sha-1.2.3.tgz";
-        sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329";
+        url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz";
+        name = "sha-1.2.4.tgz";
+        sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d";
       })
     ];
     buildInputs =
       (self.nativeDeps."sha" or []);
     deps = [
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."graceful-fs"."3.0.1"
       self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
@@ -16287,6 +18090,30 @@
     passthru.names = [ "shell-quote" ];
   };
   by-spec."shelljs"."*" =
+    self.by-version."shelljs"."0.3.0";
+  by-version."shelljs"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "shelljs-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
+        name = "shelljs-0.3.0.tgz";
+        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shelljs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shelljs" ];
+  };
+  "shelljs" = self.by-version."shelljs"."0.3.0";
+  by-spec."shelljs"."0.3.x" =
+    self.by-version."shelljs"."0.3.0";
+  by-spec."shelljs"."^0.3.0" =
+    self.by-version."shelljs"."0.3.0";
+  by-spec."shelljs"."~0.2.6" =
     self.by-version."shelljs"."0.2.6";
   by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage {
     name = "shelljs-0.2.6";
@@ -16305,37 +18132,15 @@
     ];
     passthru.names = [ "shelljs" ];
   };
-  "shelljs" = self.by-version."shelljs"."0.2.6";
-  by-spec."shelljs"."0.1.x" =
-    self.by-version."shelljs"."0.1.4";
-  by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "shelljs-0.1.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz";
-        name = "shelljs-0.1.4.tgz";
-        sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shelljs" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "shelljs" ];
-  };
-  by-spec."shelljs"."~0.2.6" =
-    self.by-version."shelljs"."0.2.6";
   by-spec."should"."*" =
-    self.by-version."should"."3.3.1";
-  by-version."should"."3.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-should-3.3.1";
+    self.by-version."should"."4.0.3";
+  by-version."should"."4.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-should-4.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-3.3.1.tgz";
-        name = "should-3.3.1.tgz";
-        sha1 = "28c93a522ba001146af96078f0a88bf5ac929522";
+        url = "http://registry.npmjs.org/should/-/should-4.0.3.tgz";
+        name = "should-4.0.3.tgz";
+        sha1 = "2711897494e7b0eb429aad16cc88c9594f9c230e";
       })
     ];
     buildInputs =
@@ -16346,7 +18151,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.3.1";
+  "should" = self.by-version."should"."4.0.3";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16409,20 +18214,20 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.25";
-  by-version."simplesmtp"."0.3.25" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.25";
+    self.by-version."simplesmtp"."0.3.32";
+  by-version."simplesmtp"."0.3.32" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.32";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.25.tgz";
-        name = "simplesmtp-0.3.25.tgz";
-        sha1 = "09b6ac292b7dae8053cfba11da09a0458eb8af39";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.32.tgz";
+        name = "simplesmtp-0.3.32.tgz";
+        sha1 = "b3589b4cbf90624e712ab0ec1a7480ec14fd1c12";
       })
     ];
     buildInputs =
       (self.nativeDeps."simplesmtp" or []);
     deps = [
-      self.by-version."rai"."0.1.9"
+      self.by-version."rai"."0.1.11"
       self.by-version."xoauth2"."0.1.8"
     ];
     peerDependencies = [
@@ -16430,14 +18235,14 @@
     passthru.names = [ "simplesmtp" ];
   };
   by-spec."sinon"."*" =
-    self.by-version."sinon"."1.9.1";
-  by-version."sinon"."1.9.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sinon-1.9.1";
+    self.by-version."sinon"."1.10.2";
+  by-version."sinon"."1.10.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sinon-1.10.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sinon/-/sinon-1.9.1.tgz";
-        name = "sinon-1.9.1.tgz";
-        sha1 = "0dac622bd3f0e6f9662a7431baf65f58c3459d69";
+        url = "http://registry.npmjs.org/sinon/-/sinon-1.10.2.tgz";
+        name = "sinon-1.10.2.tgz";
+        sha1 = "a33a1b902ee080da2bdca19781993a03c78bb5cc";
       })
     ];
     buildInputs =
@@ -16450,7 +18255,7 @@
     ];
     passthru.names = [ "sinon" ];
   };
-  "sinon" = self.by-version."sinon"."1.9.1";
+  "sinon" = self.by-version."sinon"."1.10.2";
   by-spec."slasp"."*" =
     self.by-version."slasp"."0.0.3";
   by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -16666,14 +18471,14 @@
     passthru.names = [ "socket.io" ];
   };
   by-spec."socket.io"."~0.9.13" =
-    self.by-version."socket.io"."0.9.16";
-  by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage {
-    name = "node-socket.io-0.9.16";
+    self.by-version."socket.io"."0.9.17";
+  by-version."socket.io"."0.9.17" = lib.makeOverridable self.buildNodePackage {
+    name = "node-socket.io-0.9.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
-        name = "socket.io-0.9.16.tgz";
-        sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76";
+        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
+        name = "socket.io-0.9.17.tgz";
+        sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
       })
     ];
     buildInputs =
@@ -16689,7 +18494,7 @@
     passthru.names = [ "socket.io" ];
   };
   by-spec."socket.io"."~0.9.16" =
-    self.by-version."socket.io"."0.9.16";
+    self.by-version."socket.io"."0.9.17";
   by-spec."socket.io-client"."0.9.11" =
     self.by-version."socket.io-client"."0.9.11";
   by-version."socket.io-client"."0.9.11" = lib.makeOverridable self.buildNodePackage {
@@ -16737,27 +18542,27 @@
     passthru.names = [ "socket.io-client" ];
   };
   by-spec."sockjs"."*" =
-    self.by-version."sockjs"."0.3.8";
-  by-version."sockjs"."0.3.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sockjs-0.3.8";
+    self.by-version."sockjs"."0.3.9";
+  by-version."sockjs"."0.3.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sockjs-0.3.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz";
-        name = "sockjs-0.3.8.tgz";
-        sha1 = "c083cb0505db1ea1a949d3bd12d8a1ea385a456c";
+        url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.9.tgz";
+        name = "sockjs-0.3.9.tgz";
+        sha1 = "5ae2c732dac07f6d7e9e8a9a60ec86ec4fc3ffc7";
       })
     ];
     buildInputs =
       (self.nativeDeps."sockjs" or []);
     deps = [
       self.by-version."node-uuid"."1.3.3"
-      self.by-version."faye-websocket"."0.7.0"
+      self.by-version."faye-websocket"."0.7.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "sockjs" ];
   };
-  "sockjs" = self.by-version."sockjs"."0.3.8";
+  "sockjs" = self.by-version."sockjs"."0.3.9";
   by-spec."sorted-object"."~1.0.0" =
     self.by-version."sorted-object"."1.0.0";
   by-version."sorted-object"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16952,14 +18757,14 @@
     passthru.names = [ "stack-trace" ];
   };
   by-spec."stackdriver-statsd-backend"."*" =
-    self.by-version."stackdriver-statsd-backend"."0.2.1";
-  by-version."stackdriver-statsd-backend"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stackdriver-statsd-backend-0.2.1";
+    self.by-version."stackdriver-statsd-backend"."0.2.2";
+  by-version."stackdriver-statsd-backend"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stackdriver-statsd-backend-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.1.tgz";
-        name = "stackdriver-statsd-backend-0.2.1.tgz";
-        sha1 = "3109661288821e79259b4d750a25d7159265dd8e";
+        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.2.tgz";
+        name = "stackdriver-statsd-backend-0.2.2.tgz";
+        sha1 = "15bdc95adf083cfbfa20d7ff8f67277d7eba38f8";
       })
     ];
     buildInputs =
@@ -16970,45 +18775,7 @@
     ];
     passthru.names = [ "stackdriver-statsd-backend" ];
   };
-  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.1";
-  by-spec."static-favicon"."1.0.0" =
-    self.by-version."static-favicon"."1.0.0";
-  by-version."static-favicon"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-static-favicon-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.0.tgz";
-        name = "static-favicon-1.0.0.tgz";
-        sha1 = "2e58dcfe58957a2d53337ef7a38cf9ad6c13c0d0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."static-favicon" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "static-favicon" ];
-  };
-  by-spec."static-favicon"."1.0.2" =
-    self.by-version."static-favicon"."1.0.2";
-  by-version."static-favicon"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-static-favicon-1.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
-        name = "static-favicon-1.0.2.tgz";
-        sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."static-favicon" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "static-favicon" ];
-  };
+  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.2";
   by-spec."statsd"."*" =
     self.by-version."statsd"."0.7.1";
   by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -17052,6 +18819,27 @@
     passthru.names = [ "statsd-librato-backend" ];
   };
   "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2";
+  by-spec."stream-browserify"."^1.0.0" =
+    self.by-version."stream-browserify"."1.0.0";
+  by-version."stream-browserify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stream-browserify-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
+        name = "stream-browserify-1.0.0.tgz";
+        sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stream-browserify" or []);
+    deps = [
+      self.by-version."inherits"."2.0.1"
+      self.by-version."readable-stream"."1.1.13-1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stream-browserify" ];
+  };
   by-spec."stream-browserify"."~0.1.0" =
     self.by-version."stream-browserify"."0.1.3";
   by-version."stream-browserify"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -17095,6 +18883,27 @@
   };
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
+  by-spec."stream-combiner"."~0.1.0" =
+    self.by-version."stream-combiner"."0.1.0";
+  by-version."stream-combiner"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stream-combiner-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.1.0.tgz";
+        name = "stream-combiner-0.1.0.tgz";
+        sha1 = "0dc389a3c203f8f4d56368f95dde52eb9269b5be";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."stream-combiner" or []);
+    deps = [
+      self.by-version."duplexer"."0.1.1"
+      self.by-version."through"."2.3.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "stream-combiner" ];
+  };
   by-spec."stream-counter"."~0.1.0" =
     self.by-version."stream-counter"."0.1.0";
   by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -17233,14 +19042,14 @@
     passthru.names = [ "stringify-object" ];
   };
   by-spec."stringify-object"."~0.2.0" =
-    self.by-version."stringify-object"."0.2.0";
-  by-version."stringify-object"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stringify-object-0.2.0";
+    self.by-version."stringify-object"."0.2.1";
+  by-version."stringify-object"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stringify-object-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.0.tgz";
-        name = "stringify-object-0.2.0.tgz";
-        sha1 = "832996ea55ab2aaa7570cc9bc0d5774adfc2c585";
+        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.1.tgz";
+        name = "stringify-object-0.2.1.tgz";
+        sha1 = "b58be50b3ff5f371038c545d4332656bfded5620";
       })
     ];
     buildInputs =
@@ -17271,14 +19080,14 @@
     passthru.names = [ "strip-ansi" ];
   };
   by-spec."strip-json-comments"."0.1.x" =
-    self.by-version."strip-json-comments"."0.1.1";
-  by-version."strip-json-comments"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "strip-json-comments-0.1.1";
+    self.by-version."strip-json-comments"."0.1.3";
+  by-version."strip-json-comments"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "strip-json-comments-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.1.tgz";
-        name = "strip-json-comments-0.1.1.tgz";
-        sha1 = "eb5a750bd4e8dc82817295a115dc11b63f01d4b0";
+        url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
+        name = "strip-json-comments-0.1.3.tgz";
+        sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54";
       })
     ];
     buildInputs =
@@ -17310,14 +19119,14 @@
     passthru.names = [ "strong-data-uri" ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.44.0-beta3";
-  by-version."stylus"."0.44.0-beta3" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.44.0-beta3";
+    self.by-version."stylus"."0.46.2";
+  by-version."stylus"."0.46.2" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.46.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.44.0-beta3.tgz";
-        name = "stylus-0.44.0-beta3.tgz";
-        sha1 = "a602b30f57f1692cf0f1fb664e60a14e26102cff";
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.46.2.tgz";
+        name = "stylus-0.46.2.tgz";
+        sha1 = "9e6723aac7b582a9de6a0d1eacef20967c02e70b";
       })
     ];
     buildInputs =
@@ -17325,16 +19134,15 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
       self.by-version."sax"."0.5.8"
-      self.by-version."glob"."3.2.9"
-      self.by-version."circular-json"."0.1.6"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.44.0-beta3";
+  "stylus" = self.by-version."stylus"."0.46.2";
   by-spec."stylus"."0.42.2" =
     self.by-version."stylus"."0.42.2";
   by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage {
@@ -17351,9 +19159,9 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.1"
       self.by-version."sax"."0.5.8"
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
@@ -17373,7 +19181,7 @@
     buildInputs =
       (self.nativeDeps."subarg" or []);
     deps = [
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.0.10"
     ];
     peerDependencies = [
     ];
@@ -17419,29 +19227,31 @@
     ];
     passthru.names = [ "sudo-block" ];
   };
-  by-spec."superagent"."0.17.0" =
-    self.by-version."superagent"."0.17.0";
-  by-version."superagent"."0.17.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-superagent-0.17.0";
+  by-spec."superagent"."0.18.0" =
+    self.by-version."superagent"."0.18.0";
+  by-version."superagent"."0.18.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-superagent-0.18.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz";
-        name = "superagent-0.17.0.tgz";
-        sha1 = "aadcd50fbe5a93e71991118d79bf0714d625bba8";
+        url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz";
+        name = "superagent-0.18.0.tgz";
+        sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62";
       })
     ];
     buildInputs =
       (self.nativeDeps."superagent" or []);
     deps = [
-      self.by-version."qs"."0.6.5"
+      self.by-version."qs"."0.6.6"
       self.by-version."formidable"."1.0.14"
       self.by-version."mime"."1.2.5"
-      self.by-version."emitter-component"."1.0.0"
+      self.by-version."component-emitter"."1.1.2"
       self.by-version."methods"."0.0.1"
-      self.by-version."cookiejar"."1.3.0"
+      self.by-version."cookiejar"."1.3.2"
       self.by-version."debug"."0.7.4"
       self.by-version."reduce-component"."1.0.1"
       self.by-version."extend"."1.2.1"
+      self.by-version."form-data"."0.1.2"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -17472,30 +19282,30 @@
     ];
     passthru.names = [ "superagent" ];
   };
-  by-spec."superagent"."~0.17.0" =
-    self.by-version."superagent"."0.17.0";
+  by-spec."superagent"."~0.18.0" =
+    self.by-version."superagent"."0.18.0";
   by-spec."supertest"."*" =
-    self.by-version."supertest"."0.11.0";
-  by-version."supertest"."0.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-supertest-0.11.0";
+    self.by-version."supertest"."0.13.0";
+  by-version."supertest"."0.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-supertest-0.13.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/supertest/-/supertest-0.11.0.tgz";
-        name = "supertest-0.11.0.tgz";
-        sha1 = "f8496b9f05cac1ea2fcec1d21adeca7167f42460";
+        url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz";
+        name = "supertest-0.13.0.tgz";
+        sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f";
       })
     ];
     buildInputs =
       (self.nativeDeps."supertest" or []);
     deps = [
-      self.by-version."superagent"."0.17.0"
-      self.by-version."methods"."0.1.0"
+      self.by-version."superagent"."0.18.0"
+      self.by-version."methods"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "supertest" ];
   };
-  "supertest" = self.by-version."supertest"."0.11.0";
+  "supertest" = self.by-version."supertest"."0.13.0";
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
@@ -17633,27 +19443,49 @@
     self.by-version."tar"."0.1.19";
   by-spec."tar"."~0.1.19" =
     self.by-version."tar"."0.1.19";
-  by-spec."temp"."*" =
-    self.by-version."temp"."0.7.0";
-  by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-temp-0.7.0";
+  by-spec."tar-stream"."~0.3.0" =
+    self.by-version."tar-stream"."0.3.3";
+  by-version."tar-stream"."0.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tar-stream-0.3.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz";
-        name = "temp-0.7.0.tgz";
-        sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f";
+        url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.3.3.tgz";
+        name = "tar-stream-0.3.3.tgz";
+        sha1 = "23ca53bd738b8702272a80e26cc938bc4b84b87b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar-stream" or []);
+    deps = [
+      self.by-version."bl"."0.6.0"
+      self.by-version."end-of-stream"."0.1.4"
+      self.by-version."readable-stream"."1.0.27-1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tar-stream" ];
+  };
+  by-spec."temp"."*" =
+    self.by-version."temp"."0.8.0";
+  by-version."temp"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-temp-0.8.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.8.0.tgz";
+        name = "temp-0.8.0.tgz";
+        sha1 = "3a642f54ab725c8fb6125a284b119480314b3e32";
       })
     ];
     buildInputs =
       (self.nativeDeps."temp" or []);
     deps = [
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "temp" ];
   };
-  "temp" = self.by-version."temp"."0.7.0";
+  "temp" = self.by-version."temp"."0.8.0";
   by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
   by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -17699,6 +19531,24 @@
     self.by-version."temp"."0.6.0";
   by-spec."temp"."~0.7.0" =
     self.by-version."temp"."0.7.0";
+  by-version."temp"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-temp-0.7.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.7.0.tgz";
+        name = "temp-0.7.0.tgz";
+        sha1 = "d34bdc8e7f955da2a6a473fea07ad601d68ba78f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."temp" or []);
+    deps = [
+      self.by-version."rimraf"."2.2.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "temp" ];
+  };
   by-spec."tempfile"."^0.1.2" =
     self.by-version."tempfile"."0.1.3";
   by-version."tempfile"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -17719,7 +19569,7 @@
     ];
     passthru.names = [ "tempfile" ];
   };
-  by-spec."text-table"."~0.2.0" =
+  by-spec."text-table"."^0.2.0" =
     self.by-version."text-table"."0.2.0";
   by-version."text-table"."0.2.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-text-table-0.2.0";
@@ -17738,6 +19588,8 @@
     ];
     passthru.names = [ "text-table" ];
   };
+  by-spec."text-table"."~0.2.0" =
+    self.by-version."text-table"."0.2.0";
   by-spec."throttleit"."~0.0.2" =
     self.by-version."throttleit"."0.0.2";
   by-version."throttleit"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -17798,14 +19650,14 @@
   by-spec."through"."~2.3.4" =
     self.by-version."through"."2.3.4";
   by-spec."through2"."^0.4.0" =
-    self.by-version."through2"."0.4.1";
-  by-version."through2"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-through2-0.4.1";
+    self.by-version."through2"."0.4.2";
+  by-version."through2"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through2-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.4.1.tgz";
-        name = "through2-0.4.1.tgz";
-        sha1 = "afd849c65af513c2541a98a7cfbcfec3a15a9686";
+        url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz";
+        name = "through2-0.4.2.tgz";
+        sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b";
       })
     ];
     buildInputs =
@@ -17819,7 +19671,7 @@
     passthru.names = [ "through2" ];
   };
   by-spec."through2"."~0.4.1" =
-    self.by-version."through2"."0.4.1";
+    self.by-version."through2"."0.4.2";
   by-spec."timers-browserify"."~1.0.1" =
     self.by-version."timers-browserify"."1.0.1";
   by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -17840,6 +19692,27 @@
     ];
     passthru.names = [ "timers-browserify" ];
   };
+  by-spec."timers-ext"."0.1.x" =
+    self.by-version."timers-ext"."0.1.0";
+  by-version."timers-ext"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timers-ext-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz";
+        name = "timers-ext-0.1.0.tgz";
+        sha1 = "00345a2ca93089d1251322054389d263e27b77e2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."timers-ext" or []);
+    deps = [
+      self.by-version."es5-ext"."0.10.4"
+      self.by-version."next-tick"."0.2.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "timers-ext" ];
+  };
   by-spec."timespan"."~2.3.0" =
     self.by-version."timespan"."2.3.0";
   by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -17860,14 +19733,14 @@
     passthru.names = [ "timespan" ];
   };
   by-spec."timezone"."*" =
-    self.by-version."timezone"."0.0.30";
-  by-version."timezone"."0.0.30" = lib.makeOverridable self.buildNodePackage {
-    name = "node-timezone-0.0.30";
+    self.by-version."timezone"."0.0.32";
+  by-version."timezone"."0.0.32" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timezone-0.0.32";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.30.tgz";
-        name = "timezone-0.0.30.tgz";
-        sha1 = "f83e46d35c017a33a684a4d8bb8fac3debed49bf";
+        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.32.tgz";
+        name = "timezone-0.0.32.tgz";
+        sha1 = "3d5972876fffe0dbef77ab4f9a60ab242c8b0f18";
       })
     ];
     buildInputs =
@@ -17878,7 +19751,7 @@
     ];
     passthru.names = [ "timezone" ];
   };
-  "timezone" = self.by-version."timezone"."0.0.30";
+  "timezone" = self.by-version."timezone"."0.0.32";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -18053,6 +19926,25 @@
     ];
     passthru.names = [ "traverse" ];
   };
+  by-spec."traverse"."~0.6.6" =
+    self.by-version."traverse"."0.6.6";
+  by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-traverse-0.6.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+        name = "traverse-0.6.6.tgz";
+        sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."traverse" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "traverse" ];
+  };
   by-spec."truncate"."~1.0.2" =
     self.by-version."truncate"."1.0.2";
   by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -18129,6 +20021,25 @@
     ];
     passthru.names = [ "tunnel-agent" ];
   };
+  by-spec."tunnel-agent"."~0.4.0" =
+    self.by-version."tunnel-agent"."0.4.0";
+  by-version."tunnel-agent"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tunnel-agent-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+        name = "tunnel-agent-0.4.0.tgz";
+        sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tunnel-agent" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "tunnel-agent" ];
+  };
   by-spec."type-detect"."0.1.1" =
     self.by-version."type-detect"."0.1.1";
   by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -18168,7 +20079,7 @@
     ];
     passthru.names = [ "type-is" ];
   };
-  by-spec."type-is"."~1.1.0" =
+  by-spec."type-is"."1.1.0" =
     self.by-version."type-is"."1.1.0";
   by-version."type-is"."1.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-type-is-1.1.0";
@@ -18188,6 +20099,26 @@
     ];
     passthru.names = [ "type-is" ];
   };
+  by-spec."type-is"."1.2.0" =
+    self.by-version."type-is"."1.2.0";
+  by-version."type-is"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.2.0.tgz";
+        name = "type-is-1.2.0.tgz";
+        sha1 = "a9aaa3f2014850d4813663f6c714cf6318195138";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."type-is" or []);
+    deps = [
+      self.by-version."mime"."1.2.11"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "type-is" ];
+  };
   by-spec."typechecker"."~2.0.1" =
     self.by-version."typechecker"."2.0.8";
   by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -18208,14 +20139,14 @@
     passthru.names = [ "typechecker" ];
   };
   by-spec."typedarray"."~0.0.5" =
-    self.by-version."typedarray"."0.0.5";
-  by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-typedarray-0.0.5";
+    self.by-version."typedarray"."0.0.6";
+  by-version."typedarray"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-typedarray-0.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz";
-        name = "typedarray-0.0.5.tgz";
-        sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664";
+        url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        name = "typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       })
     ];
     buildInputs =
@@ -18447,6 +20378,29 @@
     ];
     passthru.names = [ "umd" ];
   };
+  by-spec."umd"."~2.1.0" =
+    self.by-version."umd"."2.1.0";
+  by-version."umd"."2.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "umd-2.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
+        name = "umd-2.1.0.tgz";
+        sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."umd" or []);
+    deps = [
+      self.by-version."rfile"."1.0.0"
+      self.by-version."ruglify"."1.0.0"
+      self.by-version."through"."2.3.4"
+      self.by-version."uglify-js"."2.4.13"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "umd" ];
+  };
   by-spec."underscore"."*" =
     self.by-version."underscore"."1.6.0";
   by-version."underscore"."1.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -18467,7 +20421,17 @@
     passthru.names = [ "underscore" ];
   };
   "underscore" = self.by-version."underscore"."1.6.0";
-  by-spec."underscore"."1.4.x" =
+  by-spec."underscore"."1.6.x" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore".">=1.1.7" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore".">=1.3.1" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore".">=1.5.0" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore"."^1.6.0" =
+    self.by-version."underscore"."1.6.0";
+  by-spec."underscore"."~1.4" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-underscore-1.4.4";
@@ -18486,14 +20450,6 @@
     ];
     passthru.names = [ "underscore" ];
   };
-  by-spec."underscore".">=1.1.7" =
-    self.by-version."underscore"."1.6.0";
-  by-spec."underscore".">=1.3.1" =
-    self.by-version."underscore"."1.6.0";
-  by-spec."underscore".">=1.5.0" =
-    self.by-version."underscore"."1.6.0";
-  by-spec."underscore"."~1.4" =
-    self.by-version."underscore"."1.4.4";
   by-spec."underscore"."~1.4.3" =
     self.by-version."underscore"."1.4.4";
   by-spec."underscore"."~1.4.4" =
@@ -18519,6 +20475,27 @@
   };
   by-spec."underscore"."~1.5.2" =
     self.by-version."underscore"."1.5.2";
+  by-spec."underscore.string"."^2.3.1" =
+    self.by-version."underscore.string"."2.3.3";
+  by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-underscore.string-2.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
+        name = "underscore.string-2.3.3.tgz";
+        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."underscore.string" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "underscore.string" ];
+  };
+  by-spec."underscore.string"."^2.3.3" =
+    self.by-version."underscore.string"."2.3.3";
   by-spec."underscore.string"."~2.2.1" =
     self.by-version."underscore.string"."2.2.1";
   by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -18540,23 +20517,6 @@
   };
   by-spec."underscore.string"."~2.3.1" =
     self.by-version."underscore.string"."2.3.3";
-  by-version."underscore.string"."2.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-underscore.string-2.3.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
-        name = "underscore.string-2.3.3.tgz";
-        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore.string" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore.string" ];
-  };
   by-spec."underscore.string"."~2.3.3" =
     self.by-version."underscore.string"."2.3.3";
   by-spec."unfunk-diff"."~0.0.1" =
@@ -18575,92 +20535,94 @@
     deps = [
       self.by-version."diff"."1.0.8"
       self.by-version."jsesc"."0.4.3"
-      self.by-version."ministyle"."0.1.3"
+      self.by-version."ministyle"."0.1.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.8.0";
-  by-version."ungit"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.8.0";
+    self.by-version."ungit"."0.8.1";
+  by-version."ungit"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.8.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.8.0.tgz";
-        name = "ungit-0.8.0.tgz";
-        sha1 = "ca1f166ee65fbfe54469459d51f77ca502f1c6a4";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.8.1.tgz";
+        name = "ungit-0.8.1.tgz";
+        sha1 = "41b07535b2239f8a31adfcce45bd59a20b575b2f";
       })
     ];
     buildInputs =
       (self.nativeDeps."ungit" or []);
     deps = [
-      self.by-version."express"."4.0.0"
-      self.by-version."superagent"."0.17.0"
+      self.by-version."express"."4.2.0"
+      self.by-version."superagent"."0.18.0"
       self.by-version."lodash"."2.4.1"
       self.by-version."temp"."0.7.0"
-      self.by-version."socket.io"."0.9.16"
-      self.by-version."moment"."2.5.1"
-      self.by-version."async"."0.6.2"
+      self.by-version."socket.io"."0.9.17"
+      self.by-version."moment"."2.6.0"
+      self.by-version."async"."0.9.0"
       self.by-version."rc"."0.3.5"
       self.by-version."uuid"."1.4.1"
       self.by-version."winston"."0.7.3"
       self.by-version."passport"."0.2.0"
       self.by-version."passport-local"."1.0.0"
-      self.by-version."semver"."2.2.1"
+      self.by-version."semver"."2.3.0"
       self.by-version."forever-monitor"."1.1.0"
-      self.by-version."open"."0.0.4"
+      self.by-version."open"."0.0.5"
       self.by-version."optimist"."0.6.1"
       self.by-version."crossroads"."0.12.0"
       self.by-version."signals"."1.0.0"
       self.by-version."hasher"."1.2.0"
       self.by-version."blueimp-md5"."1.1.0"
-      self.by-version."color"."0.5.0"
-      self.by-version."keen.io"."0.0.4"
+      self.by-version."color"."0.6.0"
+      self.by-version."keen.io"."0.1.2"
       self.by-version."getmac"."1.0.6"
-      self.by-version."deep-extend"."0.2.8"
+      self.by-version."deep-extend"."0.2.10"
       self.by-version."raven"."0.6.3"
       self.by-version."knockout"."3.1.0"
-      self.by-version."npm-registry-client"."0.4.7"
-      self.by-version."npmconf"."0.1.14"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."less"."1.7.0"
+      self.by-version."npm-registry-client"."1.0.1"
+      self.by-version."npmconf"."1.0.2"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."less"."1.7.1"
       self.by-version."browserify"."3.38.1"
-      self.by-version."body-parser"."1.0.2"
-      self.by-version."cookie-parser"."1.0.1"
-      self.by-version."express-session"."1.0.3"
-      self.by-version."serve-static"."1.0.4"
+      self.by-version."body-parser"."1.2.2"
+      self.by-version."cookie-parser"."1.1.0"
+      self.by-version."express-session"."1.1.0"
+      self.by-version."serve-static"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.8.0";
+  "ungit" = self.by-version."ungit"."0.8.1";
   by-spec."update-notifier"."~0.1.3" =
-    self.by-version."update-notifier"."0.1.8";
-  by-version."update-notifier"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-update-notifier-0.1.8";
+    self.by-version."update-notifier"."0.1.10";
+  by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage {
+    name = "node-update-notifier-0.1.10";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.8.tgz";
-        name = "update-notifier-0.1.8.tgz";
-        sha1 = "ebf5c698375f5c232031a419634fab66cc0322a6";
+        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.10.tgz";
+        name = "update-notifier-0.1.10.tgz";
+        sha1 = "215cbe1053369f0d4a44f84b51eba7cb80484695";
       })
     ];
     buildInputs =
       (self.nativeDeps."update-notifier" or []);
     deps = [
-      self.by-version."request"."2.27.0"
-      self.by-version."configstore"."0.2.3"
-      self.by-version."semver"."2.1.0"
       self.by-version."chalk"."0.4.0"
+      self.by-version."configstore"."0.3.0"
+      self.by-version."request"."2.36.0"
+      self.by-version."semver"."2.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "update-notifier" ];
   };
   by-spec."update-notifier"."~0.1.7" =
-    self.by-version."update-notifier"."0.1.8";
+    self.by-version."update-notifier"."0.1.10";
+  by-spec."update-notifier"."~0.1.8" =
+    self.by-version."update-notifier"."0.1.10";
   by-spec."url"."~0.10.1" =
     self.by-version."url"."0.10.1";
   by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage {
@@ -18839,7 +20801,7 @@
       self.by-version."async"."0.1.22"
       self.by-version."deep-equal"."0.2.1"
       self.by-version."i"."0.3.2"
-      self.by-version."mkdirp"."0.3.5"
+      self.by-version."mkdirp"."0.5.0"
       self.by-version."ncp"."0.2.7"
       self.by-version."rimraf"."1.0.9"
     ];
@@ -18864,9 +20826,9 @@
       self.by-version."async"."0.2.10"
       self.by-version."deep-equal"."0.2.1"
       self.by-version."i"."0.3.2"
-      self.by-version."mkdirp"."0.3.5"
+      self.by-version."mkdirp"."0.5.0"
       self.by-version."ncp"."0.4.2"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
@@ -18874,8 +20836,6 @@
   };
   by-spec."utile"."0.2.x" =
     self.by-version."utile"."0.2.1";
-  by-spec."utile"."~0.1.7" =
-    self.by-version."utile"."0.1.7";
   by-spec."utile"."~0.2.1" =
     self.by-version."utile"."0.2.1";
   by-spec."utils-merge"."1.0.0" =
@@ -18958,6 +20918,25 @@
     ];
     passthru.names = [ "vargs" ];
   };
+  by-spec."vary"."0.1.0" =
+    self.by-version."vary"."0.1.0";
+  by-version."vary"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vary-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
+        name = "vary-0.1.0.tgz";
+        sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vary" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vary" ];
+  };
   by-spec."vasync"."1.3.3" =
     self.by-version."vasync"."1.3.3";
   by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
@@ -19119,27 +21098,52 @@
     ];
     passthru.names = [ "vows" ];
   };
-  by-spec."walk"."*" =
-    self.by-version."walk"."2.3.1";
-  by-version."walk"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-walk-2.3.1";
+  by-spec."vtop"."*" =
+    self.by-version."vtop"."0.1.6";
+  by-version."vtop"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "vtop-0.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/walk/-/walk-2.3.1.tgz";
-        name = "walk-2.3.1.tgz";
-        sha1 = "015e0ef7a636ac43185661a9673d459572a44050";
+        url = "http://registry.npmjs.org/vtop/-/vtop-0.1.6.tgz";
+        name = "vtop-0.1.6.tgz";
+        sha1 = "eda5437e0e724e39055ec66b8884a5345f727492";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vtop" or []);
+    deps = [
+      self.by-version."drawille"."0.0.3"
+      self.by-version."os-utils"."0.0.14"
+      self.by-version."read"."1.0.5"
+      self.by-version."blessed"."0.0.33"
+      self.by-version."commander"."2.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vtop" ];
+  };
+  "vtop" = self.by-version."vtop"."0.1.6";
+  by-spec."walk"."*" =
+    self.by-version."walk"."2.3.3";
+  by-version."walk"."2.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-walk-2.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/walk/-/walk-2.3.3.tgz";
+        name = "walk-2.3.3.tgz";
+        sha1 = "b4c0e8c42464c16dbbe1d71666765eac07819e5f";
       })
     ];
     buildInputs =
       (self.nativeDeps."walk" or []);
     deps = [
-      self.by-version."forEachAsync"."2.2.1"
+      self.by-version."foreachasync"."3.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "walk" ];
   };
-  "walk" = self.by-version."walk"."2.3.1";
+  "walk" = self.by-version."walk"."2.3.3";
   by-spec."walk"."~2.2.1" =
     self.by-version."walk"."2.2.1";
   by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -19199,40 +21203,40 @@
     passthru.names = [ "watch" ];
   };
   by-spec."wd"."~0.2.12" =
-    self.by-version."wd"."0.2.19";
-  by-version."wd"."0.2.19" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.19";
+    self.by-version."wd"."0.2.27";
+  by-version."wd"."0.2.27" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.2.27";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.19.tgz";
-        name = "wd-0.2.19.tgz";
-        sha1 = "347ae75adebc15ad642baec118742344d749f169";
+        url = "http://registry.npmjs.org/wd/-/wd-0.2.27.tgz";
+        name = "wd-0.2.27.tgz";
+        sha1 = "db25a671e14d76e4886a0c5014606acde065f4cf";
       })
     ];
     buildInputs =
       (self.nativeDeps."wd" or []);
     deps = [
-      self.by-version."async"."0.2.10"
-      self.by-version."vargs"."0.1.0"
-      self.by-version."q"."1.0.1"
-      self.by-version."request"."2.33.0"
-      self.by-version."archiver"."0.5.2"
+      self.by-version."archiver"."0.10.0"
+      self.by-version."async"."0.9.0"
       self.by-version."lodash"."2.4.1"
+      self.by-version."q"."1.0.1"
+      self.by-version."request"."2.36.0"
       self.by-version."underscore.string"."2.3.3"
+      self.by-version."vargs"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "wd" ];
   };
   by-spec."weak-map"."^1.0.4" =
-    self.by-version."weak-map"."1.0.4";
-  by-version."weak-map"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-weak-map-1.0.4";
+    self.by-version."weak-map"."1.0.5";
+  by-version."weak-map"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-weak-map-1.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.4.tgz";
-        name = "weak-map-1.0.4.tgz";
-        sha1 = "1acddee2cc90eb30950860b7415c79cefc5f07c9";
+        url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
+        name = "weak-map-1.0.5.tgz";
+        sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
       })
     ];
     buildInputs =
@@ -19244,14 +21248,14 @@
     passthru.names = [ "weak-map" ];
   };
   by-spec."webdrvr"."*" =
-    self.by-version."webdrvr"."2.40.0";
-  by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage {
-    name = "webdrvr-2.40.0";
+    self.by-version."webdrvr"."2.41.0-0";
+  by-version."webdrvr"."2.41.0-0" = lib.makeOverridable self.buildNodePackage {
+    name = "webdrvr-2.41.0-0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz";
-        name = "webdrvr-2.40.0.tgz";
-        sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42";
+        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.41.0-0.tgz";
+        name = "webdrvr-2.41.0-0.tgz";
+        sha1 = "c74f22b27f0778d0c2b7e5cbda1edd113d782884";
       })
     ];
     buildInputs =
@@ -19260,8 +21264,8 @@
       self.by-version."adm-zip"."0.4.4"
       self.by-version."kew"."0.1.7"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."npmconf"."0.1.14"
-      self.by-version."phantomjs"."1.9.7-4"
+      self.by-version."npmconf"."0.1.16"
+      self.by-version."phantomjs"."1.9.7-8"
       self.by-version."tmp"."0.0.23"
       self.by-version."follow-redirects"."0.0.3"
     ];
@@ -19269,16 +21273,16 @@
     ];
     passthru.names = [ "webdrvr" ];
   };
-  "webdrvr" = self.by-version."webdrvr"."2.40.0";
-  by-spec."websocket-driver".">=0.3.0" =
-    self.by-version."websocket-driver"."0.3.2";
-  by-version."websocket-driver"."0.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-websocket-driver-0.3.2";
+  "webdrvr" = self.by-version."webdrvr"."2.41.0-0";
+  by-spec."websocket-driver".">=0.3.1" =
+    self.by-version."websocket-driver"."0.3.4";
+  by-version."websocket-driver"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-websocket-driver-0.3.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.2.tgz";
-        name = "websocket-driver-0.3.2.tgz";
-        sha1 = "f177ef6611390e2401ae47f35e8386dda987daca";
+        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.4.tgz";
+        name = "websocket-driver-0.3.4.tgz";
+        sha1 = "f37ab303f6a602c4b0dbcaa1cdd771e442b04ea7";
       })
     ];
     buildInputs =
@@ -19289,8 +21293,6 @@
     ];
     passthru.names = [ "websocket-driver" ];
   };
-  by-spec."websocket-driver".">=0.3.1" =
-    self.by-version."websocket-driver"."0.3.2";
   by-spec."when"."~3.1.0" =
     self.by-version."when"."3.1.0";
   by-version."when"."3.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -19439,23 +21441,26 @@
     self.by-version."winston"."0.7.3";
   by-spec."winston"."~0.7.3" =
     self.by-version."winston"."0.7.3";
-  by-spec."wiredep"."~1.0.0" =
-    self.by-version."wiredep"."1.0.0";
-  by-version."wiredep"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wiredep-1.0.0";
+  by-spec."wiredep"."^1.0.0" =
+    self.by-version."wiredep"."1.7.3";
+  by-version."wiredep"."1.7.3" = lib.makeOverridable self.buildNodePackage {
+    name = "wiredep-1.7.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wiredep/-/wiredep-1.0.0.tgz";
-        name = "wiredep-1.0.0.tgz";
-        sha1 = "2e570465657b97e7494abf62978a3e52fc37ac52";
+        url = "http://registry.npmjs.org/wiredep/-/wiredep-1.7.3.tgz";
+        name = "wiredep-1.7.3.tgz";
+        sha1 = "854c1482fa5c57fe2033ba655b49aa613f60fe3f";
       })
     ];
     buildInputs =
       (self.nativeDeps."wiredep" or []);
     deps = [
-      self.by-version."lodash"."1.3.1"
+      self.by-version."bower-config"."0.5.1"
       self.by-version."chalk"."0.1.1"
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
+      self.by-version."lodash"."1.3.1"
+      self.by-version."minimist"."0.1.0"
+      self.by-version."through2"."0.4.2"
     ];
     peerDependencies = [
     ];
@@ -19521,6 +21526,25 @@
     ];
     passthru.names = [ "with" ];
   };
+  by-spec."word-wrap"."^0.1.2" =
+    self.by-version."word-wrap"."0.1.3";
+  by-version."word-wrap"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-word-wrap-0.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/word-wrap/-/word-wrap-0.1.3.tgz";
+        name = "word-wrap-0.1.3.tgz";
+        sha1 = "745523aa741b12bf23144d293795c6197b33eb1e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."word-wrap" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "word-wrap" ];
+  };
   by-spec."wordwrap"."0.0.x" =
     self.by-version."wordwrap"."0.0.2";
   by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -19584,25 +21608,6 @@
   };
   by-spec."wrench"."~1.5.4" =
     self.by-version."wrench"."1.5.8";
-  by-spec."wru".">= 0.0.0" =
-    self.by-version."wru"."0.2.7";
-  by-version."wru"."0.2.7" = lib.makeOverridable self.buildNodePackage {
-    name = "wru-0.2.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wru/-/wru-0.2.7.tgz";
-        name = "wru-0.2.7.tgz";
-        sha1 = "f6fa4fc7d54f44bec19d55c66c4667078d73062d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wru" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "wru" ];
-  };
   by-spec."ws"."0.4.x" =
     self.by-version."ws"."0.4.31";
   by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage {
@@ -19709,20 +21714,20 @@
     passthru.names = [ "xml2js" ];
   };
   by-spec."xml2js".">= 0.0.1" =
-    self.by-version."xml2js"."0.4.2";
-  by-version."xml2js"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xml2js-0.4.2";
+    self.by-version."xml2js"."0.4.4";
+  by-version."xml2js"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xml2js-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.2.tgz";
-        name = "xml2js-0.4.2.tgz";
-        sha1 = "93911c393c4a332a2dce1222801eb571453b2f90";
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
+        name = "xml2js-0.4.4.tgz";
+        sha1 = "3111010003008ae19240eba17497b57c729c555d";
       })
     ];
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.5.8"
+      self.by-version."sax"."0.6.0"
       self.by-version."xmlbuilder"."2.2.1"
     ];
     peerDependencies = [
@@ -19730,7 +21735,7 @@
     passthru.names = [ "xml2js" ];
   };
   by-spec."xml2js".">=0.1.7" =
-    self.by-version."xml2js"."0.4.2";
+    self.by-version."xml2js"."0.4.4";
   by-spec."xmlbuilder"."0.4.2" =
     self.by-version."xmlbuilder"."0.4.2";
   by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -19750,7 +21755,7 @@
     ];
     passthru.names = [ "xmlbuilder" ];
   };
-  by-spec."xmlbuilder".">=0.4.2" =
+  by-spec."xmlbuilder".">=1.0.0" =
     self.by-version."xmlbuilder"."2.2.1";
   by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-xmlbuilder-2.2.1";
@@ -19808,7 +21813,7 @@
     ];
     passthru.names = [ "xmlhttprequest" ];
   };
-  by-spec."xoauth2"."~0.1" =
+  by-spec."xoauth2"."~0.1.8" =
     self.by-version."xoauth2"."0.1.8";
   by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage {
     name = "node-xoauth2-0.1.8";
@@ -19827,6 +21832,25 @@
     ];
     passthru.names = [ "xoauth2" ];
   };
+  by-spec."xtend"."^3.0.0" =
+    self.by-version."xtend"."3.0.0";
+  by-version."xtend"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xtend-3.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
+        name = "xtend-3.0.0.tgz";
+        sha1 = "5cce7407baf642cba7becda568111c493f59665a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."xtend" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "xtend" ];
+  };
   by-spec."xtend"."~2.1.1" =
     self.by-version."xtend"."2.1.2";
   by-version."xtend"."2.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -19849,26 +21873,111 @@
   };
   by-spec."xtend"."~2.1.2" =
     self.by-version."xtend"."2.1.2";
-  by-spec."yargs"."~1.1.2" =
-    self.by-version."yargs"."1.1.3";
-  by-version."yargs"."1.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yargs-1.1.3";
+  by-spec."yargs"."~1.2.1" =
+    self.by-version."yargs"."1.2.2";
+  by-version."yargs"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-yargs-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yargs/-/yargs-1.1.3.tgz";
-        name = "yargs-1.1.3.tgz";
-        sha1 = "c44ed2bb9c86d55b557f2179fea7c7013fe4c42a";
+        url = "http://registry.npmjs.org/yargs/-/yargs-1.2.2.tgz";
+        name = "yargs-1.2.2.tgz";
+        sha1 = "36b364c8d72d1213b4f720d5cf716dfde4f0a113";
       })
     ];
     buildInputs =
       (self.nativeDeps."yargs" or []);
     deps = [
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.0.10"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "yargs" ];
   };
+  by-spec."yeoman-generator"."^0.16.0" =
+    self.by-version."yeoman-generator"."0.16.0";
+  by-version."yeoman-generator"."0.16.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-yeoman-generator-0.16.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz";
+        name = "yeoman-generator-0.16.0.tgz";
+        sha1 = "0d1b655ea31660ab66837af1e686b795eae57c59";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yeoman-generator" or []);
+    deps = [
+      self.by-version."cheerio"."0.13.1"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."diff"."1.0.8"
+      self.by-version."mime"."1.2.11"
+      self.by-version."underscore.string"."2.3.3"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."glob"."3.2.11"
+      self.by-version."debug"."0.7.4"
+      self.by-version."isbinaryfile"."2.0.1"
+      self.by-version."dargs"."0.1.0"
+      self.by-version."async"."0.2.10"
+      self.by-version."inquirer"."0.4.1"
+      self.by-version."iconv-lite"."0.2.11"
+      self.by-version."shelljs"."0.2.6"
+      self.by-version."findup-sync"."0.1.3"
+      self.by-version."chalk"."0.4.0"
+      self.by-version."text-table"."0.2.0"
+      self.by-version."download"."0.1.17"
+      self.by-version."request"."2.30.0"
+      self.by-version."file-utils"."0.1.5"
+      self.by-version."class-extend"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yeoman-generator" ];
+  };
+  by-spec."yeoman-generator"."^0.17.0" =
+    self.by-version."yeoman-generator"."0.17.0";
+  by-version."yeoman-generator"."0.17.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-yeoman-generator-0.17.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.17.0.tgz";
+        name = "yeoman-generator-0.17.0.tgz";
+        sha1 = "f005250770c01a60d1eb5b9a5b980af689b1517c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yeoman-generator" or []);
+    deps = [
+      self.by-version."async"."0.9.0"
+      self.by-version."chalk"."0.4.0"
+      self.by-version."cheerio"."0.16.0"
+      self.by-version."class-extend"."0.1.1"
+      self.by-version."dargs"."0.1.0"
+      self.by-version."debug"."0.8.1"
+      self.by-version."diff"."1.0.8"
+      self.by-version."download"."0.1.17"
+      self.by-version."file-utils"."0.2.0"
+      self.by-version."findup-sync"."0.1.3"
+      self.by-version."glob"."3.2.11"
+      self.by-version."grouped-queue"."0.2.1"
+      self.by-version."gruntfile-editor"."0.1.0"
+      self.by-version."iconv-lite"."0.2.11"
+      self.by-version."inquirer"."0.5.1"
+      self.by-version."isbinaryfile"."2.0.1"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."mime"."1.2.11"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."nopt"."2.2.1"
+      self.by-version."request"."2.36.0"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."shelljs"."0.3.0"
+      self.by-version."text-table"."0.2.0"
+      self.by-version."underscore.string"."2.3.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yeoman-generator" ];
+  };
   by-spec."yeoman-generator"."~0.14.0" =
     self.by-version."yeoman-generator"."0.14.2";
   by-version."yeoman-generator"."0.14.2" = lib.makeOverridable self.buildNodePackage {
@@ -19884,13 +21993,13 @@
       (self.nativeDeps."yeoman-generator" or []);
     deps = [
       self.by-version."cheerio"."0.12.4"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."rimraf"."2.2.8"
       self.by-version."diff"."1.0.8"
       self.by-version."mime"."1.2.11"
       self.by-version."underscore.string"."2.3.3"
       self.by-version."lodash"."2.2.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
       self.by-version."debug"."0.7.4"
       self.by-version."isbinaryfile"."0.1.9"
       self.by-version."dargs"."0.1.0"
@@ -19901,7 +22010,7 @@
       self.by-version."findup-sync"."0.1.3"
       self.by-version."chalk"."0.3.0"
       self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.16"
+      self.by-version."download"."0.1.17"
       self.by-version."request"."2.27.0"
       self.by-version."file-utils"."0.1.5"
     ];
@@ -19911,45 +22020,6 @@
   };
   by-spec."yeoman-generator"."~0.16.0" =
     self.by-version."yeoman-generator"."0.16.0";
-  by-version."yeoman-generator"."0.16.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yeoman-generator-0.16.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.16.0.tgz";
-        name = "yeoman-generator-0.16.0.tgz";
-        sha1 = "0d1b655ea31660ab66837af1e686b795eae57c59";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yeoman-generator" or []);
-    deps = [
-      self.by-version."cheerio"."0.13.1"
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."diff"."1.0.8"
-      self.by-version."mime"."1.2.11"
-      self.by-version."underscore.string"."2.3.3"
-      self.by-version."lodash"."2.4.1"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.9"
-      self.by-version."debug"."0.7.4"
-      self.by-version."isbinaryfile"."2.0.1"
-      self.by-version."dargs"."0.1.0"
-      self.by-version."async"."0.2.10"
-      self.by-version."inquirer"."0.4.1"
-      self.by-version."iconv-lite"."0.2.11"
-      self.by-version."shelljs"."0.2.6"
-      self.by-version."findup-sync"."0.1.3"
-      self.by-version."chalk"."0.4.0"
-      self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.16"
-      self.by-version."request"."2.30.0"
-      self.by-version."file-utils"."0.1.5"
-      self.by-version."class-extend"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "yeoman-generator" ];
-  };
   by-spec."yo"."*" =
     self.by-version."yo"."1.1.2";
   by-version."yo"."1.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -19967,7 +22037,7 @@
       self.by-version."yeoman-generator"."0.16.0"
       self.by-version."nopt"."2.1.2"
       self.by-version."lodash"."2.4.1"
-      self.by-version."update-notifier"."0.1.8"
+      self.by-version."update-notifier"."0.1.10"
       self.by-version."insight"."0.3.1"
       self.by-version."sudo-block"."0.3.0"
       self.by-version."async"."0.2.10"
@@ -19978,7 +22048,7 @@
     ];
     peerDependencies = [
       self.by-version."grunt-cli"."0.1.13"
-      self.by-version."bower"."1.3.2"
+      self.by-version."bower"."1.3.5"
     ];
     passthru.names = [ "yo" ];
   };
@@ -19987,6 +22057,29 @@
     self.by-version."yo"."1.1.2";
   by-spec."yo".">=1.0.0-rc.1.1" =
     self.by-version."yo"."1.1.2";
+  by-spec."yosay"."^0.2.0" =
+    self.by-version."yosay"."0.2.1";
+  by-version."yosay"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "yosay-0.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yosay/-/yosay-0.2.1.tgz";
+        name = "yosay-0.2.1.tgz";
+        sha1 = "01381b2165c8ef717610e073ecfa266dde195ae9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."yosay" or []);
+    deps = [
+      self.by-version."pad-component"."0.0.1"
+      self.by-version."word-wrap"."0.1.3"
+      self.by-version."chalk"."0.4.0"
+      self.by-version."minimist"."0.0.9"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "yosay" ];
+  };
   by-spec."zeparser"."0.0.5" =
     self.by-version."zeparser"."0.0.5";
   by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -20006,22 +22099,26 @@
     ];
     passthru.names = [ "zeparser" ];
   };
-  by-spec."zip-stream"."~0.1.0" =
-    self.by-version."zip-stream"."0.1.4";
-  by-version."zip-stream"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-zip-stream-0.1.4";
+  by-spec."zip-stream"."~0.3.0" =
+    self.by-version."zip-stream"."0.3.4";
+  by-version."zip-stream"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-zip-stream-0.3.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz";
-        name = "zip-stream-0.1.4.tgz";
-        sha1 = "fe5b565bc366b8d73d5d4c1606e07c8947de1654";
+        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.3.4.tgz";
+        name = "zip-stream-0.3.4.tgz";
+        sha1 = "1b7dc01591300032d69699fe66962bf52a0de91c";
       })
     ];
     buildInputs =
       (self.nativeDeps."zip-stream" or []);
     deps = [
+      self.by-version."crc32-stream"."0.2.0"
+      self.by-version."deflate-crc32-stream"."0.1.1"
       self.by-version."readable-stream"."1.0.27-1"
       self.by-version."lodash.defaults"."2.4.1"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 4d220a00829..a27dce11553 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -131,4 +131,5 @@
 , "sinon"
 , "shelljs"
 , "typescript"
+, "vtop"
 ]

From c86d89639a4bef809ab9eff4de87915c0b12ef06 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 9 Jun 2014 15:13:28 +0200
Subject: [PATCH 193/221] postfix-211: Update from 2.11.0 to 2.11.1

---
 pkgs/servers/mail/postfix/2.11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix
index 7164ace791e..3651b1b74a4 100644
--- a/pkgs/servers/mail/postfix/2.11.nix
+++ b/pkgs/servers/mail/postfix/2.11.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "postfix-${version}";
 
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
-    sha256 = "0f0c6cv6j5m5n4bjp18llvbbxmzmhb70qw1z9vf7h9k6slr9s7fa";
+    sha256 = "1ql9cifjcfhfi81lrf6zvk0r3spgcp01xwna16a7k9cm7fkrhzs8";
   };
 
   patches = [ ./postfix-2.11.0.patch ];

From 9018d3c4f242c9bd434bc7c2253f9c8e65b052ae Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 9 Jun 2014 15:13:56 +0200
Subject: [PATCH 194/221] tinc: Update from 1.0.23 to 1.0.24

---
 pkgs/tools/networking/tinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index 61ff721a847..f1f8801358c 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, lzo, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.23";
+  version = "1.0.24";
   name = "tinc-${version}";
 
   src = fetchurl {
     url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "04i88hr46nx3x3s71kasm9qrjhnn35icxh9zwchki47z2vgnpw5w";
+    sha256 = "11xnz6lz917hq0zb544dvbxl0smlyjx65kv3181j4fcyygwmi3j9";
   };
 
   buildInputs = [ lzo openssl zlib ];

From 094635257ebaa1894298acf5c5242d1579134fee Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 9 Jun 2014 19:11:33 +0200
Subject: [PATCH 195/221] mysql-connector-java: Bump to version 5.1.31

---
 pkgs/servers/sql/mysql/jdbc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 424f6d02181..7fde706479d 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, ant, unzip}:
 
 stdenv.mkDerivation {
-  name = "mysql-connector-java-5.1.25";
+  name = "mysql-connector-java-5.1.31";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-5.1.25.zip;
-    sha256 = "1qwnha8w8xafcig8wdvbry93pbli2vmzks8ds6kbb9im2k0rrmrw";
+    url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.31.zip;
+    sha256 = "1j6jvpadlib2hb6n3kh7s9ygjyqvi5gawrmnk1dsvvdcbkk1v871";
   };
 
   buildInputs = [ unzip ant ];

From 35f47bcfd8aa2f5d38fe565ba32ac62cbfd63118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 9 Jun 2014 19:11:38 +0200
Subject: [PATCH 196/221] fix evaluation (wrong meta.maintainers field)

---
 pkgs/development/ocaml-modules/lablgl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index 8fd07ee0691..75c8d7ad224 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation {
     homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html;
     description = "OpenGL bindings for ocaml";
     license = "GnuGPLV2";
-    maintainers = [ stdenv.lib.maintainers.psub ];
+    maintainers = [ stdenv.lib.maintainers.pSub ];
   };
 }

From be976b2c465650fff7e11dce28d5dccad04f983b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 9 Jun 2014 18:52:24 +0200
Subject: [PATCH 197/221] pypy: disable a test

---
 pkgs/development/interpreters/pypy/2.2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix
index b2b4157dcf6..d67f1c2a821 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -60,7 +60,8 @@ let
        # disable test_mhlib because it fails for unknown reason
        # disable test_multiprocessing due to transient errors
        # disable sqlite3 due to https://bugs.pypy.org/issue1740
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_shutil -test_mhlib -test_multiprocessing' lib-python
+       # disable test_os because test_urandom_failure fails
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python
     '';
 
     installPhase = ''

From fb9c0d53b20a21b00209db1675429cce2f7089a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 9 Jun 2014 20:42:49 +0200
Subject: [PATCH 198/221] xbmc: 13.0 -> 13.1

---
 pkgs/applications/video/xbmc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 94da757867e..3232267fa94 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -34,11 +34,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
 assert pulseSupport -> pulseaudio != null;
 
 stdenv.mkDerivation rec {
-    name = "xbmc-13.0";
+    name = "xbmc-13.1";
 
     src = fetchurl {
-      url = "https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz";
-      sha256 = "096hin8qp1864ypyw9xysy13niwf79bgfgivxi7w7mh2dagn0mjx";
+      url = "https://github.com/xbmc/xbmc/archive/13.1-Gotham.tar.gz";
+      sha256 = "0y56c5csfp8xhk088g47m3bzrri73z868yfx6b04gnrdmr760jrl";
     };
 
     buildInputs = [

From 6b6f098fd18cfa83cbcfa35ad98da48a59b0606b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 9 Jun 2014 23:46:30 +0200
Subject: [PATCH 199/221] disnix: bump versions and update module to use its
 latest features

---
 nixos/modules/services/misc/disnix.nix                    | 3 ++-
 pkgs/tools/package-management/disnix/default.nix          | 6 +++---
 pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 94d0caaa76b..219c7ed9587 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -125,13 +125,14 @@ in
           after = [ "dbus.service" ]
             ++ optional config.services.httpd.enable "httpd.service"
             ++ optional config.services.mysql.enable "mysql.service"
+            ++ optional config.services.postgresql.enable "postgresql.service"
             ++ optional config.services.tomcat.enable "tomcat.service"
             ++ optional config.services.svnserve.enable "svnserve.service"
             ++ optional config.services.mongodb.enable "mongodb.service";
 
           restartIfChanged = false;
           
-          path = [ pkgs.nix pkgs.disnix pkgs.dysnomia ];
+          path = [ pkgs.nix pkgs.disnix dysnomia ];
           
           environment = {
             HOME = "/root";
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index ff29316edbf..d89ab7667e8 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3pre8aa12b65ced9029f7c17a494cee25e6ffc69fdea";
+  name = "disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/9876935/download/4/disnix-0.3pre15e93a364ad9439d8336e659921600d48252045d.tar.gz;
-    sha256 = "1kgc6cacpp3ly7c62ah6pdprdl1bab08b4ir4dcrrm44x6fa1k63";
+    url = http://hydra.nixos.org/build/11773951/download/4/disnix-0.3pre174e883b7b09da822494876d2f297736f33707a7.tar.gz;
+    sha256 = "19hdh2mrlyiq1g3z6lnnqqvripmfcdnm18jpm4anp5iarhnwh3y4";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 5c937bc8aef..d2f3ae6468c 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -19,10 +19,10 @@ assert enableEjabberdDump -> ejabberd != null;
 assert enableMongoDatabase -> mongodb != null;
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.3pred677260f77bb202c7490f7db08dbd8442c9db484";
+  name = "dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/9146265/download/1/dysnomia-0.3pre313a5f99a166fee2e0245dfd25f41ec9ed958075.tar.gz;
-    sha256 = "0fgbqybr9rfr95fkmv1hpq7al0p1kxa385k6sjc7iwwcxs4cmxf5";
+    url = http://hydra.nixos.org/build/11407191/download/1/dysnomia-0.3pre09cc08f5ffc737d988923bb7329a7ec711badd82.tar.gz;
+    sha256 = "1i7yb299bq1z7cy4sk83m5faahj8inh73xn5bi6jcv492zv3kgwz";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";

From 5100a2bbb315511ce8c1562ba65f621c8d249ec1 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 9 Jun 2014 20:51:54 -0500
Subject: [PATCH 200/221] texlive: upgrade to 20140528

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 18 +++++++++---------
 pkgs/tools/typesetting/tex/texlive/extra.nix   |  6 +++---
 pkgs/top-level/all-packages.nix                |  3 ++-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 22ce7739a74..b1cb35e62ff 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,20 +1,20 @@
 args : with args;
 rec {
   src = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2013.20130729.30972.orig.tar.xz;
-    sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd";
+    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140528.34243.orig.tar.xz;
+    sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s";
   };
 
-  texmfVersion = "2013.20140408";
+  texmfVersion = "2014.20140528";
   texmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
-    sha256 = "1pdbbp4sy6kypiqss9zfvr3m0agqzghagfr609pfjh9ka3ihv0kh";
+    sha256 = "09z3jp5if0llszm02x3f93izrspjh14g77034c677r0sj4xrb63w";
   };
 
-  langTexmfVersion = "2013.20140408";
+  langTexmfVersion = "2014.20140528";
   langTexmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
-    sha256 = "05qyhcfdbrrc8mnps5sv3fggjbxdj3bp9jd12ldzkjxxdbzhp475";
+    sha256 = "0c7rppqya74g8fb431i3bbga88xzjiarj540fcn34plar5wz4k31";
   };
 
   passthru = { inherit texmfSrc langTexmfSrc; };
@@ -40,7 +40,7 @@ rec {
     sed -e '/ubidi_open/i#include <unicode/urename.h>' -i $(find . -name configure)
     sed -e 's/-lttf/-lfreetype/' -i $(find . -name configure)
 
-    sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . )
+    # sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . )
     sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' )
 
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
@@ -111,7 +111,7 @@ rec {
   buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto
     freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext
     xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig
-    poppler graphite2 lesstif zziplib harfbuzz texinfo ]
+    poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ];
 
   configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
@@ -134,7 +134,7 @@ rec {
 
   phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ];
 
-  name = "texlive-core-2013";
+  name = "texlive-core-2014";
 
   meta = with stdenv.lib; {
     description = "A TeX distribution";
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 8549c8c4548..1195eaa58f3 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,11 +1,11 @@
 args: with args;
 rec {
-  name    = "texlive-extra-2013";
-  version = "2013.20140408";
+  name    = "texlive-extra-2014";
+  version = "2014.20140528";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
-    sha256 = "0d6b5kip7j8ljqn92bkdncvqxyk2756404hzsp4mh0s1jhfwws7y";
+    sha256 = "1wlvafvc03qlic4gr883q3lvgjis0czw3z6gdp4qw8f51a0fyam9";
   };
 
   buildInputs = [texLive xz];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da97d66dc01..2ebbf7cd8ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11012,7 +11012,8 @@ let
   texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
     inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby
       gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo
-      libjpeg bison python fontconfig flex poppler graphite2 makeWrapper;
+      libjpeg bison python fontconfig flex poppler libpaper graphite2
+      makeWrapper;
     inherit (xlibs) libXaw libX11 xproto libXt libXpm
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;

From 7ebe9b1e16de530ba97eec4618b31f0f19604a33 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 9 Jun 2014 21:01:59 -0500
Subject: [PATCH 201/221] haskell-ghc-mod: 4.1.1 -> 4.1.2

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index b83d9de4552..04545dda87e 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "4.1.1";
-  sha256 = "0jsm881khbpa316rvka2ixzmm4kim7w9gbriz94m08b3yj3f00q9";
+  version = "4.1.2";
+  sha256 = "0xdpy61dc56zvpgr2z9cdyd85d65l426vnbfgsw6w494w0bp3sh7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From d0365a6cde538525ed37ee7b60fbd789a2ff7325 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 10 Jun 2014 02:28:23 +0000
Subject: [PATCH 202/221] git-annex: build on Darwin, and rely on cabal to set
 flags

Fixes #2519
---
 .../git-and-tools/git-annex/default.nix       | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 217e4067cb9..788c3c3211b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -11,7 +11,7 @@
 , tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers
 , unixCompat, utf8String, uuid, wai, waiLogger, warp, warpTls
 , which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
-, yesodStatic
+, yesodStatic, fsnotify
 }:
 
 cabal.mkDerivation (self: {
@@ -22,9 +22,9 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter byteable caseInsensitive
-    clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
-    dlist dns editDistance exceptions extensibleExceptions fdoNotify
-    feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient
+    clientsession cryptoApi cryptohash dataDefault dataenc DAV
+    dlist dns editDistance exceptions extensibleExceptions
+    feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
     httpConduit httpTypes IfElse json liftedBase MissingH monadControl
     mtl network networkConduit networkInfo networkMulticast
     networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
@@ -32,19 +32,10 @@ cabal.mkDerivation (self: {
     tastyQuickcheck tastyRerun text time transformers unixCompat
     utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore
     yesodDefault yesodForm yesodStatic
-  ];
+  ] ++ (if !self.stdenv.isDarwin
+        then [ dbus fdoNotify hinotify ] else [ fsnotify ]);
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
-  configureFlags = "-fS3
-                    -fWebDAV
-                    -fInotify
-                    -fDbus
-                    -fAssistant
-                    -fWebapp
-                    -fPairing
-                    -fXMPP
-                    -fDNS
-                    -fProduction
-                    -fTDFA";
+  configureFlags = "-fAssistant -fProduction";
   preConfigure = ''
     export HOME="$NIX_BUILD_TOP/tmp"
     mkdir "$HOME"

From f4987a0edc5783d28333d06fd1d2751cf009e5be Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jun 2014 09:20:00 +0400
Subject: [PATCH 203/221] Update Monotone and add source-updater script

---
 .../version-management/monotone/default.nix   |  13 +-
 .../monotone/default.upstream                 |   8 +
 .../monotone/glibc-file-handle.patch          | 166 ------------------
 3 files changed, 16 insertions(+), 171 deletions(-)
 create mode 100644 pkgs/applications/version-management/monotone/default.upstream
 delete mode 100644 pkgs/applications/version-management/monotone/glibc-file-handle.patch

diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 0df1c652761..6be36533ce6 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, boost, zlib, botan, libidn
-, lua, pcre, sqlite, perl, pkgconfig, expect }:
+, lua, pcre, sqlite, perl, pkgconfig, expect
+, bzip2, gmp, openssl
+}:
 
 let
-  version = "1.0";
+  version = "1.1";
   perlVersion = (builtins.parseDrvName perl.name).version;
 in
 
@@ -13,12 +15,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
-    sha256 = "5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc";
+    sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r";
   };
 
-  patches = [ ./glibc-file-handle.patch ];
+  patches = [ ];
 
-  buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect ];
+  buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect 
+    openssl gmp bzip2 ];
 
   postInstall = ''
     mkdir -p $out/share/${name}
diff --git a/pkgs/applications/version-management/monotone/default.upstream b/pkgs/applications/version-management/monotone/default.upstream
new file mode 100644
index 00000000000..e0d01fb190c
--- /dev/null
+++ b/pkgs/applications/version-management/monotone/default.upstream
@@ -0,0 +1,8 @@
+url http://www.monotone.ca/downloads.php
+
+do_overwrite(){
+  ensure_version
+  ensure_hash
+  set_var_value version $CURRENT_VERSION
+  set_var_value sha256 $CURRENT_HASH
+}
diff --git a/pkgs/applications/version-management/monotone/glibc-file-handle.patch b/pkgs/applications/version-management/monotone/glibc-file-handle.patch
deleted file mode 100644
index 601b6ede0fb..00000000000
--- a/pkgs/applications/version-management/monotone/glibc-file-handle.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Revision: da62cad10eda55aa233ac124273f3db4f541137a
-Parent:   65bcb8cf8b32f68a5b48629b328f6d65979e58df
-Author:   Thomas Moschny <thomas.moschny@gmx.de>
-Date:     07.05.2011 13:32:06
-Branch:   net.venge.monotone
-
-Changelog: 
-
-* src/rcs_file.cc: Rename struct "file_handle" to "rcs_file_handle"
-  to avoid a name clash with a struct of same name defined by newer
-  glibc's "fcntl.h". For aesthetic reasons, also rename struct
-  "file_source".
-
-References:
-https://code.monotone.ca/p/monotone/source/commit/da62cad10eda55aa233ac124273f3db4f541137a/
-https://bugs.gentoo.org/396651
-
-============================================================
---- a/src/rcs_file.cc	885b3fbe7b6cfed78816f0e57cd71d44616213c6
-+++ b/src/rcs_file.cc	03cf68912a4a708545ebce3d415c0e970ddead0b
-@@ -42,12 +42,12 @@ struct
- 
- #ifdef HAVE_MMAP
- struct
--file_handle
-+rcs_file_handle
- {
-   string const & filename;
-   off_t length;
-   int fd;
--  file_handle(string const & fn) :
-+  rcs_file_handle(string const & fn) :
-     filename(fn),
-     length(0),
-     fd(-1)
-@@ -60,13 +60,13 @@ file_handle
-       if (fd == -1)
-         throw oops("open of " + filename + " failed");
-     }
--  ~file_handle()
-+  ~rcs_file_handle()
-     {
-       if (close(fd) == -1)
-         throw oops("close of " + filename + " failed");
-     }
- };
--struct file_source
-+struct rcs_file_source
- {
-   string const & filename;
-   int fd;
-@@ -91,7 +91,7 @@ struct file_source
-       ++pos;
-     return good();
-   }
--  file_source(string const & fn,
-+  rcs_file_source(string const & fn,
-               int f,
-               off_t len) :
-     filename(fn),
-@@ -104,7 +104,7 @@ struct file_source
-     if (mapping == MAP_FAILED)
-       throw oops("mmap of " + filename + " failed");
-   }
--  ~file_source()
-+  ~rcs_file_source()
-   {
-     if (munmap(mapping, length) == -1)
-       throw oops("munmapping " + filename + " failed, after reading RCS file");
-@@ -112,12 +112,12 @@ struct
- };
- #elif defined(WIN32)
- struct
--file_handle
-+rcs_file_handle
- {
-   string const & filename;
-   off_t length;
-   HANDLE fd;
--  file_handle(string const & fn) :
-+  rcs_file_handle(string const & fn) :
-     filename(fn),
-     length(0),
-     fd(NULL)
-@@ -134,7 +134,7 @@ file_handle
-       if (fd == NULL)
-         throw oops("open of " + filename + " failed");
-     }
--  ~file_handle()
-+  ~rcs_file_handle()
-     {
-       if (CloseHandle(fd)==0)
-         throw oops("close of " + filename + " failed");
-@@ -142,7 +142,7 @@ struct
- };
- 
- struct
--file_source
-+rcs_file_source
- {
-   string const & filename;
-   HANDLE fd,map;
-@@ -167,7 +167,7 @@ file_source
-       ++pos;
-     return good();
-   }
--  file_source(string const & fn,
-+  rcs_file_source(string const & fn,
-               HANDLE f,
-               off_t len) :
-     filename(fn),
-@@ -183,7 +183,7 @@ file_source
-     if (mapping==NULL)
-       throw oops("MapViewOfFile of " + filename + " failed");
-   }
--  ~file_source()
-+  ~rcs_file_source()
-   {
-     if (UnmapViewOfFile(mapping)==0)
-       throw oops("UnmapViewOfFile of " + filename + " failed");
-@@ -193,7 +193,7 @@ file_source
- };
- #else
- // no mmap at all
--typedef istream file_source;
-+typedef istream rcs_file_source;
- #endif
- 
- typedef enum
-@@ -220,7 +220,7 @@ static token_type
- }
- 
- static token_type
--get_token(file_source & ist,
-+get_token(rcs_file_source & ist,
-           string & str,
-           size_t & line,
-           size_t & col)
-@@ -303,14 +303,14 @@ struct parser
- 
- struct parser
- {
--  file_source & ist;
-+  rcs_file_source & ist;
-   rcs_file & r;
-   string token;
-   token_type ttype;
- 
-   size_t line, col;
- 
--  parser(file_source & s,
-+  parser(rcs_file_source & s,
-          rcs_file & r)
-     : ist(s), r(r), line(1), col(1)
-   {}
-@@ -489,8 +489,8 @@ parse_rcs_file(string const & filename, 
- parse_rcs_file(string const & filename, rcs_file & r)
- {
- #if defined(HAVE_MMAP) || defined(WIN32)
--      file_handle handle(filename);
--      file_source ifs(filename, handle.fd, handle.length);
-+      rcs_file_handle handle(filename);
-+      rcs_file_source ifs(filename, handle.fd, handle.length);
- #else
-       ifstream ifs(filename.c_str());
-       ifs.unsetf(ios_base::skipws);

From cfe5bee0008362499657a69c230e531a66ad8539 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jun 2014 09:29:13 +0400
Subject: [PATCH 204/221] Update botan

---
 pkgs/development/libraries/botan/default.nix      | 7 ++++---
 pkgs/development/libraries/botan/default.upstream | 9 +++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/botan/default.upstream

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 18de87b0667..9f4d766f719 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -14,12 +14,12 @@ let
   sourceInfo = rec {
     baseName="botan";
     tarBaseName="Botan";
-    baseVersion="1.8";
-    revision="11";
+    baseVersion = "1.10";
+    revision = "8";
     version="${baseVersion}.${revision}";
     name="${baseName}-${version}";
     url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz";
-    hash="194vffc9gfb0912lzndn8nzblg2d2gjmk13fc8hppgpw7ln0mdn3";
+    hash = "182f316rbdd6jrqn92vjms3jyb9syn4ic0nzi3b7rfjbj3zdabxw";
   };
 in
 rec {
@@ -43,6 +43,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       unix;
+    inherit version;
   };
   passthru = {
     updateInfo = {
diff --git a/pkgs/development/libraries/botan/default.upstream b/pkgs/development/libraries/botan/default.upstream
new file mode 100644
index 00000000000..becbf348b34
--- /dev/null
+++ b/pkgs/development/libraries/botan/default.upstream
@@ -0,0 +1,9 @@
+url http://botan.randombit.net/download.html
+version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$'
+ensure_version
+ensure_hash
+do_overwrite(){
+  set_var_value hash $CURRENT_HASH
+  set_var_value baseVersion ${CURRENT_VERSION%.*}
+  set_var_value revision ${CURRENT_VERSION##*.}
+}

From b7b58f90d838caf37862109f70ad4e05da885507 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jun 2014 09:41:23 +0400
Subject: [PATCH 205/221] Update ZPAQ

---
 pkgs/tools/archivers/zpaq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 2f44a8dd4db..718a80e1406 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="651";
+    version="652";
     name="${baseName}-${version}";
-    hash="1n0qq4lia25n62jpa0gg29388xf8r75nv4h1vpc3s5rpymkq2qw5";
-    url="http://mattmahoney.net/dc/zpaq651.zip";
-    sha256="1n0qq4lia25n62jpa0gg29388xf8r75nv4h1vpc3s5rpymkq2qw5";
+    hash="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky";
+    url="http://mattmahoney.net/dc/zpaq652.zip";
+    sha256="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky";
   };
   buildInputs = [
     unzip

From 99d59d8094515f5bd0733e019ac5fae9902aa924 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jun 2014 09:41:48 +0400
Subject: [PATCH 206/221] Update jq

---
 pkgs/development/tools/jq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index f0c32fc0e9e..514aa8746c6 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="jq";
-    version="1.3";
+    version="1.4";
     name="${baseName}-${version}";
-    hash="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2";
-    url="http://stedolan.github.io/jq/download/source/jq-1.3.tar.gz";
-    sha256="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2";
+    hash="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r";
+    url="http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz";
+    sha256="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r";
   };
   buildInputs = [
   ];

From c6c152daada5c9c1dc1c7c5bce724009a9075b2c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jun 2014 10:48:38 +0400
Subject: [PATCH 207/221] Create botan.pc just in case

---
 pkgs/development/libraries/botan/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 9f4d766f719..64dd821c43f 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -32,8 +32,13 @@ rec {
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"];
   configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl --with-tr1-implementation=boost";
+
+  fixPkgConfig = a.fullDepEntry ''
+    cd "$out"/lib/pkgconfig
+    ln -s botan-*.pc botan.pc || true
+  '' ["minInit" "doMakeInstall"];
       
   meta = {
     description = "Cryptographic algorithms library";

From 26c8490ea1070b63f1a05e2d85efe540136660c9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jun 2014 11:24:43 +0400
Subject: [PATCH 208/221] Install libpotrace

---
 pkgs/applications/graphics/potrace/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 81af6db9a4c..0ede3a0e921 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
     sha256 = "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as";
   };
 
+  configureFlags = ["--with-libpotrace"];
+
   buildInputs = [ zlib ];
 
   meta = {

From a852b53bffecdba28344a7ccbe25b87e6cbd9344 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 10 Jun 2014 11:25:03 +0400
Subject: [PATCH 209/221] Add potrace to texLive dependencies

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index b1cb35e62ff..73c53bca2fb 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -112,7 +112,9 @@ rec {
     freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext
     xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig
     poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ];
+    ++ stdenv.lib.optionals (! stdenv.isDarwin) [ potrace ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ]
+    ;
 
   configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
     "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ebbf7cd8ad..3478e3a7cde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11010,7 +11010,7 @@ let
   texFunctions = import ../tools/typesetting/tex/nix pkgs;
 
   texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
-    inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby
+    inherit 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;

From 0085a1aae33483dfaae3a4559d53cc1688791258 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 10 Jun 2014 08:57:41 +0000
Subject: [PATCH 210/221] potrace: allow building on any unix

---
 pkgs/applications/graphics/potrace/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 0ede3a0e921..365f88b19b4 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://potrace.sourceforge.net/;
     description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.pSub ];
     license = "GPL2";
   };

From 651595c96977b1f786bf8c5be5893c270bba38d3 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 10 Jun 2014 08:57:52 +0000
Subject: [PATCH 211/221] texlive: add potrace dependency without qualification

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 73c53bca2fb..b9e71a7cde2 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -111,8 +111,7 @@ rec {
   buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto
     freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext
     xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig
-    poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo ]
-    ++ stdenv.lib.optionals (! stdenv.isDarwin) [ potrace ]
+    poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo potrace ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ]
     ;
 

From 927c41e2585cf4b8d7fc1e64f8f9927af710cf94 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@numergy.com>
Date: Tue, 20 May 2014 15:36:10 +0200
Subject: [PATCH 212/221] fish: Fixed tab completion with sudo (close #2705)

We don't have /sbin and /usr/sbin, so fish complains.
---
 pkgs/shells/fish/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 7b70e98d2cd..e69c033cf40 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
         -e "s|which |${which}/bin/which |" \
         -i "$out/share/fish/functions/_.fish"
     sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"
+    sed -i "s|/sbin /usr/sbin||" \
+           "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
   '';
 
   meta = with stdenv.lib; {

From 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 3 Jun 2014 16:07:47 +0200
Subject: [PATCH 213/221] Merge #2692: Use pam_env to properly setup
 system-wide env

---
 nixos/modules/config/i18n.nix               |  2 +-
 nixos/modules/config/shells-environment.nix |  1 +
 nixos/modules/config/system-environment.nix | 56 +++++++++++++++++++++
 nixos/modules/config/timezone.nix           |  2 +-
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/programs/environment.nix      |  9 ++--
 nixos/modules/security/ca.nix               |  8 +--
 nixos/modules/security/pam.nix              |  1 +
 nixos/modules/security/sudo.nix             |  3 --
 nixos/modules/services/misc/nix-daemon.nix  |  2 +-
 10 files changed, 73 insertions(+), 12 deletions(-)
 create mode 100644 nixos/modules/config/system-environment.nix

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 8182b8ae808..7a7d713ef68 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -76,7 +76,7 @@ in
 
     environment.systemPackages = [ glibcLocales ];
 
-    environment.variables =
+    environment.systemVariables =
       { LANG = config.i18n.defaultLocale;
         LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
       };
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 9e212847e48..e3ddf9e3c5f 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -19,6 +19,7 @@ in
       default = {};
       description = ''
         A set of environment variables used in the global environment.
+        These variables will be set on shell initialisation.
         The value of each variable can be either a string or a list of
         strings.  The latter is concatenated, interspersed with colon
         characters.
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
new file mode 100644
index 00000000000..b30c4e06475
--- /dev/null
+++ b/nixos/modules/config/system-environment.nix
@@ -0,0 +1,56 @@
+# This module defines a system-wide environment that will be
+# initialised by pam_env (that is, not only in shells).
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.environment;
+
+in
+
+{
+
+  options = {
+
+    environment.systemVariables = mkOption {
+      default = {};
+      description = ''
+        A set of environment variables used in the global environment.
+        These variables will be set by PAM.
+        The value of each variable can be either a string or a list of
+        strings.  The latter is concatenated, interspersed with colon
+        characters.
+      '';
+      type = types.attrsOf (mkOptionType {
+        name = "a string or a list of strings";
+        merge = loc: defs:
+          let
+            defs' = filterOverrides defs;
+            res = (head defs').value;
+          in
+          if isList res then concatLists (getValues defs')
+          else if lessThan 1 (length defs') then
+            throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
+          else if !isString res then
+            throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
+          else res;
+      });
+      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
+    };
+
+  };
+
+  config = {
+
+    system.build.pamEnvironment = pkgs.writeText "pam-environment"
+       ''
+         ${concatStringsSep "\n" (
+           (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
+             (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))}
+       '';
+
+  };
+
+}
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 65703d8bb08..4f7fc9ab262 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -30,7 +30,7 @@ in
 
   config = {
 
-    environment.variables.TZDIR = "/etc/zoneinfo";
+    environment.systemVariables.TZDIR = "/etc/zoneinfo";
 
     systemd.globalEnvironment.TZDIR = tzdir;
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4ceb48989be..a6e0e018669 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -14,6 +14,7 @@
   ./config/power-management.nix
   ./config/pulseaudio.nix
   ./config/shells-environment.nix
+  ./config/system-environment.nix
   ./config/swap.nix
   ./config/sysctl.nix
   ./config/system-path.nix
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index aa9aec07834..c26c962b20a 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -19,13 +19,16 @@ in
     environment.variables =
       { LOCATE_PATH = "/var/cache/locatedb";
         NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
-        NIX_PATH =
+        PAGER = "less -R";
+        EDITOR = "nano";
+      };
+
+    environment.systemVariables =
+      { NIX_PATH =
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixpkgs=/etc/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
           ];
-        PAGER = "less -R";
-        EDITOR = "nano";
       };
 
     environment.profiles =
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index f159e359f96..57764dc870f 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -12,9 +12,11 @@ with lib;
         }
       ];
 
-    environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
-    environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
-    environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
+    environment.systemVariables =
+      { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+        CURL_CA_BUNDLE         = "/etc/ssl/certs/ca-bundle.crt";
+        GIT_SSL_CAINFO         = "/etc/ssl/certs/ca-bundle.crt";
+      };
 
   };
 
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 6a5eb4c720f..02340fd78e8 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -186,6 +186,7 @@ let
               "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
 
           # Session management.
+          session required pam_env.so envfile=${config.system.build.pamEnvironment}
           session required pam_unix.so
           ${optionalString cfg.setLoginUid
               "session required pam_loginuid.so"}
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index cce1e785563..e8ed545c8cc 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -58,9 +58,6 @@ in
         # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead.
 
         # Environment variables to keep for root and %wheel.
-        Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
-        Defaults:root,%wheel env_keep+=NIX_CONF_DIR
-        Defaults:root,%wheel env_keep+=NIX_PATH
         Defaults:root,%wheel env_keep+=TERMINFO_DIRS
         Defaults:root,%wheel env_keep+=TERMINFO
 
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4bfd6268234..f373657b791 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -318,7 +318,7 @@ in
       };
 
     # Set up the environment variables for running Nix.
-    environment.variables = cfg.envVars;
+    environment.systemVariables = cfg.envVars;
 
     environment.extraInit =
       ''

From 966f13880f30bde48dd40c33aecb9f2725c2f0e8 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 10 Jun 2014 11:45:02 +0200
Subject: [PATCH 214/221] Clojure: bump to 1.6.0.

---
 pkgs/development/interpreters/clojure/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 6db652572a3..fd1a2d019fe 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
 
-let version = "1.5.1"; in
+let version = "1.6.0"; in
 
 stdenv.mkDerivation {
   name = "clojure-${version}";
 
   src = fetchurl {
     url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
-    sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy";
+    sha256 = "0yv67gackrzlwn9f8cnpw14y2hwspklxhy1450rl71vdrqjahlwq";
   };
 
   buildInputs = [ unzip ant jdk makeWrapper ];
@@ -43,5 +43,6 @@ stdenv.mkDerivation {
       offers a software transactional memory system and reactive Agent
       system that ensure clean, correct, multithreaded designs.
     '';
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }

From 717d9c39f94c667cca80fa4942e35cd51e5cc7eb Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 10 Jun 2014 11:49:47 +0200
Subject: [PATCH 215/221] leiningen: Update to 2.4.0.

---
 .../tools/build-managers/leiningen/default.nix         | 10 +++++-----
 .../{lein_2.3.0.patch => lein-fix-jar-path.patch}      |  0
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/tools/build-managers/leiningen/{lein_2.3.0.patch => lein-fix-jar-path.patch} (100%)

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index a5f34746fef..2c4ea8183af 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -3,20 +3,20 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.3.4";
+  version = "2.4.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "1v83hpvp349pgqqiy4babc5m5b9lcwk0fif80fpv4jqvp0a8v6r7";
+    sha256 = "0mdfp5r5qid42x7rq1cmyxqmvjdj2hk9rjz8pryf4zq3bk38m1cg";
   };
 
   jarsrc = fetchurl {
-    url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
-    sha256 = "1pqc99p4vz4q3qcs90cqql6m7kc27ihx4hbqs5alxkzk7jv8s2bk";
+    url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar";
+    sha256 = "099r5qcldb214c3857i7dbbqn531aahzrz39qfhqxc6f476ncdh0";
   };
 
-  patches = ./lein_2.3.0.patch;
+  patches = [ ./lein-fix-jar-path.patch ];
 
   inherit rlwrap clojure gnupg findutils coreutils jdk;
 
diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch b/pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch
rename to pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch

From 9265a61453f0df3a8bbaf3dc53e32c239e3bdcf9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 10 Jun 2014 12:25:00 +0200
Subject: [PATCH 216/221] gvfs: add more supported protocols in gnome 3.12.
 Closes #2880

---
 pkgs/desktops/gnome-3/3.12/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index b33fad0e41e..f5369b2a3c3 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -116,7 +116,7 @@ rec {
 
   gucharmap = callPackage ./core/gucharmap { };
 
-  gvfs = pkgs.gvfs.override { gnome = gnome3; };
+  gvfs = pkgs.gvfs.override { gnome = gnome3; lightWeight = false; };
 
   eog = callPackage ./core/eog { };
 

From 491c088731022463978e595956427e72db6306a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Jun 2014 13:03:44 +0200
Subject: [PATCH 217/221] Revert "Merge #2692: Use pam_env to properly setup
 system-wide env"

This reverts commit 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.
---
 nixos/modules/config/i18n.nix               |  2 +-
 nixos/modules/config/shells-environment.nix |  1 -
 nixos/modules/config/system-environment.nix | 56 ---------------------
 nixos/modules/config/timezone.nix           |  2 +-
 nixos/modules/module-list.nix               |  1 -
 nixos/modules/programs/environment.nix      |  9 ++--
 nixos/modules/security/ca.nix               |  8 ++-
 nixos/modules/security/pam.nix              |  1 -
 nixos/modules/security/sudo.nix             |  3 ++
 nixos/modules/services/misc/nix-daemon.nix  |  2 +-
 10 files changed, 12 insertions(+), 73 deletions(-)
 delete mode 100644 nixos/modules/config/system-environment.nix

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 7a7d713ef68..8182b8ae808 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -76,7 +76,7 @@ in
 
     environment.systemPackages = [ glibcLocales ];
 
-    environment.systemVariables =
+    environment.variables =
       { LANG = config.i18n.defaultLocale;
         LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
       };
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index e3ddf9e3c5f..9e212847e48 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -19,7 +19,6 @@ in
       default = {};
       description = ''
         A set of environment variables used in the global environment.
-        These variables will be set on shell initialisation.
         The value of each variable can be either a string or a list of
         strings.  The latter is concatenated, interspersed with colon
         characters.
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
deleted file mode 100644
index b30c4e06475..00000000000
--- a/nixos/modules/config/system-environment.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-# This module defines a system-wide environment that will be
-# initialised by pam_env (that is, not only in shells).
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.environment;
-
-in
-
-{
-
-  options = {
-
-    environment.systemVariables = mkOption {
-      default = {};
-      description = ''
-        A set of environment variables used in the global environment.
-        These variables will be set by PAM.
-        The value of each variable can be either a string or a list of
-        strings.  The latter is concatenated, interspersed with colon
-        characters.
-      '';
-      type = types.attrsOf (mkOptionType {
-        name = "a string or a list of strings";
-        merge = loc: defs:
-          let
-            defs' = filterOverrides defs;
-            res = (head defs').value;
-          in
-          if isList res then concatLists (getValues defs')
-          else if lessThan 1 (length defs') then
-            throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
-          else if !isString res then
-            throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
-          else res;
-      });
-      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
-    };
-
-  };
-
-  config = {
-
-    system.build.pamEnvironment = pkgs.writeText "pam-environment"
-       ''
-         ${concatStringsSep "\n" (
-           (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
-             (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))}
-       '';
-
-  };
-
-}
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 4f7fc9ab262..65703d8bb08 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -30,7 +30,7 @@ in
 
   config = {
 
-    environment.systemVariables.TZDIR = "/etc/zoneinfo";
+    environment.variables.TZDIR = "/etc/zoneinfo";
 
     systemd.globalEnvironment.TZDIR = tzdir;
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a6e0e018669..4ceb48989be 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -14,7 +14,6 @@
   ./config/power-management.nix
   ./config/pulseaudio.nix
   ./config/shells-environment.nix
-  ./config/system-environment.nix
   ./config/swap.nix
   ./config/sysctl.nix
   ./config/system-path.nix
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index c26c962b20a..aa9aec07834 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -19,16 +19,13 @@ in
     environment.variables =
       { LOCATE_PATH = "/var/cache/locatedb";
         NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
-        PAGER = "less -R";
-        EDITOR = "nano";
-      };
-
-    environment.systemVariables =
-      { NIX_PATH =
+        NIX_PATH =
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixpkgs=/etc/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
           ];
+        PAGER = "less -R";
+        EDITOR = "nano";
       };
 
     environment.profiles =
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 57764dc870f..f159e359f96 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -12,11 +12,9 @@ with lib;
         }
       ];
 
-    environment.systemVariables =
-      { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
-        CURL_CA_BUNDLE         = "/etc/ssl/certs/ca-bundle.crt";
-        GIT_SSL_CAINFO         = "/etc/ssl/certs/ca-bundle.crt";
-      };
+    environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+    environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
+    environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
 
   };
 
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 02340fd78e8..6a5eb4c720f 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -186,7 +186,6 @@ let
               "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
 
           # Session management.
-          session required pam_env.so envfile=${config.system.build.pamEnvironment}
           session required pam_unix.so
           ${optionalString cfg.setLoginUid
               "session required pam_loginuid.so"}
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index e8ed545c8cc..cce1e785563 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -58,6 +58,9 @@ in
         # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead.
 
         # Environment variables to keep for root and %wheel.
+        Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
+        Defaults:root,%wheel env_keep+=NIX_CONF_DIR
+        Defaults:root,%wheel env_keep+=NIX_PATH
         Defaults:root,%wheel env_keep+=TERMINFO_DIRS
         Defaults:root,%wheel env_keep+=TERMINFO
 
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index f373657b791..4bfd6268234 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -318,7 +318,7 @@ in
       };
 
     # Set up the environment variables for running Nix.
-    environment.systemVariables = cfg.envVars;
+    environment.variables = cfg.envVars;
 
     environment.extraInit =
       ''

From 8ae659f16c0f2706bd264ba3ee880f265a847438 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Jun 2014 13:07:10 +0200
Subject: [PATCH 218/221] Revert "Revert "Merge #2692: Use pam_env to properly
 setup system-wide env""

This reverts commit 491c088731022463978e595956427e72db6306a9.
---
 nixos/modules/config/i18n.nix               |  2 +-
 nixos/modules/config/shells-environment.nix |  1 +
 nixos/modules/config/system-environment.nix | 56 +++++++++++++++++++++
 nixos/modules/config/timezone.nix           |  2 +-
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/programs/environment.nix      |  9 ++--
 nixos/modules/security/ca.nix               |  8 +--
 nixos/modules/security/pam.nix              |  1 +
 nixos/modules/security/sudo.nix             |  3 --
 nixos/modules/services/misc/nix-daemon.nix  |  2 +-
 10 files changed, 73 insertions(+), 12 deletions(-)
 create mode 100644 nixos/modules/config/system-environment.nix

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 8182b8ae808..7a7d713ef68 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -76,7 +76,7 @@ in
 
     environment.systemPackages = [ glibcLocales ];
 
-    environment.variables =
+    environment.systemVariables =
       { LANG = config.i18n.defaultLocale;
         LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
       };
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 9e212847e48..e3ddf9e3c5f 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -19,6 +19,7 @@ in
       default = {};
       description = ''
         A set of environment variables used in the global environment.
+        These variables will be set on shell initialisation.
         The value of each variable can be either a string or a list of
         strings.  The latter is concatenated, interspersed with colon
         characters.
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
new file mode 100644
index 00000000000..b30c4e06475
--- /dev/null
+++ b/nixos/modules/config/system-environment.nix
@@ -0,0 +1,56 @@
+# This module defines a system-wide environment that will be
+# initialised by pam_env (that is, not only in shells).
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.environment;
+
+in
+
+{
+
+  options = {
+
+    environment.systemVariables = mkOption {
+      default = {};
+      description = ''
+        A set of environment variables used in the global environment.
+        These variables will be set by PAM.
+        The value of each variable can be either a string or a list of
+        strings.  The latter is concatenated, interspersed with colon
+        characters.
+      '';
+      type = types.attrsOf (mkOptionType {
+        name = "a string or a list of strings";
+        merge = loc: defs:
+          let
+            defs' = filterOverrides defs;
+            res = (head defs').value;
+          in
+          if isList res then concatLists (getValues defs')
+          else if lessThan 1 (length defs') then
+            throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
+          else if !isString res then
+            throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
+          else res;
+      });
+      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
+    };
+
+  };
+
+  config = {
+
+    system.build.pamEnvironment = pkgs.writeText "pam-environment"
+       ''
+         ${concatStringsSep "\n" (
+           (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
+             (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))}
+       '';
+
+  };
+
+}
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 65703d8bb08..4f7fc9ab262 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -30,7 +30,7 @@ in
 
   config = {
 
-    environment.variables.TZDIR = "/etc/zoneinfo";
+    environment.systemVariables.TZDIR = "/etc/zoneinfo";
 
     systemd.globalEnvironment.TZDIR = tzdir;
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4ceb48989be..a6e0e018669 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -14,6 +14,7 @@
   ./config/power-management.nix
   ./config/pulseaudio.nix
   ./config/shells-environment.nix
+  ./config/system-environment.nix
   ./config/swap.nix
   ./config/sysctl.nix
   ./config/system-path.nix
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index aa9aec07834..c26c962b20a 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -19,13 +19,16 @@ in
     environment.variables =
       { LOCATE_PATH = "/var/cache/locatedb";
         NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
-        NIX_PATH =
+        PAGER = "less -R";
+        EDITOR = "nano";
+      };
+
+    environment.systemVariables =
+      { NIX_PATH =
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixpkgs=/etc/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
           ];
-        PAGER = "less -R";
-        EDITOR = "nano";
       };
 
     environment.profiles =
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index f159e359f96..57764dc870f 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -12,9 +12,11 @@ with lib;
         }
       ];
 
-    environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
-    environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
-    environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
+    environment.systemVariables =
+      { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+        CURL_CA_BUNDLE         = "/etc/ssl/certs/ca-bundle.crt";
+        GIT_SSL_CAINFO         = "/etc/ssl/certs/ca-bundle.crt";
+      };
 
   };
 
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 6a5eb4c720f..02340fd78e8 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -186,6 +186,7 @@ let
               "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
 
           # Session management.
+          session required pam_env.so envfile=${config.system.build.pamEnvironment}
           session required pam_unix.so
           ${optionalString cfg.setLoginUid
               "session required pam_loginuid.so"}
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index cce1e785563..e8ed545c8cc 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -58,9 +58,6 @@ in
         # Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead.
 
         # Environment variables to keep for root and %wheel.
-        Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
-        Defaults:root,%wheel env_keep+=NIX_CONF_DIR
-        Defaults:root,%wheel env_keep+=NIX_PATH
         Defaults:root,%wheel env_keep+=TERMINFO_DIRS
         Defaults:root,%wheel env_keep+=TERMINFO
 
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4bfd6268234..f373657b791 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -318,7 +318,7 @@ in
       };
 
     # Set up the environment variables for running Nix.
-    environment.variables = cfg.envVars;
+    environment.systemVariables = cfg.envVars;
 
     environment.extraInit =
       ''

From 3d2091b9fa108da6a1971414143112cb6443e9e1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 10 Jun 2014 13:19:57 +0200
Subject: [PATCH 219/221] filezilla: update from 3.8.0 to 3.8.1, potentially
 fixes CVE-2013-4668

---
 pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index e88cf5b3f73..5f695f80b19 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK28, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite }:
 
-let version = "3.8.0"; in
+let version = "3.8.1"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "02635sh88zvmqhqs7yx982dmfa1qd0rhk4z1fqvgh5pr2ac1r74d";
+    sha256 = "0kqyz8yb15kbzx02l3riswg95prbp402k4672nwxrzs35049rg36";
   };
 
   configureFlags = [

From 2e3c0f2d307425a4e200335ff7757ba220f4e929 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 10 Jun 2014 14:40:16 +0200
Subject: [PATCH 220/221] vimb: Upgrade from 2.2 to 2.4

---
 pkgs/applications/networking/browsers/vimb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 6cb52be775c..8a3ff788d42 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -4,16 +4,16 @@
 
 stdenv.mkDerivation rec {
   name = "vimb-${version}";
-  version = "2.2";
+  version = "2.4";
 
   src = fetchurl {
     url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
-    sha256 = "18gig6rcxv0i4a8mz3jv29zpj0323zw45jsg1ycx61a08rzag60m";
+    sha256 = "167ilbsd4y4zl493k6g4j5v85y784qz8z7qflzd1ccsjjznv7fm8";
   };
 
   # Nixos default ca bundle
   patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/default.h
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/setting.c
   '';
 
   buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];

From bd7f3fbf0f1294e5b32caacbfa66b984aec85c5f Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 10 Jun 2014 14:58:29 +0200
Subject: [PATCH 221/221] python-ldap-2.4.15

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 13edd419076..c75f329a391 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5800,11 +5800,11 @@ rec {
   });
 
   ldap = buildPythonPackage rec {
-    name = "ldap-2.4.10";
+    name = "ldap-2.4.15";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz";
-      sha256 = "0m6fm2alcb5v9xdcjv2nw2lhz9nnd3mnr5lrmf397hi4pw0pik37";
+      url = "http://pypi.python.org/packages/source/p/python-ldap/python-${name}.tar.gz";
+      sha256 = "0w0nn5yj0nbbkvpbqgfni56v7sjx6jf6s6zvp9zmahyrvqrsrg1h";
     };
 
     NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl";