From 147fd1ff127d8542cf8f0ce334a23b04bf492114 Mon Sep 17 00:00:00 2001
From: wmertens <Wout.Mertens@gmail.com>
Date: Wed, 25 Jun 2014 15:52:05 +0200
Subject: [PATCH 001/167] virtualbox: Fix permissions for /dev/vboxdrvu

See https://bugs.archlinux.org/task/38314 and https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Installer/linux/installer-common.sh?rev=47894#L28
---
 nixos/modules/programs/virtualbox.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
index 10e657abd3c5..e2dd76219eb0 100644
--- a/nixos/modules/programs/virtualbox.nix
+++ b/nixos/modules/programs/virtualbox.nix
@@ -14,6 +14,7 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
   services.udev.extraRules =
     ''
       KERNEL=="vboxdrv",    OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
+      KERNEL=="vboxdrvu",   OWNER="root", GROUP="root",      MODE="0666", TAG+="systemd"
       KERNEL=="vboxnetctl", OWNER="root", GROUP="root",      MODE="0600", TAG+="systemd"
       SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
       SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"

From 9af1e2ab516ceac1d4dc100dbf561418bc3d7c13 Mon Sep 17 00:00:00 2001
From: Alex Berg <chexxor@users.noreply.github.com>
Date: Thu, 8 May 2014 22:20:08 +0200
Subject: [PATCH 002/167] Add ZNC module. Has zncConfOptions or specify full
 conf file.

---
 nixos/modules/misc/ids.nix                |   2 +
 nixos/modules/module-list.nix             |   1 +
 nixos/modules/services/networking/znc.nix | 294 ++++++++++++++++++++++
 3 files changed, 297 insertions(+)
 create mode 100644 nixos/modules/services/networking/znc.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index f1028a479dff..c72ae831e228 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -134,6 +134,7 @@
       teamspeak = 124;
       influxdb = 125;
       nsd = 126;
+      znc = 127;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -242,6 +243,7 @@
       teamspeak = 124;
       influxdb = 125;
       nsd = 126;
+      znc = 127;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 13f2656c2873..20bb17c1fb33 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -235,6 +235,7 @@
   ./services/networking/wicd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
+  ./services/networking/znc.nix
   ./services/printing/cupsd.nix
   ./services/scheduling/atd.nix
   ./services/scheduling/cron.nix
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
new file mode 100644
index 000000000000..a40fd924741b
--- /dev/null
+++ b/nixos/modules/services/networking/znc.nix
@@ -0,0 +1,294 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+
+let
+  cfg = config.services.znc;
+
+  defaultUser = "znc"; # Default user to own process.
+
+  # Default user and pass:
+  # un=znc
+  # pw=nixospass
+
+  defaultUserName = "znc";
+  defaultPassBlock = "
+        <Pass password>
+                Method = sha256
+                Hash = e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93
+                Salt = l5Xryew4g*!oa(ECfX2o
+        </Pass>
+  ";
+
+  confOptions = { ... }: {
+    options = {
+      modules = mkOption {
+        type = types.listOf types.string;
+        default = [ "partyline" "webadmin" "adminlog" "log" ];
+        example = [ "partyline" "webadmin" "adminlog" "log" ];
+        description = ''
+          A list of modules to include in the `znc.conf` file.
+        '';
+      };
+
+      userName = mkOption {
+        default = defaultUserName;
+        example = "johntron";
+        type = types.string;
+        description = ''
+          The user name to use when generating the `znc.conf` file.
+          This is the user name used by the user logging into the ZNC web admin. 
+        '';
+      };
+
+      nick = mkOption {
+        default = "znc-user";
+        example = "john";
+        type = types.string;
+        description = ''
+          The IRC nick to use when generating the `znc.conf` file.
+        '';
+      };
+
+      passBlock = mkOption {
+        default = defaultPassBlock;
+        example = "Must be the block generated by the `znc --makepass` command.";
+        type = types.string;
+        description = ''
+          The pass block to use when generating the `znc.conf` file.
+          This is the password used by the user logging into the ZNC web admin.
+          This is the block generated by the `znc --makepass` command.
+          !!! If not specified, please change this after starting the service. !!!
+        '';
+      };
+
+      port = mkOption {
+        default = "5000";
+        example = "5000";
+        type = types.string;
+        description = ''
+          Specifies the port on which to listen.
+        '';
+      };
+ 
+      useSSL = mkOption {
+        default = true;
+        example = true;
+        type = types.bool;
+        description = ''
+          Indicates whether the ZNC server should use SSL when listening on the specified port.
+        '';
+      };
+
+    };
+  };
+
+  # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
+  mkZncConf = confOpts: ''
+    // Also check http://en.znc.in/wiki/Configuration
+    
+    AnonIPLimit = 10
+    ConnectDelay = 5
+    # Add `LoadModule = x` for each module...
+    ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
+    MaxBufferSize = 500
+    ProtectWebSessions = true
+    SSLCertFile = ${cfg.dataDir}/znc.pem
+    ServerThrottle = 30
+    Skin = dark-clouds
+    StatusPrefix = *
+    Version = 1.2
+
+    <Listener listener0>
+            AllowIRC = true
+            AllowWeb = true
+            IPv4 = true
+            IPv6 = false
+            Port = ${if confOpts.useSSL then "+" else ""}${confOpts.port}
+            SSL = ${if confOpts.useSSL then "true" else "false"}
+    </Listener>
+    
+    <User ${confOpts.userName}>
+            Admin = true
+            Allow = *
+            AltNick = ${confOpts.nick}_
+            AppendTimestamp = false
+            AutoClearChanBuffer = false
+            Buffer = 150
+            ChanModes = +stn
+            DenyLoadMod = false
+            DenySetBindHost = false
+            Ident = ident
+            JoinTries = 10
+            MaxJoins = 0
+            MaxNetworks = 1
+            MultiClients = true
+            Nick = ${confOpts.nick}
+            PrependTimestamp = true
+            QuitMsg = Quit
+            RealName = ${confOpts.nick}
+            TimestampFormat = [%H:%M:%S]
+            
+            ${confOpts.passBlock}
+    </User>
+  '';
+
+  zncConfFile = pkgs.writeTextFile {
+    name = "znc.conf";
+    text = if cfg.zncConf != ""
+      then cfg.zncConf
+      else mkZncConf cfg.confOptions;
+  };
+
+in
+
+{
+
+  ###### Interface
+
+  options = {
+    services.znc = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = ''
+          Enable a ZNC service for a user.
+        '';
+      };
+
+      user = mkOption {
+        default = "znc";
+        example = "john";
+        type = types.string;
+        description = ''
+          The name of an existing user account to use to own the ZNC server process.
+          If not specified, a default user will be created to own the process.
+        '';
+      };
+
+      dataDir = mkOption {
+        default = "/home/${cfg.user}/.znc";
+        example = "/home/john/.znc";
+        type = types.string; 
+        description = ''
+          The data directory. Used for configuration files and modules.
+        '';
+      };
+
+      zncConf = mkOption {
+        default = "";
+        example = "See: http://wiki.znc.in/Configuration";
+        type = types.string;
+        description = ''
+          The contents of the `znc.conf` file to use when creating it.
+          If specified, `confOptions` will be ignored, and this value, as-is, will be used.
+          If left empty, a conf file with default values will be used.
+          Recommended to generate with `znc --makeconf` command.
+        '';
+      };
+
+      confOptions = mkOption {
+        default = {};
+        example = {
+          modules = [ "log" ];
+          userName = "john";
+          nick = "johntron";
+        };
+        type = types.optionSet;
+        description = ''
+          Values to use when creating a `znc.conf` file.
+        '';
+        options = confOptions; 
+      };
+ 
+      mutable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = ''
+          Indicates whether to allow the contents of the `dataDir` directory to be changed
+          by the user at run-time.
+          If true, modifications to the ZNC configuration after its initial creation are not 
+            overwritten by a NixOS system rebuild.
+          If false, the ZNC configuration is rebuilt by every system rebuild.
+          If the user wants to manage the ZNC service using the web admin interface, this value
+            should be set to true.
+        '';
+      };
+ 
+      extraFlags = mkOption {
+        default = "";
+        example = "--debug";
+        type = types.string;
+        description = ''
+          Extra flags to use when executing znc command.
+        '';
+      };
+    };
+  };
+
+
+  ###### Implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services."znc-${cfg.user}" = {
+      description = "ZNC Server of ${cfg.user}.";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.service" ];
+      path = [ pkgs.znc ];
+      serviceConfig = {
+        User = "${cfg.user}";
+        Restart = "always";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        ExecStop   = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
+      };
+      preStart = ''
+        ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}
+        ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir} -R
+        ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs
+
+        # If mutable, regenerate conf file every time.
+        ${optionalString (!cfg.mutable) ''
+          ${pkgs.coreutils}/echo "znc-${cfg.user} is set to be system-managed. Now deleting old znc.conf file to be regenerated."
+          ${pkgs.coreutils}/rm -f ${cfg.dataDir}/configs/znc.conf
+        ''}
+
+        # Ensure essential files exist.
+        if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
+          ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
+          ${if (!cfg.mutable)
+            then "${pkgs.coreutils}/bin/ln --force -s ${zncConfFile} ${cfg.dataDir}/configs/znc.conf"
+            else ''
+              ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf
+              ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
+              ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
+            ''}
+        fi
+
+        if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
+          ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
+          ${pkgs.znc}/bin/znc --makepem
+        fi
+      '';
+      script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${cfg.extraFlags}";
+    };
+
+    users.extraUsers = optional (cfg.user == defaultUser)
+      { name = defaultUser;
+        description = "ZNC server daemon owner";
+        group = defaultUser;
+        uid = config.ids.uids.znc;
+        createHome = true;
+        createUser = true;
+      };
+ 
+    users.extraGroups = optional (cfg.user == defaultUser)
+      { name = defaultUser;
+        gid = config.ids.gids.znc;
+        members = [ defaultUser ];
+      };
+
+  };
+}

From 6f946bbb2a97c64100cb1a7b49c5951537ed6b7c Mon Sep 17 00:00:00 2001
From: Paul Colomiets <paul@colomiets.name>
Date: Sun, 29 Jun 2014 15:45:20 +0300
Subject: [PATCH 003/167] Add `NIX_MYENV_NAME` environment variable in
 `myEnvFun`

---
 pkgs/misc/my-env/loadenv.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh
index 6752d1c03b5f..a162f8b853ac 100644
--- a/pkgs/misc/my-env/loadenv.sh
+++ b/pkgs/misc/my-env/loadenv.sh
@@ -6,6 +6,7 @@ source @myenvpath@
 
 PATH="$PATH:$OLDPATH"
 export PS1="\n@name@:[\u@\h:\w]\$ "
+export NIX_MYENV_NAME="@name@"
 export buildInputs
 export NIX_STRIP_DEBUG=0
 export TZ="$OLDTZ"

From b598497da9ed2ff511f1024ed7eb6e557425b579 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Wed, 25 Jun 2014 14:08:12 +0200
Subject: [PATCH 004/167] Adds easy-format

---
 .../ocaml-modules/easy-format/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/easy-format/default.nix

diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix
new file mode 100644
index 000000000000..d01a4edf26ec
--- /dev/null
+++ b/pkgs/development/ocaml-modules/easy-format/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, ocaml, findlib}:
+let
+  pname = "easy-format";
+  version = "1.0.2";
+  webpage = "http://mjambon.com/${pname}.html";
+in
+stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
+    sha256 = "07wlgprqvk92z0p2xzbnvh312ca6gvhy3xc6hxlqfawnnnin7rzi";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "A high-level and functional interface to the Format module of the OCaml standard library";
+    homepage = "${webpage}";
+    license = "bsd";
+  };
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 796da97595ec..5145a65a5f3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3183,6 +3183,8 @@ let
 
     deriving = callPackage ../development/tools/ocaml/deriving { };
 
+    easy-format = callPackage ../development/ocaml-modules/easy-format { };
+
     findlib = callPackage ../development/tools/ocaml/findlib { };
 
     dypgen = callPackage ../development/ocaml-modules/dypgen { };

From 7987cd2cc1d80cc2ce146a77b302e8245ec342d9 Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Mon, 30 Jun 2014 00:38:05 +0200
Subject: [PATCH 005/167] added luaexpat 1.3.0

---
 lib/maintainers.nix                           |  1 +
 pkgs/development/interpreters/lua-5/expat.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/interpreters/lua-5/expat.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fae54c3d9c92..f2fe38e8e56c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -38,6 +38,7 @@
   emery = "Emery Hemingway <emery@vfemail.net>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
+  flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix
new file mode 100644
index 000000000000..a2b42cb37c53
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/expat.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, lua5, expat }:
+
+stdenv.mkDerivation rec {
+  version = "1.3.0";
+  name = "lua-expat-${version}";
+  isLibrary = true;
+  src = fetchurl {
+    url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz";
+    sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h";
+  };
+
+  buildInputs = [ lua5 expat ];
+
+  preBuild = ''
+    makeFlagsArray=(
+      LUA_LDIR="$out/share/lua/${lua5.luaversion}"
+      LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}"
+      EXPAT_INC="-I${expat}/include");
+  '';
+
+  meta = {
+    homepage = "http://matthewwild.co.uk/projects/luaexpat";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.flosse ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfb4ac4ba823..57a331350995 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3453,6 +3453,7 @@ let
   lua5 = lua5_1;
 
   lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};
+  lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
 
   luarocks = callPackage ../development/tools/misc/luarocks {
      lua = lua5;

From 807cd4b4d40813ff1d801b0b17de3c421a465b1b Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Mon, 30 Jun 2014 03:39:15 +0200
Subject: [PATCH 006/167] use wrapper to set LUA_PATH variable

---
 pkgs/development/interpreters/lua-5/5.1.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 9a57a034ad19..e004a30fe20b 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, readline }:
+{ stdenv, fetchurl, readline, makeWrapper }:
 
 let
   dsoPatch = fetchurl {
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
   };
 
-  buildInputs = [ readline ];
+  buildInputs = [ readline makeWrapper ];
 
   patches = if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ];
 
-  configurePhase = 
+  configurePhase =
     if stdenv.isDarwin
     then ''
     makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDLAGS="" )
@@ -35,6 +35,9 @@ stdenv.mkDerivation rec {
     sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|"
     mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
     rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua
+    wrapProgram $out/bin/lua \
+      --set LUA_PATH  '$HOME/.nix-profile/lib/lua/5.1/?.lua' \
+      --set LUA_CPATH '$HOME/.nix-profile/lib/lua/5.1/?.so'
   '';
 
   meta = {

From eb851b6a195bcb04a1756631faa3d88d16234c1a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 30 Jun 2014 14:30:45 +0200
Subject: [PATCH 007/167] Fixed dwb startup issue

---
 pkgs/applications/networking/browsers/dwb/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 40b875c8c577..ffac2b003ddb 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkit, gtk3, gnutls, json_c,
-  m4, glib_networking, gsettings_desktop_schemas }:
+  m4, glib_networking, gsettings_desktop_schemas, dconf }:
 
 stdenv.mkDerivation {
   name = "dwb-2014-06-03";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   preFixup=''
     wrapProgram "$out/bin/dwb" \
-     --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+     --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \
      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
     wrapProgram "$out/bin/dwbem" \
      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e9a517d89b8..ba14be53275a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8169,7 +8169,7 @@ let
 
   dvdauthor = callPackage ../applications/video/dvdauthor { };
 
-  dwb = callPackage ../applications/networking/browsers/dwb { };
+  dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
 
   dwm = callPackage ../applications/window-managers/dwm {
     patches = config.dwm.patches or [];

From ea4207f7a35dd350ae122344665d1a858e581e32 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 30 Jun 2014 16:10:04 +0200
Subject: [PATCH 008/167] makeself: bump to 2.2.0

---
 pkgs/applications/misc/makeself/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 9ea5f18ee629..e433b83cdeb5 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "makeself-2.1.5";
-  src = fetchurl {
-    url = "http://megastep.org/makeself/makeself.run";
-    sha256 = "0khs19xpid4ng0igrjyz3vsi6a5xyixrrrhgdxpdhd2wnf5nc9w2";
+  name = "makeself-2.2.0";
+  src = fetchgit {
+    url = "https://github.com/megastep/makeself.git";
+    rev = "b836b9281ae99abe1865608b065551da56c80719";
+    sha256 = "f7c97f0f8ad8128f2f1b54383319f2cc44cbb05b60ced222784debdf326f23ad";
   };
-  unpackPhase = "sh ${src}";
   installPhase = ''
-    cd ${name}
     mkdir -p $out/{bin,share/{${name},man/man1}}
-    mv makeself.lsm README $out/share/${name}
+    mv makeself.lsm README.md $out/share/${name}
     mv makeself.sh $out/bin/makeself
     mv makeself.1  $out/share/man/man1/
     mv makeself-header.sh $out/share/${name}
     sed -e 's|HEADER=`dirname $0`/makeself-header.sh|HEADER=`dirname $0`/../share/${name}/makeself-header.sh|' -i $out/bin/makeself
   '';
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://megastep.org/makeself;
     description = "Utility to create self-extracting packages";
+    license = licenses.gpl2;
+    maintainer = maintainers.wmertens;
+    platforms = platforms.all;
   };
 }

From 8e7fded9c963ba00b49188b6e5c13a90936530df Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 30 Jun 2014 16:10:50 +0200
Subject: [PATCH 009/167] vte: store patch in repo, source offline

---
 pkgs/desktops/gnome-2/desktop/vte/default.nix |  7 +---
 .../vte/vte-0.28.2-limit-arguments.patch      | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch

diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index aca30f87dfc4..30c8bf07d418 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -11,11 +11,8 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./alt.patch
-    ( fetchurl { # CVE-2012-2738
-      url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/"
-        + "vte/files/vte-0.28.2-limit-arguments.patch?revision=1.1";
-      sha256 = "1s8agx74wa7wlv9ybd5h3dp4hzf4ddg7piyan37g2ab3fnvg4jhn";
-    } )
+    # CVE-2012-2738
+    ./vte-0.28.2-limit-arguments.patch
   ];
 
   buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
diff --git a/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch b/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch
new file mode 100644
index 000000000000..fd454079390f
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/vte/vte-0.28.2-limit-arguments.patch
@@ -0,0 +1,40 @@
+From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 19 May 2012 17:36:09 +0000
+Subject: emulation: Limit integer arguments to 65535
+
+To guard against malicious sequences containing excessively big numbers,
+limit all parsed numbers to 16 bit range. Doing this here in the parsing
+routine is a catch-all guard; this doesn't preclude enforcing
+more stringent limits in the handlers themselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676090
+---
+diff --git a/src/table.c b/src/table.c
+index 140e8c8..85cf631 100644
+--- a/src/table.c
++++ b/src/table.c
+@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
+ 		if (G_UNLIKELY (*array == NULL)) {
+ 			*array = g_value_array_new(1);
+ 		}
+-		g_value_set_long(&value, total);
++		g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
+ 		g_value_array_append(*array, &value);
+ 	} while (i++ < arginfo->length);
+ 	g_value_unset(&value);
+diff --git a/src/vteseq.c b/src/vteseq.c
+index 457c06a..46def5b 100644
+--- a/src/vteseq.c
++++ b/src/vteseq.c
+@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
+                               GValueArray *params,
+                               VteTerminalSequenceHandler handler)
+ {
+-        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
++        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
+ }
+ 
+ static void
+--
+cgit v0.9.0.2

From c3c41f4ba04be377641b06147c4a6694b7581487 Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Mon, 30 Jun 2014 16:16:38 +0200
Subject: [PATCH 010/167] nc-indicators 0.1 -> 0.2

---
 pkgs/applications/misc/nc-indicators/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix
index a33cfbdf159a..e3a1708326cd 100644
--- a/pkgs/applications/misc/nc-indicators/default.nix
+++ b/pkgs/applications/misc/nc-indicators/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "nc-indicators";
-  version = "0.1";
-  sha256 = "19amwfcbwfxcj0gr7w0vgxl427l43q3l2s3n3zsxhqwkfblxmfy5";
+  version = "0.2";
+  sha256 = "0z3h0d3cl0xapysq5sh1rnbp8fg8adlq0x3i4ql9xin9in29q27q";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ attoparsec gtk hflags lens pipes stm ];
   meta = {
-    homepage = "https://github.com/nilcons/nc-indicators/issues";
+    homepage = "https://github.com/nilcons/nc-indicators";
     description = "CPU load and memory usage indicators for i3bar";
     license = self.stdenv.lib.licenses.asl20;
     platforms = self.ghc.meta.platforms;

From bc53465f766664b4956138ab234995f2a1d3b08f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 1 Jul 2014 08:59:51 +0800
Subject: [PATCH 011/167] add python-discid, a binding of libdiscid by
 MusicBrainz

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 17b36a887e0a..2db19dbdf8bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -67,6 +67,28 @@ rec {
     inherit python;
   };
 
+  discid = buildPythonPackage rec {
+    name = "discid-1.1.0";
+
+    meta = with stdenv.lib; {
+      description = "Python binding of libdiscid";
+      homepage    = "https://python-discid.readthedocs.org/";
+      license     = licenses.lgpl3Plus;
+      platforms   = platforms.linux;
+      maintainer  = with maintainers; [ iyzsong ];
+    };
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/d/discid/${name}.tar.gz";
+      md5 = "2ad2141452dd10b03ad96ccdad075235";
+    };
+
+    patchPhase = ''
+      substituteInPlace discid/libdiscid.py \
+        --replace '_open_library(_LIB_NAME)' "_open_library('${pkgs.libdiscid}/lib/libdiscid.so.0')"
+    '';
+  };
+
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;

From 25b53cddb4020a793f1d8340ce26c97a0ae4b87a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 29 Jun 2014 23:57:55 -0400
Subject: [PATCH 012/167] iomelt: new package

This adds the IOMelt pacakge, "a simple yet effective way to benchmark disk IO
in Linux systems."
---
 pkgs/os-specific/linux/iomelt/default.nix | 25 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/os-specific/linux/iomelt/default.nix

diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix
new file mode 100644
index 000000000000..df267d304c15
--- /dev/null
+++ b/pkgs/os-specific/linux/iomelt/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchurl }:
+
+let version = "0.7";
+in stdenv.mkDerivation {
+  name = "iomelt-${version}";
+  src = fetchurl {
+    url = "http://iomelt.com/s/iomelt-${version}.tar.gz";
+    sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im";
+  };
+
+  preBuild = ''
+    ensureDir $out/bin
+    ensureDir $out/share/man/man1
+
+    substituteInPlace Makefile \
+      --replace /usr $out
+  '';
+
+  meta = with lib; {
+    description = "A simple yet effective way to benchmark disk IO in Linux systems";
+    homepage    = http://www.iomelt.com;
+    maintainers = with maintainers; [ cstrahan ];
+    platforms   = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfb4ac4ba823..3f9f7e24f190 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7151,6 +7151,8 @@ let
 
   ifplugd = callPackage ../os-specific/linux/ifplugd { };
 
+  iomelt = callPackage ../os-specific/linux/iomelt { };
+
   iotop = callPackage ../os-specific/linux/iotop { };
 
   iproute = callPackage ../os-specific/linux/iproute { };

From 60ccbebc4e46354ce5c2b0ec2bdbe5a01f30bdd3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 10:22:09 +0400
Subject: [PATCH 013/167] Create some meta for the AnonymousPro font

---
 pkgs/data/fonts/anonymous-pro/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index 21a1c9bf5c85..cca775d941e1 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -40,6 +40,9 @@ rec {
     ];
     platforms = with a.lib.platforms;
       all;
+    license = with a.lib.licenses; ofl;
+    hydraPlatforms = [];
+    homepage = "http://www.marksimonson.com/fonts/view/anonymous-pro";
   };
   passthru = {
     updateInfo = {

From 5ed1adbbd4bcf1e3372d42fd73b0bfddbe4b84a8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 11:04:36 +0400
Subject: [PATCH 014/167] Update Blobby Volley

---
 pkgs/games/blobby/default.nix      | 18 +++++++++++-------
 pkgs/games/blobby/default.upstream |  8 ++++++++
 pkgs/top-level/all-packages.nix    |  4 +---
 3 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/games/blobby/default.upstream

diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index faf7366f2494..801b7ea72770 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -1,17 +1,18 @@
-{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:
+{stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib
+, pkgconfig}:
 stdenv.mkDerivation rec {
-  version = "1.0-rc3";
+  version = "1.0";
   name = "blobby-volley-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC3/blobby2-linux-1.0rc3.tar.gz";
-    sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5";
+    url = "http://softlayer-ams.dl.sourceforge.net/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz";
+    sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms";
   };
 
-  buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib];
+  buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig];
 
-  preConfigure = ''
-    sed -re '1i#include <cassert>' -i src/CrossCorrelation.h
+  preConfigure=''
+    sed -e '1i#include <iostream>' -i src/NetworkMessage.cpp
   '';
 
   meta = {
@@ -19,5 +20,8 @@ stdenv.mkDerivation rec {
     license = with stdenv.lib.licenses; bsd3;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
+    homepage = "http://blobby.sourceforge.net/";
+    downloadPage = "http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/";
+    inherit version;
   };
 }
diff --git a/pkgs/games/blobby/default.upstream b/pkgs/games/blobby/default.upstream
new file mode 100644
index 000000000000..e9ab417f5d20
--- /dev/null
+++ b/pkgs/games/blobby/default.upstream
@@ -0,0 +1,8 @@
+url http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/
+SF_version_dir
+version_link '[.]tar[.][^.]+/download$'
+SF_redirect
+do_overwrite(){
+  do_overwrite_just_version
+  set_var_value url $CURRENT_URL
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c40c92b57e1..dcd23c172cf6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10086,9 +10086,7 @@ let
 
   blackshadeselite = callPackage ../games/blackshadeselite { };
 
-  blobby = callPackage ../games/blobby {
-    boost = boost149;
-  };
+  blobby = callPackage ../games/blobby { };
 
   bsdgames = callPackage ../games/bsdgames { };
 

From 2e12709a2688232af9d752490f36127a3e8c7cba Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 11:28:35 +0400
Subject: [PATCH 015/167] Allow update-walker to run directly from meta
 attributes

---
 .../upstream-updater/update-walker.sh         | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh
index bc58f935f815..8aa9e723a3a2 100755
--- a/pkgs/build-support/upstream-updater/update-walker.sh
+++ b/pkgs/build-support/upstream-updater/update-walker.sh
@@ -2,12 +2,14 @@
 
 own_dir="$(cd "$(dirname "$0")"; pwd)"
 
+URL_WAS_SET=
 CURRENT_URL=
 CURRENT_REV=
 PREFETCH_COMMAND=
 NEED_TO_CHOOSE_URL=1
 
 url () {
+  URL_WAS_SET=1
   CURRENT_URL="$1"
 }
 
@@ -101,14 +103,25 @@ ensure_name () {
 
 ensure_attribute_name () {
   echo "Ensuring attribute name. CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2
+  ensure_name
   [ -z "$CURRENT_ATTRIBUTE_NAME" ] && attribute_name "$CURRENT_NAME"
   echo "Resulting attribute name: $CURRENT_ATTRIBUTE_NAME"
 }
 
+ensure_url () {
+  echo "Ensuring starting URL. CURRENT_URL: $CURRENT_URL" >&2
+  ensure_attribute_name
+  [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta downloadPage)"
+  [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta downloadpage)"
+  [ -z "$CURRENT_URL" ] && CURRENT_URL="$(retrieve_meta homepage)"
+  echo "Resulting URL: $CURRENT_URL"
+}
+
 ensure_choice () {
   echo "Ensuring that choice is made." >&2
   echo "NEED_TO_CHOOSE_URL: [$NEED_TO_CHOOSE_URL]." >&2
   echo "CURRENT_URL: $CURRENT_URL" >&2
+  [ -z "$URL_WAS_SET" ] && [ -z "$CURRENT_URL" ] && ensure_url
   [ -n "$NEED_TO_CHOOSE_URL" ] && {
     version_link '[.]tar[.]([^./])+$'
     unset NEED_TO_CHOOSE_URL
@@ -153,8 +166,12 @@ attribute_name () {
   echo "CURRENT_ATTRIBUTE_NAME: $CURRENT_ATTRIBUTE_NAME" >&2
 }
 
+retrieve_meta () {
+  nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_ATTRIBUTE_NAME".meta."$1" | xargs
+}
+
 retrieve_version () {
-  PACKAGED_VERSION="$(nix-instantiate --eval-only '<nixpkgs>' -A "$CURRENT_ATTRIBUTE_NAME".meta.version | xargs)"
+  PACKAGED_VERSION="$(retrieve_meta version)"
 }
 
 directory_of () {
@@ -256,7 +273,24 @@ process_config () {
   CONFIG_DIR="$(directory_of "$1")"
   CONFIG_NAME="$(basename "$1")"
   BEGIN_EXPRESSION='# Generated upstream information';
-  source "$CONFIG_DIR/$CONFIG_NAME"
+  if [ -f  "$CONFIG_DIR/$CONFIG_NAME" ] &&
+      [ "${CONFIG_NAME}" = "${CONFIG_NAME%.nix}" ]; then
+    source "$CONFIG_DIR/$CONFIG_NAME"
+  else
+    CONFIG_NAME="${CONFIG_NAME%.nix}"
+    ensure_attribute_name
+    [ -n "$(retrieve_meta updateWalker)" ] ||
+        [ -n "$FORCE_UPDATE_WALKER" ] || {
+      echo "Error: package not marked as safe for update-walker" >&2
+      echo "Set FORCE_UPDATE_WALKER=1 to override" >&2
+      exit 1;
+    }
+    [ -z "$(retrieve_meta fullRegenerate)" ] && eval "
+      do_overwrite(){
+        do_overwrite_just_version
+      }
+    "
+  fi
   ensure_name
   ensure_attribute_name
   retrieve_version

From 0fcee205227604ed690407ebc94f06df1eb7ede2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 11:48:46 +0400
Subject: [PATCH 016/167] Allow pure-meta updates to specify tarball regexp

---
 .../upstream-updater/update-walker.sh             | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh
index 8aa9e723a3a2..ef0754289c4f 100755
--- a/pkgs/build-support/upstream-updater/update-walker.sh
+++ b/pkgs/build-support/upstream-updater/update-walker.sh
@@ -3,6 +3,7 @@
 own_dir="$(cd "$(dirname "$0")"; pwd)"
 
 URL_WAS_SET=
+DL_URL_RE=
 CURRENT_URL=
 CURRENT_REV=
 PREFETCH_COMMAND=
@@ -13,6 +14,10 @@ url () {
   CURRENT_URL="$1"
 }
 
+dl_url_re () {
+  DL_URL_RE="$1"
+}
+
 version_unpack () {
   sed -re '
     s/[.]/ /g; 
@@ -123,7 +128,7 @@ ensure_choice () {
   echo "CURRENT_URL: $CURRENT_URL" >&2
   [ -z "$URL_WAS_SET" ] && [ -z "$CURRENT_URL" ] && ensure_url
   [ -n "$NEED_TO_CHOOSE_URL" ] && {
-    version_link '[.]tar[.]([^./])+$'
+    version_link "${DL_URL_RE:-'[.]tar[.]([^./])+$'}"
     unset NEED_TO_CHOOSE_URL
   }
   [ -z "$CURRENT_URL" ] && {
@@ -174,6 +179,12 @@ retrieve_version () {
   PACKAGED_VERSION="$(retrieve_meta version)"
 }
 
+ensure_dl_url_re () {
+  echo "Ensuring DL_URL_RE. DL_URL_RE: $DL_URL_RE" >&2
+  [ -z "$DL_URL_RE" ] && dl_url_re "$(retrieve_meta downloadURLRegexp)"
+  echo "DL_URL_RE: $DL_URL_RE" >&2
+}
+
 directory_of () {
   cd "$(dirname "$1")"; pwd
 }
@@ -291,9 +302,9 @@ process_config () {
       }
     "
   fi
-  ensure_name
   ensure_attribute_name
   retrieve_version
+  ensure_dl_url_re
   ensure_choice
   ensure_version
   ensure_target

From 4f4a378a020476ddad6edf21d1e0855f4628a3e0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 11:51:28 +0400
Subject: [PATCH 017/167] Update lib re

---
 pkgs/development/libraries/libre/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index cc9139d664ea..c67df46e89c0 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.9";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "1c99ygs46qhd4a0ardxhdyjaw5p8clhzmsm8jydqxnmbakwy518m";
+    sha256 = "1i98z9qw3jpkaq419189vr8h3qcxqlz40dls77rbn4c0agc69703";
   };
   buildInputs = [zlib openssl];
   makeFlags = [
@@ -19,5 +19,9 @@ stdenv.mkDerivation rec {
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = with stdenv.lib.licenses; bsd3;
+    inherit version;
+    downloadPage = "http://www.creytiv.com/pub/";
+    updateWalker = true;
+    downloadURLRegexp = "/re-.*[.]tar[.].*";
   };
 }

From 2466b0bc764f3e83482ae9a6e4ede84ee2b94e90 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 11:51:36 +0400
Subject: [PATCH 018/167] Update lib rem

---
 pkgs/development/libraries/librem/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 04f3cc97bf33..fe49609ce68d 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.6";
   name = "librem-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
-    sha256 = "55c66118e3026c5ed42d8b9e0c668149baefe83f1aa76394cddba2d72f45d5c7";
+    sha256 = "0rgqy9pqn730ijxvz1gk0virsf6jwjmq02s99jqqrfm3p0g6zs3w";
   };
   buildInputs = [zlib openssl libre];
   makeFlags = [
@@ -20,5 +20,9 @@ stdenv.mkDerivation rec {
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = with stdenv.lib.licenses; bsd3;
+    inherit version;
+    downloadPage = "http://www.creytiv.com/pub/";
+    updateWalker = true;
+    downloadURLRegexp = "/rem-.*[.]tar[.].*";
   };
 }

From 0733404aca216e91e26cd4e094808919cea140e4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 11:51:46 +0400
Subject: [PATCH 019/167] Update baresip

---
 .../networking/instant-messengers/baresip/default.nix     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 61cd62fefd46..b878427e876a 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.3";
+  version = "0.4.11";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "03vpzn0c3mybnwn84ha3yci780qsjm669dwja1srj0hbrq81rbil";
+    sha256 = "1ql5h9ily9jncp9w302v3b2ldx613kc60zlqv0v0ln8hsm8q6bc5";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
@@ -41,5 +41,9 @@ stdenv.mkDerivation rec {
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = with stdenv.lib.licenses; bsd3;
+    inherit version;
+    downloadPage = "http://www.creytiv.com/pub/";
+    updateWalker = true;
+    downloadURLRegexp = "/baresip-.*[.]tar[.].*";
   };
 }

From 3471744cbb890ae6e8dcd494d218d8767524ca6c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 11:53:47 +0400
Subject: [PATCH 020/167] Add auto-updating meta for restund

---
 pkgs/servers/restund/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix
index e817151e778d..d6952e9700ee 100644
--- a/pkgs/servers/restund/default.nix
+++ b/pkgs/servers/restund/default.nix
@@ -24,5 +24,9 @@ stdenv.mkDerivation rec {
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     license = with stdenv.lib.licenses; bsd3;
+    inherit version;
+    downloadPage = "http://www.creytiv.com/pub/";
+    updateWalker = true;
+    downloadURLRegexp = "/restund-.*[.]tar[.]";
   };
 }

From 8ed1aeb7128b48cd9de0abeef5b6693f18eca0c8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 12:01:11 +0400
Subject: [PATCH 021/167] Fix default tarball mask

---
 pkgs/build-support/upstream-updater/update-walker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh
index ef0754289c4f..e11eb722e0e4 100755
--- a/pkgs/build-support/upstream-updater/update-walker.sh
+++ b/pkgs/build-support/upstream-updater/update-walker.sh
@@ -128,7 +128,7 @@ ensure_choice () {
   echo "CURRENT_URL: $CURRENT_URL" >&2
   [ -z "$URL_WAS_SET" ] && [ -z "$CURRENT_URL" ] && ensure_url
   [ -n "$NEED_TO_CHOOSE_URL" ] && {
-    version_link "${DL_URL_RE:-'[.]tar[.]([^./])+$'}"
+    version_link "${DL_URL_RE:-[.]tar[.]([^./])+\$}"
     unset NEED_TO_CHOOSE_URL
   }
   [ -z "$CURRENT_URL" ] && {

From ce623950ada9e1ef721760f05b9e3a14604fd764 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 12:07:50 +0400
Subject: [PATCH 022/167] Update bip

---
 .../networking/irc/bip/bip-0.8.8-yyparse.patch      | 11 -----------
 pkgs/applications/networking/irc/bip/default.nix    | 13 ++++---------
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch

diff --git a/pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch b/pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch
deleted file mode 100644
index 5d48fc99a0da..000000000000
--- a/pkgs/applications/networking/irc/bip/bip-0.8.8-yyparse.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bip-0.8.8/src/lex.l.orig
-+++ bip-0.8.8/src/lex.l
-@@ -16,7 +16,7 @@
- int linec;
- #include "util.h"
- extern list_t *root_list;
--void yyparse(void);
-+int yyparse(void);
- void free_conf(list_t*);
- int conf_error;
- typedef struct bip bip_t;
diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
index 89fdf0d8df85..6f816e1db170 100644
--- a/pkgs/applications/networking/irc/bip/default.nix
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -2,8 +2,8 @@
 
 let
 
-  version = "0.8.8";
-  sha256 = "7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7";
+  version = "0.8.9";
+  sha256 = "0q942g9lyd8pjvqimv547n6vik5759r9npw3ws3bdj4ixxqhz59w";
 
   # fetches patches from a gentoo mirror
   fetchPatch =
@@ -25,19 +25,12 @@ in stdenv.mkDerivation {
 
   # includes an important security patch
   patches = map fetchPatch [
-    { file = "bip-0.8.8-configure.patch";
-      sha256 = "286e169745e6cd768f0cb95bbc9589ca2bda497eb06461174549b80a459d901c";
-    }
-    { file = "bip-CVE-2012-0806.patch";
-      sha256 = "e47523095ee1d717c762ca0195520026c6ea2c30d8adcf434d276d42f052d506";
-    }
     { file = "bip-freenode.patch";
       sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f";
     }
   ];
 
   postPatch = ''
-    patch -p1 < ${./bip-0.8.8-yyparse.patch}
   '';
 
   configureFlags = [ "--disable-pie" ];
@@ -48,5 +41,7 @@ in stdenv.mkDerivation {
     description = "An IRC proxy (bouncer)";
     homepage = http://bip.milkypond.org/;
     license = stdenv.lib.licenses.gpl2;
+    downloadPage= "https://projects.duckcorp.org/projects/bip/files";
+    inherit version;
   };
 }

From 285e1123574af2afdec113232015ed01d4a71b71 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 12:11:08 +0400
Subject: [PATCH 023/167] Allow search of updates for atop

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

diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index 39ba5dc3973e..fd4b6df95529 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -35,5 +35,8 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code.
     '';
+    inherit version;
+    downloadPage = http://atoptool.nl/downloadatop.php;
+    updateWalker = true;
   };
 }

From 8f03d888c3bce8ec35d5e8ef7bf5615de1ecacc9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 12:20:04 +0400
Subject: [PATCH 024/167] Allow auto-updating of the AnonymousPro font

---
 pkgs/data/fonts/anonymous-pro/default.nix      | 13 +++++--------
 pkgs/data/fonts/anonymous-pro/default.upstream |  6 ++++++
 2 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/data/fonts/anonymous-pro/default.upstream

diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index cca775d941e1..5b51ee36c5c7 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -10,16 +10,16 @@ let
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
-    version="1.002";
+    version = "1.002";
     name="anonymousPro";
     url="http://www.ms-studio.com/FontSales/AnonymousPro-${version}.zip";
-    hash="86665847a51cdfb58a1e1dfd8b1ba33f183485affe50b53e3304f63d3d3552ab";
+    sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = sourceInfo.sha256;
   };
 
   name = "${sourceInfo.name}-${sourceInfo.version}";
@@ -43,11 +43,8 @@ rec {
     license = with a.lib.licenses; ofl;
     hydraPlatforms = [];
     homepage = "http://www.marksimonson.com/fonts/view/anonymous-pro";
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html";
-    };
+    downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html";
+    inherit (sourceInfo) version;
   };
 }) x
 
diff --git a/pkgs/data/fonts/anonymous-pro/default.upstream b/pkgs/data/fonts/anonymous-pro/default.upstream
new file mode 100644
index 000000000000..dde536cbcae1
--- /dev/null
+++ b/pkgs/data/fonts/anonymous-pro/default.upstream
@@ -0,0 +1,6 @@
+attribute_name anonymousPro
+url http://www.ms-studio.com/FontSales/anonymouspro.html
+version_link '/AnonymousPro-.*[.]zip$'
+do_overwrite (){
+  do_overwrite_just_version
+}

From d7ee7709ffd90c3da9aec68042858bff3e09a86b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 12:27:13 +0400
Subject: [PATCH 025/167] Update afflib

---
 pkgs/development/libraries/afflib/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index 7c1c5dfd7b70..ed88b89b14ee 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, zlib, curl, expat, fuse, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "afflib-3.6.12";
+  version = "3.7.4";
+  name = "afflib-${version}";
 
   src = fetchurl {
     url = "http://digitalcorpora.org/downloads/afflib/${name}.tar.gz";
-    sha256 = "1l13nrqjlvad112543qbyvrzai5by43zl96d3miklrhn26q9rs07";
+    sha256 = "18j1gjb31qjcmz6lry4m2d933w2a80iagg9g5vrpw5ig80lv10f8";
   };
 
   buildInputs = [ zlib curl expat fuse openssl ];
@@ -16,5 +17,8 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsdOriginal;
     maintainers = [ stdenv.lib.maintainers.raskin ];
+    inherit version;
+    downloadPage = "http://digitalcorpora.org/downloads/afflib/";
+    updateWalker = true;
   };
 }

From 91623b84722e1804c17f693ad9614301f71378c9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 12:41:07 +0400
Subject: [PATCH 026/167] Add fresh (unstable) Allegro 5, too

---
 .../libraries/allegro/5-unstable.nix          | 57 +++++++++++++++++++
 .../libraries/allegro/5-unstable.upstream     |  7 +++
 pkgs/development/libraries/allegro/5.nix      | 14 ++---
 pkgs/development/libraries/allegro/5.upstream |  7 +++
 .../development/libraries/allegro/default.nix |  8 +--
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 82 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/libraries/allegro/5-unstable.nix
 create mode 100644 pkgs/development/libraries/allegro/5-unstable.upstream
 create mode 100644 pkgs/development/libraries/allegro/5.upstream

diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
new file mode 100644
index 000000000000..a277129c0a92
--- /dev/null
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -0,0 +1,57 @@
+
+x@{builderDefsPackage
+  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
+  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
+  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
+  , kbproto, libjpeg, flac
+  , ...}:
+builderDefsPackage
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="allegro";
+    version = "5.1.8";
+    name="${baseName}-${version}";
+    project="alleg";
+    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
+    hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = "180mhlhgxqh3ynazf9bssnd3riw77fazjw65yr64w0av53y0h1lz";
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doCmake" "doMakeInstall"];
+
+  doCmake = a.fullDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
+    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
+  '') ["minInit" "doUnpack" "addInputs"];
+
+  makeFlags = [
+  ];
+
+  meta = {
+    description = "A game programming library";
+    license = "free-noncopyleft"; # giftware
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    inherit version;
+  };
+}) x
+
diff --git a/pkgs/development/libraries/allegro/5-unstable.upstream b/pkgs/development/libraries/allegro/5-unstable.upstream
new file mode 100644
index 000000000000..e07829c08cc4
--- /dev/null
+++ b/pkgs/development/libraries/allegro/5-unstable.upstream
@@ -0,0 +1,7 @@
+attribute_name allegro5
+url http://alleg.sourceforge.net/download.html
+version_link '/allegro-unstable/.*[.]tar[.].*/download$'
+SF_redirect
+do_overwrite () {
+  do_overwrite_just_version
+}
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 60634dc7db8b..f03dd5b548c7 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -6,9 +6,9 @@ x@{builderDefsPackage
   , kbproto, libjpeg, flac
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -38,7 +38,7 @@ rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
     cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
   '') ["minInit" "doUnpack" "addInputs"];
-      
+
   makeFlags = [
   ];
 
@@ -51,11 +51,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/alleg/files/";
-    };
+    inherit version;
   };
 }) x
 
diff --git a/pkgs/development/libraries/allegro/5.upstream b/pkgs/development/libraries/allegro/5.upstream
new file mode 100644
index 000000000000..9d139383fe3d
--- /dev/null
+++ b/pkgs/development/libraries/allegro/5.upstream
@@ -0,0 +1,7 @@
+attribute_name allegro5
+url http://alleg.sourceforge.net/download.html
+version_link '[.]tar[.].*/download$'
+SF_redirect
+do_overwrite () {
+  do_overwrite_just_version
+}
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 75842bee9f8f..15bb6bf1d000 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -4,9 +4,9 @@ x@{builderDefsPackage
   , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -36,7 +36,7 @@ rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
     cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
   '') ["minInit" "doUnpack" "addInputs"];
-      
+
   makeFlags = [
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb2411c0686c..63528ff9852d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4204,6 +4204,8 @@ let
 
   allegro = callPackage ../development/libraries/allegro {};
   allegro5 = callPackage ../development/libraries/allegro/5.nix {};
+  allegro5unstable = callPackage
+    ../development/libraries/allegro/5-unstable.nix {};
 
   amrnb = callPackage ../development/libraries/amrnb { };
 

From 040c0e8d7db0df43bcfd28c9b5c0bfe3bf9a82e0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 12:47:15 +0400
Subject: [PATCH 027/167] Allow autoupdates for altermime

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

diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index a80757faa1fa..1c9dbfe62354 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -42,11 +42,9 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.pldaniels.com/altermime/";
-    };
+    downloadPage = "http://www.pldaniels.com/altermime/";
+    inherit version;
+    updateWalker = true;
   };
 }) x
 

From a7984cca3b8b0e5cacea26bc3511f0d7ba0d1cca Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 12:55:16 +0400
Subject: [PATCH 028/167] Update angelscript

---
 .../interpreters/angelscript/default.nix         | 16 +++++++---------
 .../interpreters/angelscript/default.upstream    |  4 ++++
 2 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/interpreters/angelscript/default.upstream

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 22f92f40183e..871101ba03e0 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -11,16 +11,16 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="angelscript";
-    version="2.22.1";
+    version = "2.29.0";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm";
+    sha256 = "1g0bi8dx832s3911rr3jymnffaz3q7cnbzl53nmi6hwsr2kpc6mx";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = sourceInfo.sha256;
   };
 
   inherit (sourceInfo) name version;
@@ -31,7 +31,7 @@ rec {
 
   prepareBuild = a.fullDepEntry ''
     cd angelscript/projects/gnuc
-    sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
+    sed -i makefile -e "s@LOCAL [?]= .*@LOCAL = $out@"
     mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
     export SHARED=1 
     export VERSION="${version}"
@@ -55,11 +55,9 @@ rec {
     platforms = with a.lib.platforms;
       linux;
     license = a.lib.licenses.zlib;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.angelcode.com/angelscript/downloads.asp";
-    };
+    homepage="http://www.angelcode.com/angelscript/";
+    downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
+    inherit version;
   };
 }) x
 
diff --git a/pkgs/development/interpreters/angelscript/default.upstream b/pkgs/development/interpreters/angelscript/default.upstream
new file mode 100644
index 000000000000..7dbe527b276c
--- /dev/null
+++ b/pkgs/development/interpreters/angelscript/default.upstream
@@ -0,0 +1,4 @@
+url http://www.angelcode.com/angelscript/downloads.html
+version_link '[.]zip$'
+version '.*_([0-9.]+)[.].*' '\1'
+do_overwrite () { do_overwrite_just_version ; }

From 874e4d7d2329fcbefbb48f03b4fb605e12968236 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 13:07:33 +0400
Subject: [PATCH 029/167] Update atanks

---
 pkgs/games/atanks/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index 7669c4433219..587fefe600b2 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -11,17 +11,17 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="atanks";
-    version="4.9";
+    version = "6.0";
     name="${baseName}-${version}";
     project="${baseName}";
     url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz";
-    hash="015nwh8jk4k24ci6ilihii8idkyf6g266r4vl50csvykc82slrvd";
+    sha256 = "0460zwzd800vcgsmd1dzb7j5wcy3lf9hsdw152f6p2mbd0nq5pds";
   };
 in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+    sha256 = sourceInfo.sha256;
   };
 
   inherit (sourceInfo) name version;
@@ -35,6 +35,7 @@ rec {
   fixInstall = a.fullDepEntry (''
     sed -e "s@INSTALL=.*bin/install @INSTALL=install @" -i Makefile
     sed -e "s@-g 0 -m ... -o 0@@" -i Makefile
+    sed -e 's@/usr/@'"$out"'@g' -i Makefile
   '') ["doUnpack" "minInit"];
       
   meta = {
@@ -45,11 +46,8 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/";
-    };
+    downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/";
+    inherit version;
   };
 }) x
 

From be4bdff8ab1358694a048475b4a95074e9eae6d6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 13:58:11 +0400
Subject: [PATCH 030/167] Update Box2D to 2.3.0. I fail to build 2.3.1, though.

---
 pkgs/development/libraries/box2d/default.nix | 26 +++++++-------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 9d261191fbba..74875e41783f 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , unzip, cmake, mesa, freeglut, libX11, xproto
-  , inputproto, libXi
+  , inputproto, libXi, fetchsvn, pkgconfig
   , ...}:
 builderDefsPackage
 (a :  
@@ -10,21 +10,17 @@ let
 
   buildInputs = map (n: builtins.getAttr n x)
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="box2d";
-    version="2.1.2";
-    name="${baseName}-${version}";
-    url="http://box2d.googlecode.com/files/Box2D_v${version}.zip";
-    hash="0m5szd74ig8yqazwk2g3zl4z7wwp08k52awawk1pigy6a4z1qd9v";
-  };
 in
 rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+  version = "2.3.0";
+  name = "box2d-${version}";
+  srcDrv = a.fetchsvn {
+    url = "http://box2d.googlecode.com/svn/trunk";
+    rev = "277";
+    sha256 = "1xp93yw2zcqhmh999v7cwqaqxq1glgyg5r8kfm4yabc1ypba3in4";
   };
+  src = srcDrv + "/";
 
-  inherit (sourceInfo) name version;
   inherit buildInputs;
 
   phaseNames = ["changeSettings" "doCmake" "doMakeInstall"];
@@ -49,11 +45,7 @@ rec {
     platforms = with a.lib.platforms;
       linux;
     license = "bsd";
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://code.google.com/p/box2d/downloads/list";
-    };
+    inherit version;
   };
 }) x
 

From 0957b0a43229066fb7ef43d59e39839f39e2794e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 13:59:02 +0400
Subject: [PATCH 031/167] Add an auto-update script for atanks

---
 pkgs/games/atanks/default.upstream | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 pkgs/games/atanks/default.upstream

diff --git a/pkgs/games/atanks/default.upstream b/pkgs/games/atanks/default.upstream
new file mode 100644
index 000000000000..f52364b3427f
--- /dev/null
+++ b/pkgs/games/atanks/default.upstream
@@ -0,0 +1,5 @@
+url http://sourceforge.net/projects/atanks/files/atanks/
+version_link 'atanks[-][0-9.]+/$'
+version_link '[.]tar[.][a-z0-9]+/download'
+SF_redirect
+do_overwrite () { do_overwrite_just_version; }

From e303e18608708eaa123ca72be92af3ce493207b2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 Jul 2014 14:28:52 +0400
Subject: [PATCH 032/167] Update Linux 3.15 to 3.15.3

---
 pkgs/os-specific/linux/kernel/linux-3.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix
index 68f58f83a2f7..829bb55b76ff 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.15.2";
+  version = "3.15.3";
   extraMeta.branch = "3.15";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "09nq8q84xn6lwzdnn36pzfiqhn1lapi60yxn4hifb7v9ymhc5sv6";
+    sha256 = "0i8dmx1yiaraxb7gsjm7wpy0rv8038nbrwl2slzq749pgm4bd5bf";
   };
 
   features.iwlwifi = true;

From e0fc4e773437c0b1d585412d67294aa1c58ae307 Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Tue, 1 Jul 2014 13:34:08 +0200
Subject: [PATCH 033/167] added lua-filesystem-1.6.2

---
 .../interpreters/lua-5/filesystem.nix         | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/interpreters/lua-5/filesystem.nix

diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix
new file mode 100644
index 000000000000..a5da2c5ddd02
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/filesystem.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, lua5 }:
+
+stdenv.mkDerivation rec {
+  version = "1.6.2";
+  name = "lua-filesystem-${version}";
+  isLibrary = true;
+  src = fetchurl {
+    url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
+    sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz";
+  };
+
+  buildInputs = [ lua5 ];
+
+  preBuild = ''
+    makeFlagsArray=(
+      PREFIX=$out
+      LUA_LIBDIR="$out/lib/lua/${lua5.luaversion}"
+      LUA_INC="-I${lua5}/include");
+  '';
+
+  meta = {
+    homepage = "https://github.com/keplerproject/luafilesystem";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.flosse ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb2411c0686c..3002490977d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3465,6 +3465,7 @@ let
 
   lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};
   lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
+  lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {};
 
   luarocks = callPackage ../development/tools/misc/luarocks {
      lua = lua5;

From 24e8c3ac41d80256e20d979a8e7fbab122f581fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jul 2014 13:16:22 +0200
Subject: [PATCH 034/167] Tweak

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

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index b1dd66584f4a..9a592d4f9541 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -5,6 +5,8 @@
 , libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false
 }:
 
+with stdenv.lib;
+
 # TODO:
 # * Add gio-module-fam
 #     Problem: cyclic dependency on gamin
@@ -38,7 +40,6 @@ let
   ver_maj = "2.40";
   ver_min = "0";
 in
-with { inherit (stdenv.lib) optional optionals optionalString; };
 
 stdenv.mkDerivation rec {
   name = "glib-${ver_maj}.${ver_min}";

From b8cb960a58676679461b76bc6b40f185d1d6b010 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Jul 2014 16:28:23 +0200
Subject: [PATCH 035/167] Fix evaluation

---
 nixos/tests/installer.nix | 2 +-
 nixos/tests/simple.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 1cd1aa63a55b..d3bbe7a8bd55 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -370,7 +370,7 @@ in {
   # Rebuild the CD configuration with a little modification.
   rebuildCD = makeTest
     { inherit iso;
-      name = "rebuild-CD";
+      name = "rebuild-cd";
       nodes = { };
       testScript =
         ''
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 62d748d64296..1cd9058f9e54 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -1,5 +1,5 @@
 import ./make-test.nix {
-  name = "simple"
+  name = "simple";
 
   machine = { config, pkgs, ... }: { };
 

From 0d3071835786d38ae8d1963935bec2d644a9cc3f Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Tue, 1 Jul 2014 19:16:24 +0200
Subject: [PATCH 036/167] include share directory

---
 pkgs/development/interpreters/lua-5/5.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index e004a30fe20b..ee5dac265bc7 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
     mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
     rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua
     wrapProgram $out/bin/lua \
-      --set LUA_PATH  '$HOME/.nix-profile/lib/lua/5.1/?.lua' \
-      --set LUA_CPATH '$HOME/.nix-profile/lib/lua/5.1/?.so'
+      --set LUA_PATH  '"$HOME/.nix-profile/lib/lua/5.1/?.lua;$HOME/.nix-profile/share/lua/5.1/?.lua"' \
+      --set LUA_CPATH '"$HOME/.nix-profile/lib/lua/5.1/?.so;$HOME/.nix-profile/share/lua/5.1/?.so"'
   '';
 
   meta = {

From ea7ddcd864335f5d7e6ecc8e58f54e18cac24887 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Tue, 1 Jul 2014 22:52:09 +0300
Subject: [PATCH 037/167] Added pipes-csv and pipes-http

---
 .../libraries/haskell/pipes-csv/default.nix   | 21 +++++++++++++++++++
 .../libraries/haskell/pipes-http/default.nix  | 13 ++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/pipes-csv/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pipes-http/default.nix

diff --git a/pkgs/development/libraries/haskell/pipes-csv/default.nix b/pkgs/development/libraries/haskell/pipes-csv/default.nix
new file mode 100644
index 000000000000..e35c62d5cd3c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-csv/default.nix
@@ -0,0 +1,21 @@
+{ cabal, blazeBuilder, cassava, HUnit, pipes, pipesBytestring
+, testFramework, testFrameworkHunit, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-csv";
+  version = "1.4.0";
+  sha256 = "1q1gnfnkvlkk8lwllhyar7323k3jynh9rl6x9yks7lc3nqr1n16j";
+  buildDepends = [
+    blazeBuilder cassava pipes unorderedContainers vector
+  ];
+  testDepends = [
+    cassava HUnit pipes pipesBytestring testFramework
+    testFrameworkHunit vector
+  ];
+  meta = {
+    description = "Fast, streaming csv parser";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix
new file mode 100644
index 000000000000..b9c8c57510fe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-http/default.nix
@@ -0,0 +1,13 @@
+{ cabal, httpClient, httpClientTls, pipes }:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-http";
+  version = "1.0.1";
+  sha256 = "15jmhf6lgqxv9zn08dky8biiv8cp4s3vf0xmp78pbllaqkvm4z9w";
+  buildDepends = [ httpClient httpClientTls pipes ];
+  meta = {
+    description = "HTTP client with pipes interface";
+    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 560b0b77ce68..6d6df8e3170f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1723,6 +1723,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {};
 
+  pipesCsv = callPackage ../development/libraries/haskell/pipes-csv {};
+
+  pipesHttp = callPackage ../development/libraries/haskell/pipes-http {};
+
   pipesNetwork = callPackage ../development/libraries/haskell/pipes-network {};
 
   pipesGroup = callPackage ../development/libraries/haskell/pipes-group {};

From 8d5c4e8b4bc8f9bb180cabe979e07704602ea1e2 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 1 Jul 2014 16:43:27 -0500
Subject: [PATCH 038/167] compcert: build with 64-bit compiler, add darwin
 support

---
 pkgs/development/compilers/compcert/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 859c55662dc6..9aa60ada76b5 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -12,13 +12,16 @@ stdenv.mkDerivation rec {
   buildInputs = [ coq ocaml ocamlPackages.menhir ];
 
   enableParallelBuilding = true;
-  configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ ia32-linux";
+  configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ " +
+    (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
 
   meta = {
     description = "Formally verified C compiler";
     homepage    = "http://compcert.inria.fr";
     license     = stdenv.lib.licenses.inria;
-    platforms   = [ "i686-linux" ];
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    platforms   = [ stdenv.lib.platforms.linux
+                    stdenv.lib.platforms.darwin ];
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice
+                    stdenv.lib.maintainers.jwiegley ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63528ff9852d..98974cb1cc85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2568,7 +2568,7 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
-  compcert = callPackage_i686 ../development/compilers/compcert {};
+  compcert = callPackage ../development/compilers/compcert {}
 
   cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
   cryptol2 = haskellPackages.cryptol;

From e06124731c1b3c1a0d828eb49f0ecbb400aec637 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 1 Jul 2014 16:59:35 -0500
Subject: [PATCH 039/167] compcert: add missing semicolon in all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98974cb1cc85..2e26747004a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2568,7 +2568,7 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
-  compcert = callPackage ../development/compilers/compcert {}
+  compcert = callPackage ../development/compilers/compcert {};
 
   cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
   cryptol2 = haskellPackages.cryptol;

From f666bf4ddf3f5f50cad6e17907dae53d545444d0 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 1 Jul 2014 17:01:11 -0500
Subject: [PATCH 040/167] compcert: Correct syntax used in default.nix

---
 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 9aa60ada76b5..0d8d8e3d6d73 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     description = "Formally verified C compiler";
     homepage    = "http://compcert.inria.fr";
     license     = stdenv.lib.licenses.inria;
-    platforms   = [ stdenv.lib.platforms.linux
-                    stdenv.lib.platforms.darwin ];
+    platforms   = stdenv.lib.platforms.linux ++
+                  stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice
                     stdenv.lib.maintainers.jwiegley ];
   };

From 5cc1245a113b0f889f2ac71db0333f9080aec50b Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Wed, 2 Jul 2014 01:30:49 +0200
Subject: [PATCH 041/167] xmobar: Updated to 0.21

---
 pkgs/applications/misc/xmobar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index acd0568772aa..5720cc9d18f6 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
-  version = "0.20.1";
-  sha256 = "16jfgn6ciqxrwj6qjhbcpms7mzlbxfaxyxfxp64xvnw626xlpjvk";
+  version = "0.21";
+  sha256 = "1h0gsb808zm4j4kmw7fl4339wllc16ldy1ki96l8w3fvj30bcxpm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 91ac34b6483ecf4b98921a17a4b477ce61dc5b2e Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Wed, 25 Jun 2014 11:52:53 +1200
Subject: [PATCH 042/167] Add inferno, a distributed cross-platform hosted OS

---
 pkgs/applications/inferno/default.nix | 64 +++++++++++++++++++++++++++
 pkgs/applications/inferno/inferno     | 31 +++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 3 files changed, 97 insertions(+)
 create mode 100644 pkgs/applications/inferno/default.nix
 create mode 100755 pkgs/applications/inferno/inferno

diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix
new file mode 100644
index 000000000000..6a1a3be27dd5
--- /dev/null
+++ b/pkgs/applications/inferno/default.nix
@@ -0,0 +1,64 @@
+{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  # Inferno is a rolling release from a mercurial repository. For the verison number
+  # of the package I'm using the mercurial commit number.
+  version = "645";
+  name = "inferno-${version}";
+
+  # The mercurial repository does not contain all the components needed for the
+  # runtime system. The 'base' package contains these. For this package I download
+  # the base, extract the elements required from that, and add them to the source
+  # pulled from the mercurial repository.
+  srcBase = fetchurl {
+    url = "http://www.vitanuova.com/dist/4e/inferno-20100120.tgz";
+    sha256 = "0msvy3iwl4n5k0ry0xiyysjkq0qsawmwn3hvg67hbi5y8g7f7l88";
+  };
+
+  src = fetchhg {
+    url    = "https://inferno-os.googlecode.com/hg";
+    rev    = "7ab390b860ca";
+    sha256 = "09y0iclb3yy10gw1p0182sddg64xh60q2fx4ai7lxyfb65i76qbh";
+  };
+
+  # Fails with gcc48 due to inferno triggering an optimisation issue with floating point.
+  buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ];
+
+  infernoWrapper = ./inferno;
+
+  configurePhase = ''
+    tar --strip-components=1 -xvf $srcBase inferno/fonts inferno/Mkdirs inferno/empties
+    sed -e 's@^ROOT=.*$@ROOT='"$out"'/share/inferno@g' -e 's@^OBJTYPE=.*$@OBJTYPE=386@g' -e 's@^SYSHOST=.*$@SYSHOST=Linux@g' -i mkconfig
+    mkdir prof
+    sh Mkdirs
+  '';
+
+  buildPhase = ''
+    export PATH=$PATH:$out/share/inferno/Linux/386/bin
+    mkdir -p $out/share/inferno
+    cp -r . $out/share/inferno
+    ./makemk.sh
+    mk nuke
+    mk
+  '';
+
+  installPhase = ''
+    mk install
+    mkdir -p $out/bin
+    makeWrapper $out/share/inferno/Linux/386/bin/emu $out/bin/emu \
+      --suffix LD_LIBRARY_PATH ':' "${gcc46.gcc}/lib" \
+      --suffix PATH ':' "$out/share/inferno/Linux/386/bin"
+    makeWrapper $infernoWrapper $out/bin/inferno \
+      --suffix LD_LIBRARY_PATH ':' "${gcc46.gcc}/lib" \
+      --suffix PATH ':' "$out/share/inferno/Linux/386/bin" \
+      --set INFERNO_ROOT "$out/share/inferno"
+  '';
+
+  meta = {
+    description = "A compact distributed operating system for building cross-platform distributed systems";
+    homepage = "http://inferno-os.org/";
+    license = stdenv.lib.licenses.gpl2;
+    maintainer = [ "Chris Double <chris.double@double.co.nz>" ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/inferno/inferno b/pkgs/applications/inferno/inferno
new file mode 100755
index 000000000000..6eb6da8861a5
--- /dev/null
+++ b/pkgs/applications/inferno/inferno
@@ -0,0 +1,31 @@
+#! /usr/bin/env bash
+
+
+export INFERNO_HOME="$HOME/.local/share/inferno"
+if [ -n "$XDG_DATA_HOME" ]
+  then export INFERNO_HOME="$XDG_DATA_HOME/inferno"
+fi
+
+if [ ! -d $INFERNO_HOME ]; then
+  mkdir -p $INFERNO_HOME
+fi
+
+if [ ! -d $INFERNO_HOME/tmp ]; then
+  mkdir -p $INFERNO_HOME/tmp
+fi
+
+for d in $INFERNO_HOME/{acme,appl,dis,lib,man,module,usr/inferno}; do
+  if [ ! -d $d ]; then
+    mkdir -p $d
+    cp --no-preserve=all -r $INFERNO_ROOT/${d#$INFERNO_HOME/}/* $d/
+    chmod -R +w $d
+  fi
+done
+
+if [ ! -d $INFERNO_HOME/usr/$USER ]; then
+  mkdir -p $INFERNO_HOME/usr/$USER
+  cp -r $INFERNO_ROOT/usr/inferno/* $INFERNO_HOME/usr/$USER/
+  chmod -R +w $INFERNO_HOME/usr/$USER
+fi
+
+exec emu "$@" /dis/sh.dis -c "bind -b -c '#U*$INFERNO_HOME/' /; /dis/sh.dis"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e26747004a3..14889c668c8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8912,6 +8912,8 @@ let
     inherit (pythonPackages) pyopengl;
   };
 
+  inferno = callPackage_i686 ../applications/inferno { };
+
   inkscape = callPackage ../applications/graphics/inkscape {
     inherit (pythonPackages) lxml;
     lcms = lcms2;

From 52af6d650ba83dd778fbd460b0061e11f93d173e Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Wed, 2 Jul 2014 15:04:28 +1200
Subject: [PATCH 043/167] Update GNU lightning to 2.0.4

---
 pkgs/development/libraries/lightning/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 9088fa5fa624..4ffbb9719cab 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -1,13 +1,16 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, binutils }:
 
 stdenv.mkDerivation rec {
-  name = "lightning-1.2c";
+  name = "lightning-2.0.4";
 
   src = fetchurl {
     url = "ftp://alpha.gnu.org/gnu/lightning/${name}.tar.gz";
-    sha256 = "00ss2b75msj4skkda9fs5df3bfpi8bwbckci8g0pwd3syppb3qdl";
+    sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy";
   };
 
+  # Needs libopcodes.so  from binutils for 'make check'
+  buildInputs = [ binutils ];
+
   doCheck = true;
 
   meta = {
@@ -24,4 +27,4 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv3+";
   };
-}
\ No newline at end of file
+}

From 7efe90a6e3238f14bcf6cee239ca6b7b1421dc24 Mon Sep 17 00:00:00 2001
From: Chris Heller <cheller@akamai.com>
Date: Wed, 2 Jul 2014 00:14:06 -0400
Subject: [PATCH 044/167] Add Thrift-0.6.0.1

---
 .../libraries/haskell/Thrift/0.6.0.1.nix           | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  3 +++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/Thrift/0.6.0.1.nix

diff --git a/pkgs/development/libraries/haskell/Thrift/0.6.0.1.nix b/pkgs/development/libraries/haskell/Thrift/0.6.0.1.nix
new file mode 100644
index 000000000000..c1e6ef6df2d4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Thrift/0.6.0.1.nix
@@ -0,0 +1,14 @@
+{ cabal, binary, HTTP, network }:
+
+cabal.mkDerivation (self: {
+  pname = "Thrift";
+  version = "0.6.0.1";
+  sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv";
+  buildDepends = [ binary HTTP network ];
+  meta = {
+    homepage = "http://thrift.apache.org";
+    description = "Haskell bindings for the Apache Thrift RPC system";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 560b0b77ce68..0b00ecf4fbd8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2284,6 +2284,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   threads = callPackage ../development/libraries/haskell/threads {};
 
+  Thrift_0_6_0_1 = callPackage ../development/libraries/haskell/Thrift/0.6.0.1.nix {};
+  Thrift = self.Thrift_0_6_0_1;
+
   thyme = callPackage ../development/libraries/haskell/thyme {};
 
   threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {};

From f737f1a157fc41ad39be5e2bbfab2955620be17c Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Wed, 2 Jul 2014 14:12:03 +0800
Subject: [PATCH 045/167] Update haskell-http-kit to version 0.5.1

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

diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix
index 18a0468d8364..73610d3d8a8d 100644
--- a/pkgs/development/libraries/haskell/http-kit/default.nix
+++ b/pkgs/development/libraries/haskell/http-kit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-kit";
-  version = "0.5.0";
-  sha256 = "0djg2gg12w9sd598hx959cgr5027ghza3m6aaym9ipb43w6mds5p";
+  version = "0.5.1";
+  sha256 = "1swnvsbaabk946pys9q9kr0bgdvalnznd59dw981sg7cywqdcz28";
   buildDepends = [ caseInsensitive httpTypes ];
   testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ];
   meta = {

From 6c15656a06829a197dc7d84b4b91e46359321783 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 2 Jul 2014 02:43:47 -0400
Subject: [PATCH 046/167] vcprompt: new package

This adds the vcprompt utility, a little C program that prints a short string
with barebones information about the current working directory for various
version control systems.
---
 .../version-management/vcprompt/default.nix   | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/version-management/vcprompt/default.nix

diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
new file mode 100644
index 000000000000..476abd4e19bd
--- /dev/null
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchhg, autoconf, sqlite }:
+
+stdenv.mkDerivation {
+  name = "vcprompt";
+
+  src = fetchhg {
+    url = "http://hg.gerg.ca/vcprompt/";
+    rev = "1.2.1";
+    sha256 = "03xqvp6bfl98bpacrw4n82qv9cw6a4fxci802s3vrygas989v1kj";
+  };
+
+  buildInputs = [ sqlite autoconf ];
+
+  preConfigure = ''
+    autoconf
+    makeFlags="$makeFlags PREFIX=$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      A little C program that prints a short string with barebones information
+      about the current working directory for various version control systems
+    '';
+    homepage    = http://hg.gerg.ca/vcprompt;
+    maintainers = with maintainers; [ cstrahan ];
+    platforms   = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e26747004a3..8d0179851298 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9751,6 +9751,8 @@ let
 
   vbindiff = callPackage ../applications/editors/vbindiff { };
 
+  vcprompt = callPackage ../applications/version-management/vcprompt { };
+
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
   veracity = callPackage ../applications/version-management/veracity {};

From f8cd1b3062da3986ddb8803195582c28776b0def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 2 Jul 2014 11:18:27 +0200
Subject: [PATCH 047/167] Adding sqlcipher.

---
 .../libraries/sqlcipher/default.nix           | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/sqlcipher/default.nix

diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
new file mode 100644
index 000000000000..04e110991168
--- /dev/null
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, openssl, tcl, readline ? null, ncurses ? null }:
+
+assert readline != null -> ncurses != null;
+
+stdenv.mkDerivation {
+  name = "sqlcipher-3.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/sqlcipher/sqlcipher/archive/v3.1.0.tar.gz";
+    sha256 = "1h54hsl7g6ra955aaqid5wxm93fklx2pxz8abcdwf9md3bpfcn18";
+  };
+
+  buildInputs = [ readline ncurses openssl tcl ];
+
+  configureFlags = "--enable-threadsafe --disable-tcl";
+
+  CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_HAS_CODEC";
+  LDFLAGS = if readline != null then "-lncurses" else "";
+
+  meta = {
+    homepage = http://sqlcipher.net/
+    description = "Full Database Encryption for SQLite";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e26747004a3..450b28bd85e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6147,6 +6147,11 @@ let
     inherit readline ncurses;
   });
 
+  sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
+    readline = null;
+    ncurses = null;
+  });
+
   stfl = callPackage ../development/libraries/stfl {
     stdenv = if stdenv.isDarwin
       then overrideGCC stdenv gccApple

From eeadde096709846e986c56037efb203f53a659a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 2 Jul 2014 11:27:24 +0200
Subject: [PATCH 048/167] sqlcipher: missing semicolon on nix syntax

---
 pkgs/development/libraries/sqlcipher/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index 04e110991168..bc30716e81f6 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   LDFLAGS = if readline != null then "-lncurses" else "";
 
   meta = {
-    homepage = http://sqlcipher.net/
+    homepage = http://sqlcipher.net/;
     description = "Full Database Encryption for SQLite";
     platforms = stdenv.lib.platforms.unix;
   };

From cb41fecaa1ffd6626366f566fdd5dcbd369bdcd2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 2 Jul 2014 11:27:21 +0200
Subject: [PATCH 049/167] Try fixing the nixos mumble tests, again

---
 nixos/tests/mumble.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 32aae9161399..3759d73355d3 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -30,21 +30,21 @@ in
     $client1->execute("mumble mumble://client1\@server/test &");
     $client2->execute("mumble mumble://client2\@server/test &");
 
-    $client1->waitForWindow(qr/Mumble/);
-    $client2->waitForWindow(qr/Mumble/);
-    $server->sleep(3); # Wait some more for the Mumble UI
-
     # cancel client audio configuration
+    $client1->waitForWindow(qr/Audio Tuning Wizard/);
+    $client2->waitForWindow(qr/Audio Tuning Wizard/);
     $client1->sendKeys("esc");
     $client2->sendKeys("esc");
-    $server->sleep(1);
 
     # cancel client cert configuration
+    $client1->waitForWindow(qr/Certificate Management/);
+    $client2->waitForWindow(qr/Certificate Management/);
     $client1->sendKeys("esc");
     $client2->sendKeys("esc");
-    $server->sleep(1);
 
     # accept server certificate
+    $client1->waitForWindow(qr/^Mumble$/);
+    $client2->waitForWindow(qr/^Mumble$/);
     $client1->sendChars("y");
     $client2->sendChars("y");
 

From aa0179744aad809d58c2cd34fe6e6a98bb3677e4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 2 Jul 2014 12:11:45 +0200
Subject: [PATCH 050/167] go: fix build of 1.0.3

---
 .../compilers/go/1_0-gcc-bug.patch            | 19 +++++++++++++++++++
 .../compilers/go/1_0-opt-error.patch          | 12 ++++++++++++
 pkgs/development/compilers/go/default.nix     |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/go/1_0-gcc-bug.patch
 create mode 100644 pkgs/development/compilers/go/1_0-opt-error.patch

diff --git a/pkgs/development/compilers/go/1_0-gcc-bug.patch b/pkgs/development/compilers/go/1_0-gcc-bug.patch
new file mode 100644
index 000000000000..34cf7ab74567
--- /dev/null
+++ b/pkgs/development/compilers/go/1_0-gcc-bug.patch
@@ -0,0 +1,19 @@
+http://code.google.com/p/go/source/detail?r=8b13b2ec6b18
+--- a/src/cmd/cgo/gcc.go	2014-07-02 12:00:12.171796197 +0200
++++ b/src/cmd/cgo/gcc.go	2014-07-02 12:01:57.844472754 +0200
+@@ -840,6 +840,15 @@
+ func (p *Package) gccErrors(stdin []byte) string {
+ 	// TODO(rsc): require failure
+ 	args := p.gccCmd()
++
++	// GCC 4.8.0 has a bug: it sometimes does not apply
++	// -Wunused-value to values that are macros defined in system
++	// headers.  See issue 5118.  Adding -Wsystem-headers avoids
++	// that problem.  This will produce additional errors, but it
++	// doesn't matter because we will ignore all errors that are
++	// not marked for the cgo-test file.
++	args = append(args, "-Wsystem-headers")
++
+ 	if *debugGcc {
+ 		fmt.Fprintf(os.Stderr, "$ %s <<EOF\n", strings.Join(args, " "))
+ 		os.Stderr.Write(stdin)
diff --git a/pkgs/development/compilers/go/1_0-opt-error.patch b/pkgs/development/compilers/go/1_0-opt-error.patch
new file mode 100644
index 000000000000..d3fcd40449ae
--- /dev/null
+++ b/pkgs/development/compilers/go/1_0-opt-error.patch
@@ -0,0 +1,12 @@
+https://code.google.com/p/go-wiki/wiki/OlderVersions
+--- a/src/cmd/cc/funct.c	2014-07-02 11:54:42.230663598 +0200
++++ b/src/cmd/cc/funct.c	2014-07-02 11:55:01.653790128 +0200
+@@ -269,7 +269,7 @@
+ 		goto bad;
+ 
+ 	f = alloc(sizeof(*f));
+-	for(o=0; o<sizeof(f->sym); o++)
++	for(o=0; o<nelem(f->sym); o++)
+ 		f->sym[o] = S;
+ 
+ 	t->funct = f;
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix
index 9e74643e161f..b9a76a6f82b3 100644
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
   '';
 
-  patches = [ ./cacert.patch ];
+  patches = [ ./cacert.patch ./1_0-opt-error.patch ./1_0-gcc-bug.patch ];
 
   GOOS = "linux";
   GOARCH = if stdenv.system == "i686-linux" then "386"

From da8b931738de689af9a92621f0a6bad18d24d010 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 2 Jul 2014 13:03:01 +0200
Subject: [PATCH 051/167] Update writegood-mode from 1.3 to 2.0

---
 pkgs/applications/editors/emacs-modes/writegood/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix
index 353215a5d485..c6563605464a 100644
--- a/pkgs/applications/editors/emacs-modes/writegood/default.nix
+++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, emacs}:
 
-let version = "1.3";
+let version = "2.0";
 
 in stdenv.mkDerivation {
   name = "writegood-mode-${version}";
   src = fetchurl {
     url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
-    sha256 = "0p34rgawnqg94vk4lcw14x99rrvsd23dmbwkxz2vax5kq6l8y5yf";
+    sha256 = "0wf7bj9d00ggy3xigym885a3njfr98i3aqrrawf8x6lgbfc56dgp";
   };
 
   buildInputs = [ emacs ];

From 1ca3e9c68184e51570478721d7914dc00f49e75b Mon Sep 17 00:00:00 2001
From: Chris Heller <cheller@akamai.com>
Date: Wed, 2 Jul 2014 08:38:02 -0400
Subject: [PATCH 052/167] Remove version. Make default

---
 .../libraries/haskell/Thrift/{0.6.0.1.nix => default.nix}      | 0
 pkgs/top-level/haskell-packages.nix                            | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/Thrift/{0.6.0.1.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/Thrift/0.6.0.1.nix b/pkgs/development/libraries/haskell/Thrift/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/Thrift/0.6.0.1.nix
rename to pkgs/development/libraries/haskell/Thrift/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0b00ecf4fbd8..6510ef6f7cd0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2284,8 +2284,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   threads = callPackage ../development/libraries/haskell/threads {};
 
-  Thrift_0_6_0_1 = callPackage ../development/libraries/haskell/Thrift/0.6.0.1.nix {};
-  Thrift = self.Thrift_0_6_0_1;
+  Thrift = callPackage ../development/libraries/haskell/Thrift {};
 
   thyme = callPackage ../development/libraries/haskell/thyme {};
 

From 7e2012487584831e467019d99a111bfe0e78916a Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 2 Jul 2014 16:14:15 +0200
Subject: [PATCH 053/167] zfs: Fix vdev_id error when plugging in a disk
 (#3161)

---
 pkgs/os-specific/linux/zfs/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index aec95832d16c..0242c586cea5 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -27,14 +27,14 @@ stdenv.mkDerivation {
     substituteInPlace ./cmd/ztest/ztest.c          --replace "/usr/sbin/zdb"     "$out/sbin/zdb"
   '';
 
-  configureFlags = ''
-    --disable-systemd
-    --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source
-    --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
-    --with-spl=${spl}/libexec/spl
-    --with-dracutdir=$$out/lib/dracut
-    --with-udevdir=$$out/lib/udev
-  '';
+  configureFlags = [
+    "--disable-systemd"
+    "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+    "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "--with-spl=${spl}/libexec/spl"
+    "--with-dracutdir=$(out)/lib/dracut"
+    "--with-udevdir=$(out)/lib/udev"
+  ];
 
   enableParallelBuilding = true;
 

From 6a7d60c01a22e83d625506b7cc9243b8da41656a Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Wed, 2 Jul 2014 17:08:45 +0200
Subject: [PATCH 054/167] mutt: update to 1.5.23

This commit rewrites the expression somewhat:

- it tries to simplify the expression.
- it changes from fetchurl to fetchhg.
- a patch to configure.ac is added in order to enable configuring the
  source on NixOS.
---
 .../networking/mailreaders/mutt/default.nix   | 74 +++++++++----------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index dbd5a41afd34..1cb7f298e206 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -1,63 +1,57 @@
-{ stdenv, fetchurl, ncurses, which, perl
-, sslSupport ? true
-, imapSupport ? true
-, headerCache ? true
-, saslSupport ? true
-, gpgmeSupport ? true
-, gdbm ? null
-, openssl ? null
-, cyrus_sasl ? null
-, gpgme ? null
-}:
-
-assert headerCache -> gdbm != null;
-assert sslSupport -> openssl != null;
-assert saslSupport -> cyrus_sasl != null;
+{ stdenv, fetchhg, autoconf, automake, ncurses, which
+, perl, gdbm, openssl, cyrus_sasl, gpgme, libidn }:
 
 let
-  version = "1.5.23";
+  version = "1.5.23-rel";
 in
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
   
-  src = fetchurl {
-    url = "mirror://sourceforge/mutt/${name}.tar.gz";
-    sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s";
+  src = fetchhg {
+    url = "http://dev.mutt.org/hg/mutt/";
+    rev = "mutt-${version}";
+    sha256 =  "1m0aif066lsc0936ha9s1kfx63wsl1l1wiib7ax6xgzijawd80pp";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [
-    ncurses which perl
-    (if headerCache then gdbm else null)
-    (if sslSupport then openssl else null)
-    (if saslSupport then cyrus_sasl else null)
-    (if gpgmeSupport then gpgme else null)
+    autoconf automake ncurses which perl
+    gdbm openssl cyrus_sasl gpgme libidn
   ];
-  
+
+  # This patch is necessary, because during the configure phase mutt
+  # searches for some paths to store mail in that do not exist on
+  # NixOS, like /var/mail, /usr/mail and similiar. This patch adds
+  # /tmp to the list.
+  patches = [
+    ./mailpath.patch
+  ];
+
+  preConfigure = ''./prepare'';
+
   configureFlags = [
-    "--with-mailpath=" "--enable-smtp"
+    "--prefix=$out"
 
-    # This allows calls with "-d N", that output debug info into ~/.muttdebug*
     "--enable-debug"
+    "--enable-gpgme"
+    "--enable-hcache"
+    "--enable-imap"
+    "--enable-pop"
+    "--enable-smtp"
 
-    "--enable-pop" "--enable-imap"
-
-    # The next allows building mutt without having anything setgid
-    # set by the installer, and removing the need for the group 'mail'
-    # I set the value 'mailbox' because it is a default in the configure script
-    "--with-homespool=mailbox"
-    (if headerCache then "--enable-hcache" else "--disable-hcache")
-    (if sslSupport then "--with-ssl" else "--without-ssl")
-    (if imapSupport then "--enable-imap" else "--disable-imap")
-    (if saslSupport then "--with-sasl" else "--without-sasl")
-    (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
+    "--with-idn"
+    "--with-regex"
+    "--with-ssl"
+    "--with-sasl"
   ];
-
+   
   meta = with stdenv.lib; {
     description = "A small but very powerful text-based mail client";
     homepage = http://www.mutt.org;
     license = "GPLv2+";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ the-kenny ];
+    maintainers = with maintainers; [ the-kenny _1126 ];
   };
 }
 

From 61c200391a225ebeabe147a70dbfb0c5bfda44b6 Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Wed, 2 Jul 2014 17:14:20 +0200
Subject: [PATCH 055/167] mutt: added mailpath.patch.

---
 .../networking/mailreaders/mutt/mailpath.patch       | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/mutt/mailpath.patch

diff --git a/pkgs/applications/networking/mailreaders/mutt/mailpath.patch b/pkgs/applications/networking/mailreaders/mutt/mailpath.patch
new file mode 100644
index 000000000000..3fb9c7a5f7f9
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/mutt/mailpath.patch
@@ -0,0 +1,12 @@
+diff -r 8f62001989cc configure.ac
+--- a/configure.ac	Sat Feb 08 10:24:22 2014 -0800
++++ b/configure.ac	Wed Jul 02 12:34:40 2014 +0200
+@@ -473,6 +473,8 @@
+                                 mutt_cv_mailpath=/usr/spool/mail
+                         elif test -d /usr/mail; then
+                                 mutt_cv_mailpath=/usr/mail
++                        elif test -d /tmp; then
++                               mutt_cv_mailpath=/tmp
+                         fi])
+                 ])
+         if test "$mutt_cv_mailpath" = no; then

From 80709b141ca82d5afe3874f50b822db3409bed4e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 2 Jul 2014 17:23:35 +0200
Subject: [PATCH 056/167] zfs.git: Fix vdev_id error when plugging in a disk
 (#3161)

---
 pkgs/os-specific/linux/zfs/git.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index ebbbc994d020..e88cb9d6130a 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -28,14 +28,14 @@ stdenv.mkDerivation {
     substituteInPlace ./cmd/ztest/ztest.c          --replace "/usr/sbin/zdb"     "$out/sbin/zdb"
   '';
 
-  configureFlags = ''
-    --disable-systemd
-    --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source
-    --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
-    --with-spl=${spl_git}/libexec/spl
-    --with-dracutdir=$$out/lib/dracut
-    --with-udevdir=$$out/lib/udev
-  '';
+  configureFlags = [
+    "--disable-systemd"
+    "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+    "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "--with-spl=${spl_git}/libexec/spl"
+    "--with-dracutdir=$(out)/lib/dracut"
+    "--with-udevdir=$(out)/lib/udev"
+  ];
 
   enableParallelBuilding = true;
 

From b3cfb9084b3860852581be235aea90540a5302d4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 5 May 2014 14:58:51 -0400
Subject: [PATCH 057/167] Get all lib functions from lib, not pkgs.lib, in
 modules

---
 nixos/modules/config/ldap.nix                             | 2 +-
 nixos/modules/config/networking.nix                       | 4 ++--
 nixos/modules/config/pulseaudio.nix                       | 2 +-
 nixos/modules/config/swap.nix                             | 2 +-
 nixos/modules/config/unix-odbc-drivers.nix                | 2 +-
 nixos/modules/hardware/network/intel-2100bg.nix           | 8 ++++----
 nixos/modules/hardware/network/intel-2200bg.nix           | 8 ++++----
 nixos/modules/hardware/network/intel-3945abg.nix          | 8 ++++----
 nixos/modules/hardware/network/ralink.nix                 | 8 ++++----
 nixos/modules/hardware/network/rtl8192c.nix               | 8 ++++----
 nixos/modules/hardware/network/smc-2632w/default.nix      | 4 ++--
 nixos/modules/hardware/opengl.nix                         | 2 +-
 .../modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 2 +-
 nixos/modules/installer/cd-dvd/system-tarball-pc.nix      | 2 +-
 .../installer/cd-dvd/system-tarball-sheevaplug.nix        | 2 +-
 nixos/modules/installer/tools/tools.nix                   | 4 ++--
 nixos/modules/misc/ids.nix                                | 6 +++---
 nixos/modules/misc/lib.nix                                | 6 +++---
 nixos/modules/misc/passthru.nix                           | 4 ++--
 nixos/modules/programs/blcr.nix                           | 4 ++--
 nixos/modules/programs/screen.nix                         | 4 ++--
 nixos/modules/programs/shadow.nix                         | 4 ++--
 nixos/modules/services/amqp/activemq/default.nix          | 2 +-
 nixos/modules/services/backup/sitecopy-backup.nix         | 2 +-
 nixos/modules/services/databases/postgresql.nix           | 2 +-
 .../modules/services/desktops/gnome3/gnome-documents.nix  | 4 ++--
 nixos/modules/services/desktops/gnome3/gnome-keyring.nix  | 4 ++--
 .../services/desktops/gnome3/gnome-online-accounts.nix    | 4 ++--
 .../services/desktops/gnome3/gnome-online-miners.nix      | 4 ++--
 .../modules/services/desktops/gnome3/gnome-user-share.nix | 4 ++--
 nixos/modules/services/desktops/gnome3/gvfs.nix           | 4 ++--
 nixos/modules/services/desktops/gnome3/seahorse.nix       | 4 ++--
 nixos/modules/services/desktops/gnome3/tracker.nix        | 4 ++--
 nixos/modules/services/hardware/acpid.nix                 | 2 +-
 nixos/modules/services/hardware/amd-hybrid-graphics.nix   | 8 ++++----
 nixos/modules/services/hardware/nvidia-optimus.nix        | 8 ++++----
 nixos/modules/services/monitoring/monit.nix               | 4 ++--
 nixos/modules/services/monitoring/uptime.nix              | 4 ++--
 .../network-filesystems/openafs-client/default.nix        | 4 ++--
 nixos/modules/services/network-filesystems/rsyncd.nix     | 6 +++---
 nixos/modules/services/networking/connman.nix             | 2 +-
 nixos/modules/services/networking/ddclient.nix            | 4 ++--
 nixos/modules/services/networking/dhcpd.nix               | 2 +-
 nixos/modules/services/networking/gvpe.nix                | 4 ++--
 nixos/modules/services/networking/networkmanager.nix      | 4 ++--
 nixos/modules/services/networking/notbit.nix              | 2 +-
 nixos/modules/services/networking/nsd.nix                 | 4 ++--
 nixos/modules/services/networking/teamspeak3.nix          | 4 ++--
 nixos/modules/services/scheduling/cron.nix                | 2 +-
 nixos/modules/services/scheduling/fcron.nix               | 2 +-
 nixos/modules/services/security/frandom.nix               | 8 ++++----
 nixos/modules/services/system/kerberos.nix                | 6 +++---
 nixos/modules/services/system/nscd.nix                    | 2 +-
 nixos/modules/services/system/uptimed.nix                 | 4 ++--
 nixos/modules/services/ttys/kmscon.nix                    | 4 ++--
 .../services/web-servers/apache-httpd/mercurial.nix       | 4 ++--
 .../web-servers/apache-httpd/tomcat-connector.nix         | 4 ++--
 nixos/modules/services/x11/window-managers/openbox.nix    | 4 ++--
 nixos/modules/services/x11/window-managers/xmonad.nix     | 6 +++---
 nixos/modules/tasks/encrypted-devices.nix                 | 4 ++--
 nixos/modules/tasks/filesystems/f2fs.nix                  | 4 ++--
 nixos/modules/tasks/filesystems/unionfs-fuse.nix          | 8 ++++----
 nixos/modules/testing/minimal-kernel.nix                  | 4 ++--
 nixos/modules/virtualisation/virtualbox-guest.nix         | 5 ++++-
 64 files changed, 135 insertions(+), 132 deletions(-)

diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index 8171f460385b..7fcb1aaf63dd 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
 with pkgs;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 43717697ebd3..fd1e55f673ae 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -14,7 +14,7 @@ in
 
   options = {
 
-    networking.extraHosts = pkgs.lib.mkOption {
+    networking.extraHosts = lib.mkOption {
       type = types.lines;
       default = "";
       example = "192.168.0.1 lanlocalhost";
@@ -23,7 +23,7 @@ in
       '';
     };
 
-    networking.dnsSingleRequest = pkgs.lib.mkOption {
+    networking.dnsSingleRequest = lib.mkOption {
       type = types.bool;
       default = false;
       description = ''
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 9802b898a5d8..67e536f4fd93 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
 with pkgs;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index ac1c32387c5e..1dc7ebb96aff 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, utils, ... }:
 
-with lib;
 with utils;
+with lib;
 
 {
 
diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix
index b725e6cae732..98929392acec 100644
--- a/nixos/modules/config/unix-odbc-drivers.nix
+++ b/nixos/modules/config/unix-odbc-drivers.nix
@@ -27,7 +27,7 @@ with lib;
 
     environment.etc."odbcinst.ini".text =
       let inis = config.environment.unixODBCDrivers;
-      in pkgs.lib.concatStringsSep "\n" inis;
+      in lib.concatStringsSep "\n" inis;
 
   };
 
diff --git a/nixos/modules/hardware/network/intel-2100bg.nix b/nixos/modules/hardware/network/intel-2100bg.nix
index 1e0033eb414a..89fdce415dda 100644
--- a/nixos/modules/hardware/network/intel-2100bg.nix
+++ b/nixos/modules/hardware/network/intel-2100bg.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
 
@@ -6,9 +6,9 @@
 
   options = {
 
-    networking.enableIntel2100BGFirmware = pkgs.lib.mkOption {
+    networking.enableIntel2100BGFirmware = lib.mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = lib.types.bool;
       description = ''
         Turn on this option if you want firmware for the Intel
         PRO/Wireless 2100BG to be loaded automatically.  This is
@@ -21,7 +21,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.networking.enableIntel2100BGFirmware {
+  config = lib.mkIf config.networking.enableIntel2100BGFirmware {
 
     hardware.enableAllFirmware = true;
 
diff --git a/nixos/modules/hardware/network/intel-2200bg.nix b/nixos/modules/hardware/network/intel-2200bg.nix
index ae5b69b7981d..1b70057d135b 100644
--- a/nixos/modules/hardware/network/intel-2200bg.nix
+++ b/nixos/modules/hardware/network/intel-2200bg.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
 
@@ -6,9 +6,9 @@
 
   options = {
 
-    networking.enableIntel2200BGFirmware = pkgs.lib.mkOption {
+    networking.enableIntel2200BGFirmware = lib.mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = lib.types.bool;
       description = ''
         Turn on this option if you want firmware for the Intel
         PRO/Wireless 2200BG to be loaded automatically.  This is
@@ -21,7 +21,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.networking.enableIntel2200BGFirmware {
+  config = lib.mkIf config.networking.enableIntel2200BGFirmware {
 
     hardware.enableAllFirmware = true;
 
diff --git a/nixos/modules/hardware/network/intel-3945abg.nix b/nixos/modules/hardware/network/intel-3945abg.nix
index 80baf260ab9a..f4f19d208348 100644
--- a/nixos/modules/hardware/network/intel-3945abg.nix
+++ b/nixos/modules/hardware/network/intel-3945abg.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
 
@@ -6,9 +6,9 @@
 
   options = {
 
-    networking.enableIntel3945ABGFirmware = pkgs.lib.mkOption {
+    networking.enableIntel3945ABGFirmware = lib.mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = lib.types.bool;
       description = ''
         This option enables automatic loading of the firmware for the Intel
         PRO/Wireless 3945ABG.
@@ -20,7 +20,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.networking.enableIntel3945ABGFirmware {
+  config = lib.mkIf config.networking.enableIntel3945ABGFirmware {
 
     hardware.enableAllFirmware = true;
 
diff --git a/nixos/modules/hardware/network/ralink.nix b/nixos/modules/hardware/network/ralink.nix
index 92f34d8643bc..0469ae3a1fb3 100644
--- a/nixos/modules/hardware/network/ralink.nix
+++ b/nixos/modules/hardware/network/ralink.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{pkgs, config, lib, ...}:
 
 {
 
@@ -6,9 +6,9 @@
 
   options = {
 
-    networking.enableRalinkFirmware = pkgs.lib.mkOption {
+    networking.enableRalinkFirmware = lib.mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = lib.types.bool;
       description = ''
         Turn on this option if you want firmware for the RT73 NIC.
       '';
@@ -19,7 +19,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.networking.enableRalinkFirmware {
+  config = lib.mkIf config.networking.enableRalinkFirmware {
     hardware.enableAllFirmware = true;
   };
 
diff --git a/nixos/modules/hardware/network/rtl8192c.nix b/nixos/modules/hardware/network/rtl8192c.nix
index 3aefb7bdd608..deae6355492c 100644
--- a/nixos/modules/hardware/network/rtl8192c.nix
+++ b/nixos/modules/hardware/network/rtl8192c.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{pkgs, config, lib, ...}:
 
 {
 
@@ -6,9 +6,9 @@
 
   options = {
 
-    networking.enableRTL8192cFirmware = pkgs.lib.mkOption {
+    networking.enableRTL8192cFirmware = lib.mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = lib.types.bool;
       description = ''
         Turn on this option if you want firmware for the RTL8192c (and related) NICs.
       '';
@@ -19,7 +19,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.networking.enableRTL8192cFirmware {
+  config = lib.mkIf config.networking.enableRTL8192cFirmware {
     hardware.enableAllFirmware = true;
   };
 
diff --git a/nixos/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix
index 318131be7493..650011aca817 100644
--- a/nixos/modules/hardware/network/smc-2632w/default.nix
+++ b/nixos/modules/hardware/network/smc-2632w/default.nix
@@ -1,9 +1,9 @@
-{pkgs, config, ...}:
+{lib, config, ...}:
 
 {
   hardware = {
     pcmcia = {
-      firmware = [ (pkgs.lib.cleanSource ./firmware) ];
+      firmware = [ (lib.cleanSource ./firmware) ];
     };
   };
 }
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index ab5c309bd422..f894c830eb6c 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -84,7 +84,7 @@ in
 
   config = mkIf cfg.enable {
 
-    assertions = pkgs.lib.singleton {
+    assertions = lib.singleton {
       assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64;
       message = "Option driSupport32Bit only makes sense on a 64-bit system.";
     };
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index c274970c5536..c2a11a1a8b32 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -152,7 +152,7 @@ in
   # default root password is empty.
   services.openssh.enable = true;
 
-  jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
+  jobs.openssh.startOn = lib.mkOverride 50 "";
 
   boot.loader.grub.enable = false;
   boot.loader.generationsDir.enable = false;
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index 0357bf801960..1156003d3f47 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -109,7 +109,7 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
+  jobs.openssh.startOn = lib.mkOverride 50 "";
 
   # To be able to use the systemTarball to catch troubles.
   boot.crashDump = {
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 3626308bff80..2ed70c1daa95 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -165,7 +165,7 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.openssh.startOn = pkgs.lib.mkOverride 50 "";
+  jobs.openssh.startOn = lib.mkOverride 50 "";
 
   # cpufrequtils fails to build on non-pc
   powerManagement.enable = false;
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index f7fac75eb069..39da2f1f0be6 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -1,7 +1,7 @@
 # This module generates nixos-install, nixos-rebuild,
 # nixos-generate-config, etc.
 
-{ config, pkgs, modulesPath, ... }:
+{ config, pkgs, modulesPath, lib, ... }:
 
 let
 
@@ -65,7 +65,7 @@ let
         test -e "$out/chrome/content/jquery-1.5.2.js" ||
           cp -f "$jquery" "$out/chrome/content/jquery-1.5.2.js"
       '';
-      gui = pkgs.lib.cleanSource "${modulesPath}/../gui";
+      gui = lib.cleanSource "${modulesPath}/../gui";
       jquery = pkgs.fetchurl {
         url = http://code.jquery.com/jquery-1.5.2.min.js;
         sha256 = "8f0a19ee8c606b35a10904951e0a27da1896eafe33c6e88cb7bcbe455f05a24a";
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 956215d9a97a..7e19f00f9095 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -1,19 +1,19 @@
 # This module defines the global list of uids and gids.  We keep a
 # central list to prevent id collisions.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   options = {
 
-    ids.uids = pkgs.lib.mkOption {
+    ids.uids = lib.mkOption {
       internal = true;
       description = ''
         The user IDs used in NixOS.
       '';
     };
 
-    ids.gids = pkgs.lib.mkOption {
+    ids.gids = lib.mkOption {
       internal = true;
       description = ''
         The group IDs used in NixOS.
diff --git a/nixos/modules/misc/lib.nix b/nixos/modules/misc/lib.nix
index 18fc68a69883..be8000ac029d 100644
--- a/nixos/modules/misc/lib.nix
+++ b/nixos/modules/misc/lib.nix
@@ -1,11 +1,11 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   options = {
-    lib = pkgs.lib.mkOption {
+    lib = lib.mkOption {
       default = {};
 
-      type = pkgs.lib.types.attrsOf pkgs.lib.types.attrs;
+      type = lib.types.attrsOf lib.types.attrs;
 
       description = ''
         This option allows modules to define helper functions, constants, etc.
diff --git a/nixos/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix
index b65f20d62f2d..f3c9f6ba651b 100644
--- a/nixos/modules/misc/passthru.nix
+++ b/nixos/modules/misc/passthru.nix
@@ -1,11 +1,11 @@
 # This module allows you to export something from configuration
 # Use case: export kernel source expression for ease of configuring
 
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   options = {
-    passthru = pkgs.lib.mkOption {
+    passthru = lib.mkOption {
       visible = false;
       description = ''
         This attribute set will be exported as a system attribute.
diff --git a/nixos/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix
index e1e31b4a56aa..804e1d01f12b 100644
--- a/nixos/modules/programs/blcr.nix
+++ b/nixos/modules/programs/blcr.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+  inherit (lib) mkOption mkIf;
   cfg = config.environment.blcr;
   blcrPkg = config.boot.kernelPackages.blcr;
 in
diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix
index 1c63ebe6a11e..f82338a69d25 100644
--- a/nixos/modules/programs/screen.nix
+++ b/nixos/modules/programs/screen.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
 let
-  inherit (pkgs.lib) mkOption mkIf types;
+  inherit (lib) mkOption mkIf types;
   cfg = config.programs.screen;
 in
 
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 5fcd2133a7e1..658b08b3d870 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -40,7 +40,7 @@ in
 
   options = {
 
-    users.defaultUserShell = pkgs.lib.mkOption {
+    users.defaultUserShell = lib.mkOption {
       description = ''
         This option defines the default shell assigned to user
         accounts.  This must not be a store path, since the path is
@@ -60,7 +60,7 @@ in
   config = {
 
     environment.systemPackages =
-      pkgs.lib.optional config.users.mutableUsers pkgs.shadow;
+      lib.optional config.users.mutableUsers pkgs.shadow;
 
     environment.etc =
       [ { # /etc/login.defs: global configuration for pwdutils.  You
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index f1f3d005f30f..f731900070e4 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
 with pkgs;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
index 5d3675fa3e9d..5f2b4e76aeeb 100644
--- a/nixos/modules/services/backup/sitecopy-backup.nix
+++ b/nixos/modules/services/backup/sitecopy-backup.nix
@@ -73,7 +73,7 @@ in
         touch ${stateDir}/sitecopy.secrets
         chown root ${stateDir}/sitecopy.secrets
 
-        ${pkgs.lib.concatStrings (map ( b: ''
+        ${lib.concatStrings (map ( b: ''
             unset secrets
             unset secret
             secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1`
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index ad83cb553e1d..01c55479b2b4 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -85,7 +85,7 @@ in
           Defines how users authenticate themselves to the server. By
           default, "trust" access to local users will always be granted
           along with any other custom options. If you do not want this,
-          set this option using "pkgs.lib.mkForce" to override this
+          set this option using "lib.mkForce" to override this
           behaviour.
         '';
       };
diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
index 2279ef48fb9c..88bbdadfcbdd 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
@@ -1,8 +1,8 @@
 # GNOME Documents daemon.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   gnome3 = config.environment.gnome3.packageSet;
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index be14f1fcbc0c..566c8a50e269 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
@@ -1,8 +1,8 @@
 # GNOME Keyring daemon.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   gnome3 = config.environment.gnome3.packageSet;
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
index a41fb0101f0f..82d04c62c70d 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
@@ -1,8 +1,8 @@
 # GNOME Online Accounts daemon.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   gnome3 = config.environment.gnome3.packageSet;
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
index 030d4bac6a76..6acd633b62c9 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
@@ -1,8 +1,8 @@
 # GNOME Online Miners daemon.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   gnome3 = config.environment.gnome3.packageSet;
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
index 3b6c713f7be3..e5c94cff7c84 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
@@ -1,8 +1,8 @@
 # GNOME User Share daemon.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   gnome3 = config.environment.gnome3.packageSet;
diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix
index 1a003ddd1efb..7e1382b161e1 100644
--- a/nixos/modules/services/desktops/gnome3/gvfs.nix
+++ b/nixos/modules/services/desktops/gnome3/gvfs.nix
@@ -1,8 +1,8 @@
 # gvfs backends
 
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   gnome3 = config.environment.gnome3.packageSet;
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
index 01e4a24f2672..45925aaca9b9 100644
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ b/nixos/modules/services/desktops/gnome3/seahorse.nix
@@ -1,8 +1,8 @@
 # Seahorse daemon.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   gnome3 = config.environment.gnome3.packageSet;
diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix
index 670e585c6f55..8c5935a5ee3c 100644
--- a/nixos/modules/services/desktops/gnome3/tracker.nix
+++ b/nixos/modules/services/desktops/gnome3/tracker.nix
@@ -1,8 +1,8 @@
 # Tracker daemon.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   gnome3 = config.environment.gnome3.packageSet;
diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index a710636c1400..b87899e45983 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
@@ -16,7 +16,7 @@ let
             echo "event=${event.event}" > $fn
             echo "action=${pkgs.writeScript "${event.name}.sh" event.action}" >> $fn
           '';
-        in pkgs.lib.concatMapStrings f events
+        in lib.concatMapStrings f events
       }
     '';
 
diff --git a/nixos/modules/services/hardware/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix
index d938867186d0..087bd0e04098 100644
--- a/nixos/modules/services/hardware/amd-hybrid-graphics.nix
+++ b/nixos/modules/services/hardware/amd-hybrid-graphics.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
 
@@ -6,9 +6,9 @@
 
   options = {
 
-    hardware.amdHybridGraphics.disable = pkgs.lib.mkOption {
+    hardware.amdHybridGraphics.disable = lib.mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = lib.types.bool;
       description = ''
         Completely disable the AMD graphics card and use the
         integrated graphics processor instead.
@@ -20,7 +20,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.hardware.amdHybridGraphics.disable {
+  config = lib.mkIf config.hardware.amdHybridGraphics.disable {
     systemd.services."amd-hybrid-graphics" = {
       path = [ pkgs.bash ];
       description = "Disable AMD Card";
diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix
index 4c0ce794d4f7..9fe4021c4247 100644
--- a/nixos/modules/services/hardware/nvidia-optimus.nix
+++ b/nixos/modules/services/hardware/nvidia-optimus.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let kernel = config.boot.kernelPackages; in
 
@@ -8,9 +8,9 @@ let kernel = config.boot.kernelPackages; in
 
   options = {
 
-    hardware.nvidiaOptimus.disable = pkgs.lib.mkOption {
+    hardware.nvidiaOptimus.disable = lib.mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = lib.types.bool;
       description = ''
         Completely disable the NVIDIA graphics card and use the
         integrated graphics processor instead.
@@ -22,7 +22,7 @@ let kernel = config.boot.kernelPackages; in
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.hardware.nvidiaOptimus.disable {
+  config = lib.mkIf config.hardware.nvidiaOptimus.disable {
     boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb"];
     boot.kernelModules = [ "bbswitch" ];
     boot.extraModulePackages = [ kernel.bbswitch ];
diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index 2acc51c64a6a..642fac3b3a01 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
@@ -1,9 +1,9 @@
 # Monit system watcher
 # http://mmonit.org/monit/
 
-{config, pkgs, ...}:
+{config, pkgs, lib, ...}:
 
-let inherit (pkgs.lib) mkOption mkIf;
+let inherit (lib) mkOption mkIf;
 in
 
 {
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index 553110d7b80c..29616a085c8f 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
-  inherit (pkgs.lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional;
+  inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional;
 
   cfg = config.services.uptime;
 
diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index b34ebc3663e3..23ab39eb05f3 100644
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+  inherit (lib) mkOption mkIf;
 
   cfg = config.services.openafsClient;
 
diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
index bc17add809b2..19aa7efd2ff4 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
@@ -136,4 +136,4 @@ in
 
     networking.firewall.allowedTCPPorts = [ cfg.port ];
   };
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 7ed1e4805d8f..482b61997ae1 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
 with pkgs;
+with lib;
 
 let
   cfg = config.networking.connman;
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index c53cb68fb75f..bb94a8dacfa2 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
 
-  inherit (pkgs.lib) mkOption mkIf singleton;
+  inherit (lib) mkOption mkIf singleton;
 
   inherit (pkgs) ddclient;
 
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 89f686c28703..e5e1c103c686 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -18,7 +18,7 @@ let
 
       ${cfg.extraConfig}
 
-      ${pkgs.lib.concatMapStrings
+      ${lib.concatMapStrings
           (machine: ''
             host ${machine.hostName} {
               hardware ethernet ${machine.ethernetAddress};
diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix
index 594a2e80f345..c633ffedef49 100644
--- a/nixos/modules/services/networking/gvpe.nix
+++ b/nixos/modules/services/networking/gvpe.nix
@@ -1,9 +1,9 @@
 # GNU Virtual Private Ethernet
 
-{config, pkgs, ...}:
+{config, pkgs, lib, ...}:
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+  inherit (lib) mkOption mkIf;
 
   cfg = config.services.gvpe;
 
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 54bdf19373d5..bc1c95d3fd36 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
 with pkgs;
+with lib;
 
 let
   cfg = config.networking.networkmanager;
@@ -151,7 +151,7 @@ in {
       { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
         target = "NetworkManager/VPN/nm-pptp-service.name";
       }
-    ] ++ pkgs.lib.optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
+    ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
            { source = overrideNameserversScript;
              target = "NetworkManager/dispatcher.d/02overridedns";
            };
diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
index 3e8c956f191e..2e1412ff7c83 100644
--- a/nixos/modules/services/networking/notbit.nix
+++ b/nixos/modules/services/networking/notbit.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 let
   cfg = config.services.notbit;
   varDir = "/var/lib/notbit";
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index adfee1caec58..db8cb1228719 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.nsd;
diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix
index 2d3478d52f83..b3656d73dec0 100644
--- a/nixos/modules/services/networking/teamspeak3.nix
+++ b/nixos/modules/services/networking/teamspeak3.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   ts3 = pkgs.teamspeak_server;
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 5da71b12dd76..9ce0bcbec7eb 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -15,7 +15,7 @@ let
         MAILTO="${config.services.cron.mailto}"
       ''}
       NIX_CONF_DIR=/etc/nix
-      ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
+      ${lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
 
   # Vixie cron requires build-time configuration for the sendmail path.
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index 346a64f2c3cb..ade8c19329ca 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -17,7 +17,7 @@ let
         MAILTO="${config.services.cron.mailto}"
       ''}
       NIX_CONF_DIR=/etc/nix
-      ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
+      ${lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
 
   allowdeny = target: users:
diff --git a/nixos/modules/services/security/frandom.nix b/nixos/modules/services/security/frandom.nix
index 9aae7b33a430..2d43d12e541d 100644
--- a/nixos/modules/services/security/frandom.nix
+++ b/nixos/modules/services/security/frandom.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{lib, config, ...}:
 
 let kernel = config.boot.kernelPackages;
 in
@@ -9,9 +9,9 @@ in
 
   options = {
 
-    services.frandom.enable = pkgs.lib.mkOption {
+    services.frandom.enable = lib.mkOption {
       default = false;
-      type = pkgs.lib.types.bool;
+      type = lib.types.bool;
       description = ''
         enable the /dev/frandom device (a very fast random number generator)
       '';
@@ -22,7 +22,7 @@ in
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.services.frandom.enable {
+  config = lib.mkIf config.services.frandom.enable {
     boot.kernelModules = [ "frandom" ];
     boot.extraModulePackages = [ kernel.frandom ];
     services.udev.packages = [ kernel.frandom ];
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index 8fb5debd20e4..3a0171ca1b9b 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -1,8 +1,8 @@
-{pkgs, config, ...}:
+{pkgs, config, lib, ...}:
 
 let
 
-  inherit (pkgs.lib) mkOption mkIf singleton;
+  inherit (lib) mkOption mkIf singleton;
 
   inherit (pkgs) heimdal;
 
@@ -36,7 +36,7 @@ in
     environment.systemPackages = [ heimdal ];
 
     services.xinetd.enable = true;
-    services.xinetd.services = pkgs.lib.singleton
+    services.xinetd.services = lib.singleton
       { name = "kerberos-adm";
         flags = "REUSE NAMEINARGS";
         protocol = "tcp";
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index 1ac82064a1f7..5460e962ea2c 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -7,7 +7,7 @@ let
   nssModulesPath = config.system.nssModules.path;
   cfg = config.services.nscd;
 
-  inherit (pkgs.lib) singleton;
+  inherit (lib) singleton;
 
   cfgFile = pkgs.writeText "nscd.conf" cfg.config;
 
diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix
index 61eecd5c9ba8..ab46c508914d 100644
--- a/nixos/modules/services/system/uptimed.nix
+++ b/nixos/modules/services/system/uptimed.nix
@@ -1,8 +1,8 @@
-{pkgs, config, ...}:
+{pkgs, config, lib, ...}:
 
 let
 
-  inherit (pkgs.lib) mkOption mkIf singleton;
+  inherit (lib) mkOption mkIf singleton;
 
   inherit (pkgs) uptimed;
 
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 70555e5d8825..7783a1ada71d 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
-  inherit (pkgs.lib) mkOption types mkIf optionalString;
+  inherit (lib) mkOption types mkIf optionalString;
 
   cfg = config.services.kmscon;
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
index 755b595c783d..1d4303b75b35 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, serverInfo, ... }:
+{ config, pkgs, serverInfo, lib, ... }:
 
 let
   inherit (pkgs) mercurial;
-  inherit (pkgs.lib) mkOption;
+  inherit (lib) mkOption;
 
   urlPrefix = config.urlPrefix;
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
index 1b754cf025eb..b2cd53ae55cd 100644
--- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, serverInfo, ... }:
+{ config, pkgs, serverInfo, lib, ... }:
 
 let
-  extraWorkersProperties = pkgs.lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties;
+  extraWorkersProperties = lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties;
   
   workersProperties = pkgs.writeText "workers.properties" ''
 # Define list of workers that will be used
diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix
index 46b1945d33e8..8fc759dda68a 100644
--- a/nixos/modules/services/x11/window-managers/openbox.nix
+++ b/nixos/modules/services/x11/window-managers/openbox.nix
@@ -1,7 +1,7 @@
-{pkgs, config, ...}:
+{lib, pkgs, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+  inherit (lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.openbox;
 in
 
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 87eff38a028a..74acfc219759 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -1,7 +1,7 @@
-{pkgs, config, ...}:
+{pkgs, lib, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption mkIf optionals literalExample;
+  inherit (lib) mkOption mkIf optionals literalExample;
   cfg = config.services.xserver.windowManager.xmonad;
   xmonadEnv = cfg.haskellPackages.ghcWithPackages(self: [
     self.xmonad
@@ -48,7 +48,7 @@ in
       enableContribAndExtras = mkOption {
         default = false;
         example = true;
-        type = pkgs.lib.types.bool;
+        type = lib.types.bool;
         description = "Enable xmonad-{contrib,extras} in Xmonad.";
       };
     };
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index e56549149cb8..0370e36fbec2 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, modulesPath, ... }:
+{ config, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   fileSystems = attrValues config.fileSystems ++ config.swapDevices;
diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix
index 8655107360c1..1ed7b1b6a62e 100644
--- a/nixos/modules/tasks/filesystems/f2fs.nix
+++ b/nixos/modules/tasks/filesystems/f2fs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems;
diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
index 177c97f85c78..5b7777180568 100644
--- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix
+++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  config = pkgs.lib.mkMerge [
-    (pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {
+  config = lib.mkMerge [
+    (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {
       boot.initrd.kernelModules = [ "fuse" ];
   
       boot.initrd.extraUtilsCommands = ''
@@ -17,7 +17,7 @@
           ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
         '';
     })
-    (pkgs.lib.mkIf (pkgs.lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {
+    (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {
       system.fsPackages = [ pkgs.unionfs-fuse ];
     })
   ];
diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix
index 0cbca71e1326..a463cb803ade 100644
--- a/nixos/modules/testing/minimal-kernel.nix
+++ b/nixos/modules/testing/minimal-kernel.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
-  configfile = builtins.storePath (builtins.toFile "config" (pkgs.lib.concatStringsSep "\n"
+  configfile = builtins.storePath (builtins.toFile "config" (lib.concatStringsSep "\n"
     (map (builtins.getAttr "configLine") config.system.requiredKernelConfig))
   );
 
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index b3847daf12c0..a5a4db797877 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -11,7 +11,6 @@ let
 
 in
 
-optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
 {
 
   ###### interface
@@ -33,6 +32,10 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
   ###### implementation
 
   config = mkIf cfg.enable {
+    assertions = [ {
+      assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
+      message = "Virtualbox not currently supported on ${pkgs.stdenv.system}";
+    } ];
 
     environment.systemPackages = [ kernel.virtualboxGuestAdditions ];
 

From cfcbfb494e952e8954ad9106ca0a6bb5a632fe10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Jul 2014 18:44:54 +0200
Subject: [PATCH 058/167] python: 2.7.7 -> 2.7.8

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

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 523587d38c88..9d75ea973e61 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 let
 
   majorVersion = "2.7";
-  version = "${majorVersion}.7";
+  version = "${majorVersion}.8";
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "0y6s12rdi89k24p8zarhy9fqmyy459yg0d125c7cac4v136y70r9";
+    sha256 = "0nh7d3dp75f1aj0pamn4hla8s0l7nbaq4a38brry453xrfh11ppd";
   };
 
   patches =

From 2e70c676ca41a3e3d96bde09cbb9570d139bb3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Jul 2014 19:55:39 +0200
Subject: [PATCH 059/167] python: link gcc_s
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/interpreters/python/2.7/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 9d75ea973e61..388a0c9b1346 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -56,6 +56,7 @@ let
 
     inherit majorVersion version src patches postPatch buildInputs;
 
+    LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
     C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 

From 1f5d61ca5b7e751fe4bc0e95192daf2239beedae Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 26 Jun 2014 13:13:28 +0200
Subject: [PATCH 060/167] python click-2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2db19dbdf8bc..bfbe59557465 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1052,6 +1052,20 @@ rec {
   });
 
 
+  click = buildPythonPackage {
+    name = "click-2.1";
+    src = fetchurl {
+      url = https://pypi.python.org/packages/source/c/click/click-2.1.tar.gz;
+      md5 = "0ba97ba09af82c56e2d35f3412d0aa6e";
+    };
+    meta = {
+      homepage = "http://click.pocoo.org/";
+      description = "Click is a Python package for creating beautiful command line interfaces in a composable way with as little code as necessary.";
+      license = "bsd, 3-clause";
+    };
+  };
+
+
   clepy = buildPythonPackage rec {
     name = "clepy-0.3.20";
 

From 3fafbed0766d399f244283f704f8e8bdb02ae5c0 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 27 Jun 2014 13:13:34 +0200
Subject: [PATCH 061/167] python plumbum-1.4.2

---
 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 bfbe59557465..4f8e11e55511 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5209,13 +5209,13 @@ rec {
   };
 
   plumbum = buildPythonPackage rec {
-    name = "plumbum-1.2.0";
+    name = "plumbum-1.4.2";
 
     buildInputs = [ pythonPackages.six ];
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/p/plumbum/plumbum-1.2.0.tar.gz";
-      md5 = "18b7f888dfaf62a48df937abffe07897";
+      url = "https://pypi.python.org/packages/source/p/plumbum/${name}.tar.gz";
+      md5 = "38b526af9012a5282ae91dfe372cefd3";
     };
   };
 

From 48817c8d97e095e7bf387a1cc9abf4d807e23ca8 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 2 Jul 2014 22:22:30 +0200
Subject: [PATCH 062/167] python pip-1.5.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f8e11e55511..d93e4f33c514 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5146,11 +5146,11 @@ rec {
   };
 
   pip = buildPythonPackage rec {
-    version = "1.5";
+    version = "1.5.6";
     name = "pip-${version}";
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz";
-      sha256 = "0j700f70mj0brdlvs2cz4a7h4jwmzgymgp8qk1qb3lsm1qd1vy15";
+      md5 = "01026f87978932060cc86c1dc527903e";
     };
     buildInputs = [ mock scripttest virtualenv pytest ];
   };

From febf46bf5c6d3e095e9c8e3ebfd876af4ff7a80b Mon Sep 17 00:00:00 2001
From: Paul Colomiets <paul@colomiets.name>
Date: Wed, 2 Jul 2014 22:43:34 +0300
Subject: [PATCH 063/167] rust: Update to 0.11

---
 pkgs/development/compilers/rust/default.nix   | 32 +++++------
 .../compilers/rust/hardcode_paths.patch       | 57 ++++++++-----------
 2 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 08dea1f0f7f0..2c27cf778a14 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -16,28 +16,25 @@
 
 with if stdenv.system == "i686-linux" then {
   platform = "linux-i386";
-  snapshot = "3bef5684fd0582fbd4ddebd4514182d4f72924f7";
-  snapshot_sha = "1c72d65pcgm3z4sly7al09mjvpp8asxbbv7iyzzv5k8f66ny2agy";
+  snapshot = "84339ea0f796ae468ef86797ef4587274bec19ea";
   target = "i686-unknown-linux-gnu";
 } else if stdenv.system == "x86_64-linux" then {
   platform = "linux-x86_64";
-  snapshot = "a7b2af1076d48e4a687a71a21478293e834349bd";
-  snapshot_sha = "1c72d65pcgm3z4sly7al09mjvpp8asxbbv7iyzzv5k8f66ny2agy";
+  snapshot = "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae";
   target = "x86_64-unknown-linux-gnu";
 } else if stdenv.system == "x86_64-darwin" then {
   platform = "macos-x86_64";
-  snapshot = "22b884a3876cb3e40ad942ad68a496b5f239fca5";
-  snapshot_sha = "0qabkvyryiwlqhzy1kscff27rx788bv7lh7d8m1hnsv38wqhwqqb";
+  snapshot = "4a8c2e1b7634d73406bac32a1a97893ec3ed818d";
 } else {};
-let snapshotDate = "2014-03-28";
-    snapshotRev = "b8601a3";
+let snapshotDate = "2014-06-21";
+    snapshotRev = "db9af1d";
     snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in
 stdenv.mkDerivation {
-  name = "rust-0.10";
+  name = "rust-0.11.0";
 
   src = fetchurl {
-    url = http://static.rust-lang.org/dist/rust-0.10.tar.gz;
-    sha256 = "c72cfbbf03016804a81d7b68e8258ffaf018f8f5a25550ad64571ce6c2642cf9";
+    url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz;
+    sha256 = "1fhi8iiyyj5j48fpnp93sfv781z1dm0xy94h534vh4mz91jf7cyi";
   };
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -45,15 +42,16 @@ stdenv.mkDerivation {
     name = "rust-stage0";
     src = fetchurl {
       url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
-      sha256 = snapshot_sha;
+      sha1 = snapshot;
     };
+    dontStrip = true;
     installPhase = ''
       mkdir -p "$out"
       cp -r bin "$out/bin"
     '' + (if stdenv.isLinux then ''
-      patchelf --interpreter ${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker} \
-               --set-rpath ${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/ \
-               $out/bin/rustc
+      patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \
+               --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \
+               "$out/bin/rustc"
     '' else "");
   };
 
@@ -63,8 +61,8 @@ stdenv.mkDerivation {
   patches = [ ./hardcode_paths.patch ./local_stage0.patch ];
   postPatch = ''
     substituteInPlace src/librustc/back/link.rs \
-      --subst-var-by "gccPath" ${stdenv.gcc}/bin/cc \
-      --subst-var-by "binutilsPath" ${stdenv.gcc.binutils}/bin/ar
+      --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \
+      --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"
   '';
 
   buildInputs = [ which file perl curl python27 makeWrapper ];
diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rust/hardcode_paths.patch
index b3e26281644d..77e4c3f37887 100644
--- a/pkgs/development/compilers/rust/hardcode_paths.patch
+++ b/pkgs/development/compilers/rust/hardcode_paths.patch
@@ -1,41 +1,32 @@
 diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
-index f198a41..3a47e51 100644
+index 7a3e912..ced75fa 100644
 --- a/src/librustc/back/link.rs
 +++ b/src/librustc/back/link.rs
-@@ -730,7 +730,7 @@ pub fn get_cc_prog(sess: &Session) -> ~str {
-         _ => {},
+@@ -766,24 +766,15 @@ pub fn output_lib_filename(id: &CrateId) -> String {
+ 
+ pub fn get_cc_prog(sess: &Session) -> String {
+     match sess.opts.cg.linker {
+-        Some(ref linker) => return linker.to_string(),
+-        None => {}
++        Some(ref linker) => linker.to_string(),
++        None => "@ccPath@".to_string()
      }
- 
--    get_system_tool(sess, "cc")
-+    ~"@gccPath@"
- }
- 
- pub fn get_ar_prog(sess: &Session) -> ~str {
-@@ -739,26 +739,7 @@ pub fn get_ar_prog(sess: &Session) -> ~str {
-         None => {}
-     }
- 
--    get_system_tool(sess, "ar")
--}
 -
--fn get_system_tool(sess: &Session, tool: &str) -> ~str {
+-    // In the future, FreeBSD will use clang as default compiler.
+-    // It would be flexible to use cc (system's default C compiler)
+-    // instead of hard-coded gcc.
+-    // For win32, there is no cc command, so we add a condition to make it use gcc.
 -    match sess.targ_cfg.os {
--        abi::OsAndroid => match sess.opts.cg.android_cross_path {
--            Some(ref path) => {
--                let tool_str = match tool {
--                    "cc" => "gcc",
--                    _ => tool
--                };
--                format!("{}/bin/arm-linux-androideabi-{}", *path, tool_str)
--            }
--            None => {
--                sess.fatal(format!("need Android NDK path for the '{}' tool \
--                                    (-C android-cross-path)", tool))
--            }
--        },
--        _ => tool.to_owned(),
--    }
-+    ~"@binutilsPath@"
+-        abi::OsWin32 => "gcc",
+-        _ => "cc",
+-    }.to_string()
+ }
+ 
+ pub fn get_ar_prog(sess: &Session) -> String {
+     match sess.opts.cg.ar {
+         Some(ref ar) => (*ar).clone(),
+-        None => "ar".to_string()
++        None => "@arPath@".to_string()
+     }
  }
  
- fn remove(sess: &Session, path: &Path) {

From 1388ae5da51bf0ebcedfa8f14621081c0baf74fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 2 Jul 2014 23:57:42 +0200
Subject: [PATCH 064/167] lua: add 'lua' attribute pointing to 'lua5'

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc134bdc7eb2..fadcb46b0f88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3464,6 +3464,7 @@ let
     compat = true;
   };
   lua5 = lua5_1;
+  lua = lua5;
 
   lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {};
   lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};

From 9db55e72e57de2f53c00ee411faeda780c3ebe0c Mon Sep 17 00:00:00 2001
From: Daniel Austin <dan@fluffynukeit.com>
Date: Thu, 3 Jul 2014 03:25:05 +0200
Subject: [PATCH 065/167] Added snapWebRoutes to haskellPackages.

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

diff --git a/pkgs/development/libraries/haskell/snap-web-routes/default.nix b/pkgs/development/libraries/haskell/snap-web-routes/default.nix
new file mode 100644
index 000000000000..dd1096a3a235
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snap-web-routes/default.nix
@@ -0,0 +1,14 @@
+{ cabal, heist, mtl, snap, snapCore, text, webRoutes, xmlhtml }:
+
+cabal.mkDerivation (self: {
+  pname = "snap-web-routes";
+  version = "0.5.0.0";
+  sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv";
+  buildDepends = [ heist mtl snap snapCore text webRoutes xmlhtml ];
+  meta = {
+    homepage = "https://github.com/lukerandall/snap-web-routes";
+    description = "Type safe URLs for Snap";
+    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 560b0b77ce68..74b9b9cae790 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2018,6 +2018,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
 
+  snapWebRoutes = callPackage ../development/libraries/haskell/snap-web-routes {};
+
   snowball = callPackage ../development/libraries/haskell/snowball {};
 
   socks = callPackage ../development/libraries/haskell/socks {};

From d60c5a55a047b7b6a63f85b06bd9a443071cfb87 Mon Sep 17 00:00:00 2001
From: Daniel Austin <dan@fluffynukeit.com>
Date: Thu, 3 Jul 2014 07:40:38 +0200
Subject: [PATCH 066/167] Added snapletPostgresqlSimple to haskellPackages.

---
 .../haskell/resource-pool-catchio/default.nix | 19 ++++++++++++++++
 .../snaplet-postgresql-simple/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 3 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
 create mode 100644 pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix

diff --git a/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix b/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
new file mode 100644
index 000000000000..97b90714e1e9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
@@ -0,0 +1,19 @@
+{ cabal, hashable, MonadCatchIOTransformers, stm, time
+, transformers, transformersBase, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "resource-pool-catchio";
+  version = "0.2.1.0";
+  sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw";
+  buildDepends = [
+    hashable MonadCatchIOTransformers stm time transformers
+    transformersBase vector
+  ];
+  meta = {
+    homepage = "http://github.com/norm2782/pool";
+    description = "Fork of resource-pool, with a MonadCatchIO constraint";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
new file mode 100644
index 000000000000..468d725479b3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
@@ -0,0 +1,22 @@
+{ cabal, clientsession, configurator, errors
+, MonadCatchIOTransformers, mtl, postgresqlSimple
+, resourcePoolCatchio, snap, text, transformers
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "snaplet-postgresql-simple";
+  version = "0.5";
+  sha256 = "0pzn0lg1slrllrrx1n9s1kp1pmq2ahrkjypcwnnld8zxzvz4g5jm";
+  buildDepends = [
+    clientsession configurator errors MonadCatchIOTransformers mtl
+    postgresqlSimple resourcePoolCatchio snap text transformers
+    unorderedContainers
+  ];
+  meta = {
+    homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
+    description = "postgresql-simple snaplet for the Snap 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 560b0b77ce68..c80d265072ed 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1922,6 +1922,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   resourcePool = callPackage ../development/libraries/haskell/resource-pool {};
 
+  resourcePoolCatchio = callPackage ../development/libraries/haskell/resource-pool-catchio {};
+
   resourcet = callPackage ../development/libraries/haskell/resourcet {};
 
   retry = callPackage ../development/libraries/haskell/retry {};
@@ -2002,6 +2004,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {};
 
+  snapletPostgresqlSimple = callPackage ../development/libraries/haskell/snaplet-postgresql-simple {};
+
   snapletRedis = callPackage ../development/libraries/haskell/snaplet-redis {};
 
   snapletStripe = callPackage ../development/libraries/haskell/snaplet-stripe {};

From 543f355883c8d7717ad9b028125a99bb978910b6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Thu, 3 Jul 2014 11:09:47 +0200
Subject: [PATCH 067/167] Adds biniou

---
 .../ocaml-modules/biniou/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/biniou/default.nix

diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
new file mode 100644
index 000000000000..f0a1ee102088
--- /dev/null
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, ocaml, findlib, easy-format}:
+let
+  pname = "biniou";
+  version = "1.0.9";
+  webpage = "http://mjambon.com/${pname}.html";
+in
+stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
+    sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb";
+  };
+
+  buildInputs = [ ocaml findlib easy-format ];
+
+  createFindlibDestdir = true;
+
+  makeFlags = "PREFIX=$(out)";
+
+  preBuild = ''
+    mkdir $out/bin
+  '';
+
+  meta = {
+    description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
+    homepage = "${webpage}";
+    license = "bsd";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fadcb46b0f88..a494a1f96323 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3186,6 +3186,8 @@ let
       giflib = giflib_4_1;
     };
 
+    biniou = callPackage ../development/ocaml-modules/biniou { };
+
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
     cppo = callPackage ../development/tools/ocaml/cppo { };

From 27515430cab59508dfdcc234439091891555844e Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 3 Jul 2014 11:15:55 +0200
Subject: [PATCH 068/167] mu: Bump to 0.9.9.6.

---
 pkgs/tools/networking/mu/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index f959ad1d5731..1055ef90b124 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,19 +1,25 @@
-{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile
+{ fetchurl, stdenv, sqlite, pkgconfig, autoconf, automake
+, xapian, glib, gmime, texinfo , emacs, guile
 , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.9.5";
+  version = "0.9.9.6";
   name = "mu-${version}";
 
   src = fetchurl {
-    url = "https://mu0.googlecode.com/files/mu-${version}.tar.gz";
-    sha256 = "1hwkliyb8fjrz5sw9fcisssig0jkdxzhccw0ld0l9a10q1l9mqhp";
+    url = "https://github.com/djcb/mu/archive/v${version}.tar.gz";
+    sha256 = "1jr9ss29yi6d62hd4ap07p2abgf12hwqfhasv3gwdkrx8dzwmr2a";
   };
 
   buildInputs =
-    [ sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu ]
+    [ sqlite pkgconfig autoconf automake xapian
+      glib gmime texinfo emacs guile libsoup icu ]
     ++ stdenv.lib.optional withMug [ gtk3 webkit ];
 
+  preConfigure = ''
+    autoreconf -i
+  '';
+
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
     substituteInPlace mu4e/mu4e-meta.el.in \

From d4243e2a002ae995299f4b7d785270b7bee54863 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 2 Jul 2014 19:16:41 +0200
Subject: [PATCH 069/167] linux: Update to 3.14.10

---
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index f867309529f1..9068fba12b00 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.9";
+  version = "3.14.10";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0rm68hzkxzzh6a1nw6fsxbg43d4b88957ail7b9ga589cagf3p94";
+    sha256 = "10gf1r3xnix4v2az7i9dxnddmi377hhlbyblgm0nz9sxddgmk36z";
   };
 
   features.iwlwifi = true;

From b50074929e2fa8dc4d4e8fd7da276f6a85e764f1 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 2 Jul 2014 19:16:52 +0200
Subject: [PATCH 070/167] grsecurity: Update stable and test patches

stable: 3.0-3.14.9-201406262057 -> 3.0-3.14.10-201407012152
test:   3.0-3.15.2-201406262058 -> 3.0-3.15.3-201407012153
---
 pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5a6a7d15c3c9..cfe006fbe4b5 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -60,17 +60,17 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.9";
-      revision  = "201406262057";
+    { kversion  = "3.14.10";
+      revision  = "201407012152";
       branch    = "stable";
-      sha256    = "0rrcmlaz69028fwl45xnif1dc9wnl7lnrry1280mdg764wrc6g0n";
+      sha256    = "1119044lzkr9wpr1gpl1g0bz67c2xpdd9bkddllij7ja24jv8sx1";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.15.2";
-      revision  = "201406262058";
+    { kversion  = "3.15.3";
+      revision  = "201407012153";
       branch    = "test";
-      sha256    = "02r9xasg1hiw3bynwh50r9cqjzwffmhsyg4gmiyzs58izivl1hvd";
+      sha256    = "0bccayakprc77530crxfr9v2hbs6hlcf290pj1ywlh1p861ljgbm";
     };
 
   grsec_fix_path =

From 3614b34c6a66d86f579578a49ca438b756934225 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 2 Jul 2014 19:16:56 +0200
Subject: [PATCH 071/167] transmission: Update from 2.83 -> 2.84

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

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index f260e3eb30ae..874de7d51929 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.83";
+  version = "2.84";
 in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.transmissionbt.com/files/transmission-${version}.tar.xz";
-    sha256 = "0cqlgl6jmjw1caybz6nzh3l8z0jak1dxba01isv72zvy2r8b1qdh";
+    sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59";
   };
 
   buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ]

From 993e8da4960837cf68bfc1680841b089df435d66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jul 2014 11:53:21 +0200
Subject: [PATCH 072/167] dhcpcd: Update to 6.4.0

The lxc_ro_promote_secondaries patch no longer applies so I disabled
it for now (@offlinehacker).
---
 .../networking/dhcpcd/check-interface.patch   | 48 +++++++++++++------
 pkgs/tools/networking/dhcpcd/default.nix      |  6 +--
 pkgs/tools/networking/dhcpcd/reload.patch     |  4 ++
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/networking/dhcpcd/check-interface.patch b/pkgs/tools/networking/dhcpcd/check-interface.patch
index 2b732b740ad4..11685c0d45e4 100644
--- a/pkgs/tools/networking/dhcpcd/check-interface.patch
+++ b/pkgs/tools/networking/dhcpcd/check-interface.patch
@@ -1,24 +1,44 @@
-Index: dhcpcd.c
-==================================================================
---- a/dhcpcd.c
-+++ b/dhcpcd.c
-@@ -747,14 +747,14 @@
- 			if (ifp->hwlen != 0)
- 				memcpy(ifl->hwaddr, ifp->hwaddr, ifl->hwlen);
+Fix a segfault in handle_interface: if we're adding an interface that
+we already knew about (in particular due to a udev event), then
+calling init_state/start_interface on ifp is bad because we later free
+ifp. This leads to messages like:
+
+  dhcpcd[1342]: eth0: IAID conflicts with one assigned to eth0
+
+and then a crash:
+
+  Invalid read of size 8
+    at 0x41CD07: dhcp_handlepacket (dhcp.c:2555)
+    by 0x408A74: eloop_start (eloop.c:399)
+    by 0x4073B6: main (dhcpcd.c:1537)
+
+  Address 0x54573d8 is 200 bytes inside a block of size 232 free'd
+    at 0x4C27507: free (in /nix/store/jafbjc2y6izmh3sk78fl65n55jll4mj8-valgrind-3.9.0/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+    by 0x40F0A8: free_interface (net.c:153)
+    by 0x405443: handle_interface (dhcpcd.c:764) by 0x57E0F06: ??? (udev.c:97)
+    by 0x42EB62: dev_handle_data (dev.c:153)
+    by 0x408A74: eloop_start (eloop.c:399)
+    by 0x4073B6: main (dhcpcd.c:1537)
+
+So ignore interfaces that we already know about.
+
+diff -ru -x '*~' dhcpcd-6.4.0-orig/dhcpcd.c dhcpcd-6.4.0/dhcpcd.c
+--- dhcpcd-6.4.0-orig/dhcpcd.c	2014-06-14 22:13:12.000000000 +0200
++++ dhcpcd-6.4.0/dhcpcd.c	2014-07-03 11:13:39.133186533 +0200
+@@ -774,11 +774,11 @@
  		} else {
  			TAILQ_REMOVE(ifs, ifp, next);
  			TAILQ_INSERT_TAIL(ctx->ifaces, ifp, next);
 -		}
--		if (action == 1) {
+-		if (action > 0) {
 -			init_state(ifp, ctx->argc, ctx->argv);
--			start_interface(ifp);
-+			if (action == 1) {
+-			run_preinit(ifp);
+-			dhcpcd_startinterface(ifp);
++			if (action > 0) {
 +				init_state(ifp, ctx->argc, ctx->argv);
-+				start_interface(ifp);
++				run_preinit(ifp);
++				dhcpcd_startinterface(ifp);
 +			}
  		}
  	}
  
- 	/* Free our discovered list */
- 	while ((ifp = TAILQ_FIRST(ifs))) {
-
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 40f6538750f1..c3eeb20a2dea 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.3.2";
+  name = "dhcpcd-6.4.0";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "1v2m5wdr6x5cz6i0n1y63am9dhj5j7ylrk717scjgwwjdbq1x75n";
+    sha256 = "04whlqg1lik1c690kpgmw5hh6qzim64bw0l4fpr4vb8cj74aj4q4";
   };
 
-  patches = [ ./lxc_ro_promote_secondaries.patch ./reload.patch ./check-interface.patch ];
+  patches = [ /* ./lxc_ro_promote_secondaries.patch */ ./reload.patch ./check-interface.patch ];
 
   buildInputs = [ pkgconfig udev ];
 
diff --git a/pkgs/tools/networking/dhcpcd/reload.patch b/pkgs/tools/networking/dhcpcd/reload.patch
index 0ecb75a44760..126ad105cbbf 100644
--- a/pkgs/tools/networking/dhcpcd/reload.patch
+++ b/pkgs/tools/networking/dhcpcd/reload.patch
@@ -1,3 +1,7 @@
+Fix segfault when reloading the configuration: free_globals() left the
+ifac/ifdc variables at -1 instead of 0, causing a crash later in
+splitv().
+
 --- a/dhcpcd.c
 +++ b/dhcpcd.c
 @@ -143,16 +143,18 @@

From e443fcb37f81b6a9e9eec0240de1bc07cf6544ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jul 2014 11:56:30 +0200
Subject: [PATCH 073/167] openresolv: Update to 3.5.7

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

diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 98a76dc98b18..666f3ad8ba71 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "openresolv-3.5.6";
+  name = "openresolv-3.5.7";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2";
-    sha256 = "1n3cw1vbm7mh5d95ykhzdn2mrrf3pm65sp61p8iwydz1gqkp2inv";
+    sha256 = "14n51wqnh49zdvx11l79s3fh1jhg7kg9cfny5vk7zsix78spmyx7";
   };
 
   buildInputs = [ makeWrapper ];

From 2737291b5d925c13aee4ac4180983f4edc925625 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jul 2014 12:37:40 +0200
Subject: [PATCH 074/167] Manual: html -> xhtml

---
 doc/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 3c2e8cb21b08..39988cdd414e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -21,18 +21,18 @@ all: NEWS.html NEWS.txt manual.html manual.pdf
 
 NEWS.html: release-notes.xml
 	$(XSLTPROC) --nonet --xinclude --output $@ $(NEWS_OPTS) \
-	  $(docbookxsl)/html/docbook.xsl release-notes.xml
+	  $(docbookxsl)/xhtml/docbook.xsl release-notes.xml
 
 NEWS.txt: release-notes.xml
 	$(XSLTPROC) --nonet --xinclude quote-literals.xsl release-notes.xml | \
 	  $(XSLTPROC) --nonet --output $@.tmp.html $(NEWS_OPTS) \
-	  $(docbookxsl)/html/docbook.xsl -
+	  $(docbookxsl)/xhtml/docbook.xsl -
 	LANG=en_US w3m -dump $@.tmp.html > $@
 	rm $@.tmp.html
 
 manual.html: *.xml
 	$(XSLTPROC) --nonet --xinclude --output manual.html \
-	  $(docbookxsl)/html/docbook.xsl manual.xml
+	  $(docbookxsl)/xhtml/docbook.xsl manual.xml
 
 manual.pdf: *.xml
 	$(dblatex) \

From e4216eddda21ecec3f631747c4e2975928a7fd99 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Thu, 3 Jul 2014 15:23:38 +0200
Subject: [PATCH 075/167] Clarifies the license; populates meta.platforms

---
 pkgs/development/ocaml-modules/biniou/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
index f0a1ee102088..59f30de5e841 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
     homepage = "${webpage}";
-    license = "bsd";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
   };
 }

From 2fe4eb3df97955e652169fe9584fbe7eb435b7a6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 3 Jul 2014 10:19:57 -0400
Subject: [PATCH 076/167] Make php packages available in nix-env

---
 pkgs/build-support/build-pecl.nix | 4 +++-
 pkgs/top-level/all-packages.nix   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
index d84497e8019c..727ed0c21975 100644
--- a/pkgs/build-support/build-pecl.nix
+++ b/pkgs/build-support/build-pecl.nix
@@ -1,6 +1,8 @@
 { stdenv, php, autoreconfHook }:
 
-args: stdenv.mkDerivation (args // {
+args@{ name, ... }: stdenv.mkDerivation (args // {
+  name = "php-${name}";
+
   buildInputs = [ php autoreconfHook ] ++ args.buildInputs or [];
 
   makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ args.makeFlags or [];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fadcb46b0f88..4dde2597d0b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3523,9 +3523,9 @@ let
 
   php = php54;
 
-  phpPackages = import ./php-packages.nix {
+  phpPackages = recurseIntoAttrs (import ./php-packages.nix {
     inherit php pkgs;
-  };
+  });
 
   php53 = callPackage ../development/interpreters/php/5.3.nix { };
 

From 609514d2812ca77f834f1b1bb120760f57519165 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:51:25 +0200
Subject: [PATCH 077/167] haskell-AES: fix spelling of the corresponding
 attribute and directory name

---
 pkgs/development/libraries/haskell/{aes => AES}/default.nix | 0
 pkgs/top-level/haskell-packages.nix                         | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/{aes => AES}/default.nix (100%)

diff --git a/pkgs/development/libraries/haskell/aes/default.nix b/pkgs/development/libraries/haskell/AES/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/aes/default.nix
rename to pkgs/development/libraries/haskell/AES/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 70964d23bbb2..dd8255a87b33 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -137,7 +137,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
-  aes = callPackage ../development/libraries/haskell/aes {};
+  AES = callPackage ../development/libraries/haskell/AES {};
 
   aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; };
   aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; };

From 837a8bcc80303897b1753ef2ccb91dcee248ed88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:51:55 +0200
Subject: [PATCH 078/167] haskell-SHA2: refer to AES library with its proper
 attribute

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

diff --git a/pkgs/development/libraries/haskell/SHA2/default.nix b/pkgs/development/libraries/haskell/SHA2/default.nix
index 435d51ae0fed..f02a7458a2f7 100644
--- a/pkgs/development/libraries/haskell/SHA2/default.nix
+++ b/pkgs/development/libraries/haskell/SHA2/default.nix
@@ -1,14 +1,13 @@
-{ cabal, aes, monadsTf, transformers }:
+{ cabal, AES, monadsTf, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "SHA2";
   version = "0.2.5";
   sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";
-  buildDepends = [ aes monadsTf transformers ];
+  buildDepends = [ AES monadsTf transformers ];
   meta = {
     description = "Fast, incremental SHA hashing for bytestrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
 })
-

From 20a931aa8b5f9a501168148af734955105969584 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:52:23 +0200
Subject: [PATCH 079/167] xmobar: set the proper home page url

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

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 5720cc9d18f6..5cb8fc0fd943 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
   extraLibraries = [ libXrandr wirelesstools ];
   configureFlags = "-fall_extensions";
   meta = {
-    homepage = "http://projects.haskell.org/xmobar/";
+    homepage = "http://xmobar.org";
     description = "A Minimalistic Text Based Status Bar";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 90bfde59f8235fb85f8852c496afb6414ead0239 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 3 Jul 2014 10:52:02 -0400
Subject: [PATCH 080/167] Simplify php-packages.nix

---
 pkgs/build-support/build-pecl.nix | 20 ++++++++++++++++----
 pkgs/top-level/php-packages.nix   | 30 +++++++++---------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix
index 727ed0c21975..135b68186f3a 100644
--- a/pkgs/build-support/build-pecl.nix
+++ b/pkgs/build-support/build-pecl.nix
@@ -1,11 +1,23 @@
-{ stdenv, php, autoreconfHook }:
+{ stdenv, php, autoreconfHook, fetchurl }:
 
-args@{ name, ... }: stdenv.mkDerivation (args // {
+{ name
+, buildInputs ? []
+, makeFlags ? []
+, src ? fetchurl {
+    url = "http://pecl.php.net/get/${name}.tgz";
+    inherit (args) sha256;
+  }
+, ...
+}@args:
+
+stdenv.mkDerivation (args // {
   name = "php-${name}";
 
-  buildInputs = [ php autoreconfHook ] ++ args.buildInputs or [];
+  inherit src;
 
-  makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ args.makeFlags or [];
+  buildInputs = [ php autoreconfHook ] ++ buildInputs;
+
+  makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
 
   autoreconfPhase = "phpize";
 })
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 39ea219cf645..6695f9d3a93f 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -3,16 +3,13 @@
 let self = with self; {
   buildPecl = import ../build-support/build-pecl.nix {
     inherit php;
-    inherit (pkgs) stdenv autoreconfHook;
+    inherit (pkgs) stdenv autoreconfHook fetchurl;
   };
 
   memcache = buildPecl {
     name = "memcache-3.0.8";
 
-    src = pkgs.fetchurl {
-      url = http://pecl.php.net/get/memcache-3.0.8.tgz;
-      sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic";
-    };
+    sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic";
 
     configureFlags = "--with-zlib-dir=${pkgs.zlib}";
   };
@@ -20,10 +17,7 @@ let self = with self; {
   memcached = buildPecl {
     name = "memcached-2.1.0";
 
-    src = pkgs.fetchurl {
-      url = http://pecl.php.net/get/memcached-2.1.0.tgz;
-      sha256 = "1by4zhkq4mbk9ja6s0vlavv5ng8aw5apn3a1in84fkz7bc0l0jdw";
-    };
+    sha256 = "1by4zhkq4mbk9ja6s0vlavv5ng8aw5apn3a1in84fkz7bc0l0jdw";
 
     configureFlags = [
       "--with-zlib-dir=${pkgs.zlib}"
@@ -35,26 +29,20 @@ let self = with self; {
 
   xdebug = buildPecl rec {
     name = "xdebug-2.2.5";
-    src = pkgs.fetchurl {
-      url = "http://pecl.php.net/get/${name}.tgz";
-      sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd";
-    };
+
+    sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd";
   };
 
   apc = buildPecl rec {
     name = "apc-3.1.13";
-    src = pkgs.fetchurl {
-      url = "http://pecl.php.net/get/${name}.tgz";
-      sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y";
-    };
+
+    sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y";
   };
 
   zmq = buildPecl rec {
     name = "zmq-1.1.2";
-    src = pkgs.fetchurl {
-      url = "http://pecl.php.net/get/${name}.tgz";
-      sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69";
-    };
+
+    sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69";
 
     configureFlags = [
       "--with-zmq=${pkgs.zeromq2}"

From 4277c05a88a616ba5cd94452a7d0d6905d0dc36b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 3 Jul 2014 10:52:59 -0400
Subject: [PATCH 081/167] Remove obsolete php-apc package

---
 .../development/libraries/php-apc/default.nix | 26 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/development/libraries/php-apc/default.nix

diff --git a/pkgs/development/libraries/php-apc/default.nix b/pkgs/development/libraries/php-apc/default.nix
deleted file mode 100644
index 7cfdc9ce30d5..000000000000
--- a/pkgs/development/libraries/php-apc/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{stdenv, fetchurl, php, autoconf, automake, libtool }:
-
-stdenv.mkDerivation rec {
-  name = "php-apc-3.1.7";
-  
-  src = fetchurl {
-    url = http://pecl.php.net/get/APC-3.1.7.tgz;
-    sha256 = "0xlvhw5398sl5zzkjm4rkk1m3fcra30zkq0k4i6fij0ylpd6nlls";
-  };
-
-  preConfigure = ''
-    phpize
-
-    sed -i 's,^EXTENSION_DIR.*,'EXTENSION_DIR=$out/lib/php/extensions, configure
-  '';
-
-  configureFlags = [ "--enable-apc" "--enable-apc-mmap" ];
-
-  buildInputs = [ php autoconf automake libtool ];
-
-  meta = {
-    description = "Alternative PHP Cache";
-    homepage = "http://pecl.php.net/package/APC";
-    license = "PHP+";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4dde2597d0b5..dbc08b9aeab4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3540,8 +3540,6 @@ let
 
   php54 = callPackage ../development/interpreters/php/5.4.nix { };
 
-  php_apc = callPackage ../development/libraries/php-apc { };
-
   php_xcache = callPackage ../development/libraries/php-xcache { };
 
   picolisp = callPackage ../development/interpreters/picolisp {};

From a391b55b31989fc90360d76790b72934769b9287 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 3 Jul 2014 11:01:13 -0400
Subject: [PATCH 082/167] Use buildPecl for php-xcache

---
 .../libraries/php-xcache/default.nix          | 33 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 pkgs/top-level/php-packages.nix               | 28 ++++++++++++++--
 3 files changed, 25 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/libraries/php-xcache/default.nix

diff --git a/pkgs/development/libraries/php-xcache/default.nix b/pkgs/development/libraries/php-xcache/default.nix
deleted file mode 100644
index 5f175aa72ff1..000000000000
--- a/pkgs/development/libraries/php-xcache/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl, php, autoconf, automake, libtool, m4 }:
-
-stdenv.mkDerivation rec {
-  name = "php-xcache-3.0.1";
-  
-  src = fetchurl {
-    url = http://xcache.lighttpd.net/pub/Releases/3.0.1/xcache-3.0.1.tar.bz2;
-    md5 = "45086010bc4f82f506c08be1c556941b";
-  };
-
-  preConfigure = ''
-    phpize
-
-    sed -i 's,^EXTENSION_DIR.*,'EXTENSION_DIR=$out/lib/php/extensions, configure
-  '';
-
-  configureFlags = [
-    "--enable-xcache" 
-    "--enable-xcache-coverager" 
-    "--enable-xcache-optimizer" 
-    "--enable-xcache-assembler"
-    "--enable-xcache-encoder"
-    "--enable-xcache-decoder"
-  ];
-
-  buildInputs = [ php autoconf automake libtool m4 ];
-
-  meta = {
-    description = "Fast, stable PHP opcode cacher";
-    homepage = http://xcache.lighttpd.net/;
-    license = "BSD";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbc08b9aeab4..11d06f40e503 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3540,8 +3540,6 @@ let
 
   php54 = callPackage ../development/interpreters/php/5.4.nix { };
 
-  php_xcache = callPackage ../development/libraries/php-xcache { };
-
   picolisp = callPackage ../development/interpreters/picolisp {};
 
   pltScheme = racket; # just to be sure
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 6695f9d3a93f..1225021ad377 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -27,19 +27,19 @@ let self = with self; {
     buildInputs = [ pkgs.cyrus_sasl ];
   };
 
-  xdebug = buildPecl rec {
+  xdebug = buildPecl {
     name = "xdebug-2.2.5";
 
     sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd";
   };
 
-  apc = buildPecl rec {
+  apc = buildPecl {
     name = "apc-3.1.13";
 
     sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y";
   };
 
-  zmq = buildPecl rec {
+  zmq = buildPecl {
     name = "zmq-1.1.2";
 
     sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69";
@@ -50,4 +50,26 @@ let self = with self; {
 
     buildInputs = [ pkgs.pkgconfig ];
   };
+
+  xcache = buildPecl rec {
+    name = "xcache-${version}";
+
+    version = "3.1.0";
+
+    src = pkgs.fetchurl {
+      url = "http://xcache.lighttpd.net/pub/Releases/${version}/${name}.tar.bz2";
+      md5 = "e5816d47d52be200b959bf69a673ff74";
+    };
+
+    configureFlags = [
+      "--enable-xcache"
+      "--enable-xcache-coverager"
+      "--enable-xcache-optimizer"
+      "--enable-xcache-assembler"
+      "--enable-xcache-encoder"
+      "--enable-xcache-decoder"
+    ];
+
+    buildInputs = [ pkgs.m4 ];
+  };
 }; in self

From 8cf2cd5d1163c20c74c0d0a7e535f3d0a7717093 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 4 Jul 2014 00:42:48 +0100
Subject: [PATCH 083/167] nodePackages.couchapp: added & and node packages
 updated

---
 pkgs/top-level/node-packages-generated.nix | 9409 ++++++++++++++------
 pkgs/top-level/node-packages.json          |    1 +
 2 files changed, 6489 insertions(+), 2921 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index e250085f7307..1815212e8758 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,35 @@
     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 =
+      (self.nativeDeps."JSONStream" or []);
+    deps = [
+      self.by-version."jsonparse"."0.0.5"
+      self.by-version."through"."2.3.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "JSONStream" ];
+  };
+  by-spec."JSONStream"."~0.8.3" =
+    self.by-version."JSONStream"."0.8.4";
+  by-version."JSONStream"."0.8.4" = lib.makeOverridable self.buildNodePackage {
+    name = "JSONStream-0.8.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
+        name = "JSONStream-0.8.4.tgz";
+        sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
       })
     ];
     buildInputs =
@@ -167,6 +188,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 +211,31 @@
     ];
     passthru.names = [ "accepts" ];
   };
+  by-spec."accepts"."~1.0.0" =
+    self.by-version."accepts"."1.0.6";
+  by-version."accepts"."1.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-accepts-1.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/accepts/-/accepts-1.0.6.tgz";
+        name = "accepts-1.0.6.tgz";
+        sha1 = "8cbbf84772d70211110d9b00b1208aae01f15724";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."accepts" or []);
+    deps = [
+      self.by-version."mime-types"."1.0.1"
+      self.by-version."negotiator"."0.4.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "accepts" ];
+  };
+  by-spec."accepts"."~1.0.4" =
+    self.by-version."accepts"."1.0.6";
+  by-spec."accepts"."~1.0.5" =
+    self.by-version."accepts"."1.0.6";
   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 +256,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,15 +357,15 @@
   "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.2.1" =
-    self.by-version."ansi"."0.2.1";
-  by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "ansi-0.2.1";
+  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.2.1.tgz";
-        name = "ansi-0.2.1.tgz";
-        sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017";
+        url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
+        name = "ansi-0.3.0.tgz";
+        sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0";
       })
     ];
     buildInputs =
@@ -328,6 +376,25 @@
     ];
     passthru.names = [ "ansi" ];
   };
+  by-spec."ansi-regex"."^0.1.0" =
+    self.by-version."ansi-regex"."0.1.0";
+  by-version."ansi-regex"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ansi-regex-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz";
+        name = "ansi-regex-0.1.0.tgz";
+        sha1 = "55ca60db6900857c423ae9297980026f941ed903";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ansi-regex" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ansi-regex" ];
+  };
   by-spec."ansi-remover"."*" =
     self.by-version."ansi-remover"."0.0.2";
   by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -482,24 +549,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.1";
+  by-version."archiver"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-archiver-0.10.1";
     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.1.tgz";
+        name = "archiver-0.10.1.tgz";
+        sha1 = "c88a50fe114f744d059a07dfc4690f3a204146e4";
       })
     ];
     buildInputs =
       (self.nativeDeps."archiver" or []);
     deps = [
+      self.by-version."buffer-crc32"."0.2.3"
       self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."zip-stream"."0.1.4"
+      self.by-version."tar-stream"."0.4.4"
+      self.by-version."zip-stream"."0.3.6"
       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 +596,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 {
@@ -645,27 +716,6 @@
     ];
     passthru.names = [ "ascii-json" ];
   };
-  by-spec."ascli"."*" =
-    self.by-version."ascli"."0.3.0";
-  by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ascli-0.3.0";
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
-        name = "ascli-0.3.0.tgz";
-        sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ascli" or []);
-    deps = [
-      self.by-version."colour"."0.7.1"
-      self.by-version."optjs"."3.2.1-boom"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ascli" ];
-  };
   by-spec."asn1"."0.1.11" =
     self.by-version."asn1"."0.1.11";
   by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
@@ -746,6 +796,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 +841,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 +859,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 +938,14 @@
     ];
     passthru.names = [ "async" ];
   };
+  by-spec."async"."0.9.x" =
+    self.by-version."async"."0.9.0";
   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,15 +954,15 @@
     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";
+  by-spec."async"."~0.8" =
+    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.4.1.tgz";
-        name = "async-0.4.1.tgz";
-        sha1 = "1985abade017df906bfaa8d77d424b25366b3a5b";
+        url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz";
+        name = "async-0.8.0.tgz";
+        sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112";
       })
     ];
     buildInputs =
@@ -897,47 +973,53 @@
     ];
     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";
+  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."async-some"."~1.0.0" =
+    self.by-version."async-some"."1.0.1";
+  by-version."async-some"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-some-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz";
-        name = "async-0.6.2.tgz";
-        sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef";
+        url = "http://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz";
+        name = "async-some-1.0.1.tgz";
+        sha1 = "8b54f08d46f0f9babc72ea9d646c245d23a4d9e5";
       })
     ];
     buildInputs =
-      (self.nativeDeps."async" or []);
+      (self.nativeDeps."async-some" or []);
     deps = [
+      self.by-version."dezalgo"."1.0.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "async" ];
+    passthru.names = [ "async-some" ];
   };
   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 {
-    name = "node-aws-sdk-2.0.0-rc9";
+    self.by-version."aws-sdk"."2.0.4";
+  by-version."aws-sdk"."2.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-aws-sdk-2.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc9.tgz";
-        name = "aws-sdk-2.0.0-rc9.tgz";
-        sha1 = "caa7653837f7886e7f9e4da5df3b3c8324d7d0ab";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.4.tgz";
+        name = "aws-sdk-2.0.4.tgz";
+        sha1 = "4700ae607375921aa09884ef4fb7f1c7476440f1";
       })
     ];
     buildInputs =
       (self.nativeDeps."aws-sdk" or []);
     deps = [
-      self.by-version."xml2js"."0.2.4"
+      self.by-version."aws-sdk-apis"."3.0.6"
+      self.by-version."xml2js"."0.2.6"
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "aws-sdk" ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc9";
+  "aws-sdk" = self.by-version."aws-sdk"."2.0.4";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage {
@@ -959,6 +1041,25 @@
     ];
     passthru.names = [ "aws-sdk" ];
   };
+  by-spec."aws-sdk-apis"."3.x" =
+    self.by-version."aws-sdk-apis"."3.0.6";
+  by-version."aws-sdk-apis"."3.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-aws-sdk-apis-3.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.0.6.tgz";
+        name = "aws-sdk-apis-3.0.6.tgz";
+        sha1 = "9f717527cc71306e23bd6a88ad0255357c2bd521";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."aws-sdk-apis" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "aws-sdk-apis" ];
+  };
   by-spec."aws-sign"."~0.2.0" =
     self.by-version."aws-sign"."0.2.0";
   by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -1076,14 +1177,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 =
@@ -1094,6 +1195,25 @@
     ];
     passthru.names = [ "base64-js" ];
   };
+  by-spec."base64-url"."1" =
+    self.by-version."base64-url"."1.0.0";
+  by-version."base64-url"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-base64-url-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/base64-url/-/base64-url-1.0.0.tgz";
+        name = "base64-url-1.0.0.tgz";
+        sha1 = "ab694376f2801af6c9260899ffef02f86b40ee2c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."base64-url" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "base64-url" ];
+  };
   by-spec."base64id"."0.1.0" =
     self.by-version."base64id"."0.1.0";
   by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1151,15 +1271,34 @@
     ];
     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";
+  by-spec."batch"."0.5.1" =
+    self.by-version."batch"."0.5.1";
+  by-version."batch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-batch-0.5.1";
     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/batch/-/batch-0.5.1.tgz";
+        name = "batch-0.5.1.tgz";
+        sha1 = "36a4bab594c050fd7b507bca0db30c2d92af4ff2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."batch" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "batch" ];
+  };
+  by-spec."bcrypt"."*" =
+    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.8.tgz";
+        name = "bcrypt-0.7.8.tgz";
+        sha1 = "42c99aac202918e947b5bd086110184f62745e3e";
       })
     ];
     buildInputs =
@@ -1171,7 +1310,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 {
@@ -1194,14 +1333,14 @@
     passthru.names = [ "binary" ];
   };
   by-spec."bindings"."*" =
-    self.by-version."bindings"."1.2.0";
-  by-version."bindings"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bindings-1.2.0";
+    self.by-version."bindings"."1.2.1";
+  by-version."bindings"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bindings-1.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz";
-        name = "bindings-1.2.0.tgz";
-        sha1 = "c224fc5b349a84043779f97a6271d9d70da7636f";
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+        name = "bindings-1.2.1.tgz";
+        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       })
     ];
     buildInputs =
@@ -1231,6 +1370,47 @@
     ];
     passthru.names = [ "bindings" ];
   };
+  by-spec."bindings"."1.1.1" =
+    self.by-version."bindings"."1.1.1";
+  by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bindings-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
+        name = "bindings-1.1.1.tgz";
+        sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bindings" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bindings" ];
+  };
+  by-spec."bindings".">=1.2.0" =
+    self.by-version."bindings"."1.2.1";
+  by-spec."bl"."~0.8.1" =
+    self.by-version."bl"."0.8.2";
+  by-version."bl"."0.8.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bl-0.8.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
+        name = "bl-0.8.2.tgz";
+        sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bl" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.27-1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bl" ];
+  };
   by-spec."block-stream"."*" =
     self.by-version."block-stream"."0.0.7";
   by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -1253,6 +1433,25 @@
   };
   by-spec."block-stream"."0.0.7" =
     self.by-version."block-stream"."0.0.7";
+  by-spec."bluebird".">= 1.2.1" =
+    self.by-version."bluebird"."2.1.3";
+  by-version."bluebird"."2.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bluebird-2.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bluebird/-/bluebird-2.1.3.tgz";
+        name = "bluebird-2.1.3.tgz";
+        sha1 = "f2cf7bbccadbe5b031086dbf343535922cb3b99f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bluebird" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bluebird" ];
+  };
   by-spec."blueimp-md5"."~1.1.0" =
     self.by-version."blueimp-md5"."1.1.0";
   by-version."blueimp-md5"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1272,28 +1471,34 @@
     ];
     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.4.3" =
+    self.by-version."body-parser"."1.4.3";
+  by-version."body-parser"."1.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-body-parser-1.4.3";
     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.4.3.tgz";
+        name = "body-parser-1.4.3.tgz";
+        sha1 = "4727952cff4af0773eefa4b226c2f4122f5e234d";
       })
     ];
     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."depd"."0.3.0"
+      self.by-version."iconv-lite"."0.4.3"
+      self.by-version."media-typer"."0.2.0"
       self.by-version."qs"."0.6.6"
+      self.by-version."raw-body"."1.2.2"
+      self.by-version."type-is"."1.3.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "body-parser" ];
   };
+  by-spec."body-parser"."~1.4.3" =
+    self.by-version."body-parser"."1.4.3";
   by-spec."boolbase"."~1.0.0" =
     self.by-version."boolbase"."1.0.0";
   by-version."boolbase"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -1354,14 +1559,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.6";
+  by-version."bower"."1.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-1.3.6";
     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.6.tgz";
+        name = "bower-1.3.6.tgz";
+        sha1 = "db643fdaab0376c3c526939d709e9852a46ca2ed";
       })
     ];
     buildInputs =
@@ -1369,55 +1574,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-endpoint-parser"."0.2.1"
+      self.by-version."bower-config"."0.5.2"
+      self.by-version."bower-endpoint-parser"."0.2.2"
       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."fstream"."0.1.25"
-      self.by-version."fstream-ignore"."0.0.7"
-      self.by-version."glob"."3.2.9"
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."decompress-zip"."0.0.8"
+      self.by-version."fstream"."0.1.28"
+      self.by-version."fstream-ignore"."0.0.8"
+      self.by-version."glob"."4.0.3"
+      self.by-version."graceful-fs"."3.0.2"
       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."inquirer"."0.5.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.5.0"
+      self.by-version."mout"."0.9.1"
+      self.by-version."nopt"."3.0.1"
+      self.by-version."opn"."0.1.2"
+      self.by-version."osenv"."0.1.0"
+      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.36.0"
+      self.by-version."request-progress"."0.3.1"
+      self.by-version."retry"."0.6.1"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."2.3.1"
+      self.by-version."shell-quote"."1.4.1"
+      self.by-version."stringify-object"."0.2.1"
+      self.by-version."tar"."0.1.20"
+      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";
-  by-spec."bower".">=0.9.0" =
-    self.by-version."bower"."1.3.2";
+  "bower" = self.by-version."bower"."1.3.6";
+  by-spec."bower".">=1.0.0" =
+    self.by-version."bower"."1.3.6";
   by-spec."bower".">=1.2.8 <2" =
-    self.by-version."bower"."1.3.2";
+    self.by-version."bower"."1.3.6";
   by-spec."bower"."~1.2.0" =
     self.by-version."bower"."1.2.8";
   by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage {
@@ -1434,18 +1639,18 @@
     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-endpoint-parser"."0.2.1"
+      self.by-version."bower-config"."0.5.2"
+      self.by-version."bower-endpoint-parser"."0.2.2"
       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."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."fstream"."0.1.25"
-      self.by-version."fstream-ignore"."0.0.7"
-      self.by-version."glob"."3.2.9"
+      self.by-version."decompress-zip"."0.0.8"
+      self.by-version."fstream"."0.1.28"
+      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"
@@ -1460,14 +1665,14 @@
       self.by-version."q"."0.9.7"
       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."retry"."0.6.1"
+      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."tar"."0.1.20"
       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 +1680,29 @@
     ];
     passthru.names = [ "bower" ];
   };
+  by-spec."bower-config"."^0.5.0" =
+    self.by-version."bower-config"."0.5.2";
+  by-version."bower-config"."0.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bower-config-0.5.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz";
+        name = "bower-config-0.5.2.tgz";
+        sha1 = "1f7d2e899e99b70c29a613e70d4c64590414b22e";
+      })
+    ];
+    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 +1727,9 @@
     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.2";
+  by-spec."bower-config"."~0.5.2" =
+    self.by-version."bower-config"."0.5.2";
   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 {
@@ -1541,7 +1750,26 @@
     passthru.names = [ "bower-endpoint-parser" ];
   };
   by-spec."bower-endpoint-parser"."~0.2.0" =
-    self.by-version."bower-endpoint-parser"."0.2.1";
+    self.by-version."bower-endpoint-parser"."0.2.2";
+  by-version."bower-endpoint-parser"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bower-endpoint-parser-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz";
+        name = "bower-endpoint-parser-0.2.2.tgz";
+        sha1 = "00b565adbfab6f2d35addde977e97962acbcb3f6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bower-endpoint-parser" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bower-endpoint-parser" ];
+  };
+  by-spec."bower-endpoint-parser"."~0.2.2" =
+    self.by-version."bower-endpoint-parser"."0.2.2";
   by-spec."bower-json"."0.4.0" =
     self.by-version."bower-json"."0.4.0";
   by-version."bower-json"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -1556,7 +1784,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 +1854,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.2"
+      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 +1907,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.6"
       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.1"
       self.by-version."fetch-bower"."2.0.0"
     ];
     peerDependencies = [
@@ -1711,7 +1966,46 @@
     ];
     passthru.names = [ "browser-pack" ];
   };
-  by-spec."browser-resolve"."~1.2.1" =
+  by-spec."browser-request"."~0.3.0" =
+    self.by-version."browser-request"."0.3.1";
+  by-version."browser-request"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browser-request-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.1.tgz";
+        name = "browser-request-0.3.1.tgz";
+        sha1 = "4c01f0bda68de746a59e49db917558c9a583646f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browser-request" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "browser-request" ];
+  };
+  by-spec."browser-resolve"."^1.3.0" =
+    self.by-version."browser-resolve"."1.3.0";
+  by-version."browser-resolve"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browser-resolve-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.3.0.tgz";
+        name = "browser-resolve-1.3.0.tgz";
+        sha1 = "54e63dac01488446ace2ebb527598884fc0c3887";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browser-resolve" or []);
+    deps = [
+      self.by-version."resolve"."0.7.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "browser-resolve" ];
+  };
+  by-spec."browser-resolve"."~1.2.4" =
     self.by-version."browser-resolve"."1.2.4";
   by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-browser-resolve-1.2.4";
@@ -1731,162 +2025,99 @@
     ];
     passthru.names = [ "browser-resolve" ];
   };
-  by-spec."browser-resolve"."~1.2.2" =
-    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 {
-    name = "node-browserchannel-1.2.0";
+    self.by-version."browserchannel"."2.0.0";
+  by-version."browserchannel"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browserchannel-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.2.0.tgz";
-        name = "browserchannel-1.2.0.tgz";
-        sha1 = "207ce6eb844e00febfdf32084f10d4757cbcf97c";
+        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
+        name = "browserchannel-2.0.0.tgz";
+        sha1 = "0f211b3cad9995e8729b2bacd46b53c027c0ea63";
       })
     ];
     buildInputs =
       (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.21.1"
+      self.by-version."request"."2.36.0"
       self.by-version."ascii-json"."0.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserchannel" ];
   };
-  "browserchannel" = self.by-version."browserchannel"."1.2.0";
+  "browserchannel" = self.by-version."browserchannel"."2.0.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.2.0";
+  by-version."browserify"."4.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-4.2.0";
     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.2.0.tgz";
+        name = "browserify-4.2.0.tgz";
+        sha1 = "b23c9d630e941d89fff540f0c08a277168cc4eca";
       })
     ];
     buildInputs =
       (self.nativeDeps."browserify" or []);
     deps = [
-      self.by-version."JSONStream"."0.7.2"
+      self.by-version."JSONStream"."0.8.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."browser-resolve"."1.3.0"
       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.3"
+      self.by-version."builtins"."0.0.5"
       self.by-version."commondir"."0.0.1"
-      self.by-version."concat-stream"."1.4.5"
-      self.by-version."console-browserify"."1.0.3"
+      self.by-version."concat-stream"."1.4.6"
+      self.by-version."console-browserify"."1.1.0"
       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."crypto-browserify"."2.1.8"
+      self.by-version."deep-equal"."0.2.1"
       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."http-browserify"."1.3.2"
+      self.by-version."events"."1.0.1"
+      self.by-version."glob"."3.2.11"
+      self.by-version."http-browserify"."1.4.1"
       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.3"
       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."resolve"."0.6.3"
+      self.by-version."querystring-es3"."0.2.1-0"
+      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."resolve"."0.7.1"
       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."timers-browserify"."1.0.1"
+      self.by-version."through2"."0.4.2"
+      self.by-version."timers-browserify"."1.0.3"
       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";
-  by-spec."browserify"."~3.38.0" =
-    self.by-version."browserify"."3.38.1";
-  by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-3.38.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.38.1.tgz";
-        name = "browserify-3.38.1.tgz";
-        sha1 = "4790937ec5b01f1c340e83521e36c4e3aaf3d7ba";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browserify" or []);
-    deps = [
-      self.by-version."JSONStream"."0.7.2"
-      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."commondir"."0.0.1"
-      self.by-version."concat-stream"."1.4.5"
-      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."derequire"."0.8.0"
-      self.by-version."domain-browser"."1.1.1"
-      self.by-version."duplexer"."0.1.1"
-      self.by-version."events"."1.0.0"
-      self.by-version."glob"."3.2.9"
-      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.8.1"
-      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."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-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."timers-browserify"."1.0.1"
-      self.by-version."tty-browserify"."0.0.0"
-      self.by-version."umd"."2.0.0"
-      self.by-version."url"."0.7.9"
-      self.by-version."util"."0.10.3"
-      self.by-version."vm-browserify"."0.0.4"
-      self.by-version."zlib-browserify"."0.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "browserify" ];
-  };
-  by-spec."browserify-zlib"."~0.1.2" =
+  "browserify" = self.by-version."browserify"."4.2.0";
+  by-spec."browserify-zlib"."^0.1.4" =
     self.by-version."browserify-zlib"."0.1.4";
   by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-browserify-zlib-0.1.4";
@@ -1900,12 +2131,14 @@
     buildInputs =
       (self.nativeDeps."browserify-zlib" or []);
     deps = [
-      self.by-version."pako"."0.2.0"
+      self.by-version."pako"."0.2.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserify-zlib" ];
   };
+  by-spec."browserify-zlib"."~0.1.2" =
+    self.by-version."browserify-zlib"."0.1.4";
   by-spec."bson"."0.1.8" =
     self.by-version."bson"."0.1.8";
   by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -1963,41 +2196,61 @@
     ];
     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.1.4" =
-    self.by-version."buffer"."2.1.13";
-  by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffer-2.1.13";
+  by-spec."bson"."0.2.9" =
+    self.by-version."bson"."0.2.9";
+  by-version."bson"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bson-0.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.13.tgz";
-        name = "buffer-2.1.13.tgz";
-        sha1 = "c88838ebf79f30b8b4a707788470bea8a62c2355";
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.9.tgz";
+        name = "bson-0.2.9.tgz";
+        sha1 = "ee3716a52c985ff3074b6ece3257c75ee12f3a05";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bson" or []);
+    deps = [
+      self.by-version."nan"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bson" ];
+  };
+  by-spec."buffer"."^2.3.0" =
+    self.by-version."buffer"."2.3.3";
+  by-version."buffer"."2.3.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-2.3.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.3.3.tgz";
+        name = "buffer-2.3.3.tgz";
+        sha1 = "eabd37c725a67ecab17a29dc3ae2b50cbd181181";
       })
     ];
     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 = [
@@ -2042,8 +2295,27 @@
     ];
     passthru.names = [ "buffer-crc32" ];
   };
+  by-spec."buffer-crc32"."0.2.3" =
+    self.by-version."buffer-crc32"."0.2.3";
+  by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-crc32-0.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
+        name = "buffer-crc32-0.2.3.tgz";
+        sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."buffer-crc32" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "buffer-crc32" ];
+  };
   by-spec."buffer-crc32"."~0.2.1" =
-    self.by-version."buffer-crc32"."0.2.1";
+    self.by-version."buffer-crc32"."0.2.3";
   by-spec."buffers"."~0.1.1" =
     self.by-version."buffers"."0.1.1";
   by-version."buffers"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -2103,14 +2375,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.5";
+  by-version."builtins"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-builtins-0.0.5";
     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.5.tgz";
+        name = "builtins-0.0.5.tgz";
+        sha1 = "86dd881f9862856e62fd7ed7767b438c4d79b7ab";
       })
     ];
     buildInputs =
@@ -2142,26 +2414,6 @@
     ];
     passthru.names = [ "bunyan" ];
   };
-  by-spec."bytebuffer".">=2.2 <3" =
-    self.by-version."bytebuffer"."2.3.1";
-  by-version."bytebuffer"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bytebuffer-2.3.1";
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.3.1.tgz";
-        name = "bytebuffer-2.3.1.tgz";
-        sha1 = "17c2c290bfed534b06aadd6513aa5a0096ca2639";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bytebuffer" or []);
-    deps = [
-      self.by-version."long"."1.1.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bytebuffer" ];
-  };
   by-spec."bytes"."0.1.0" =
     self.by-version."bytes"."0.1.0";
   by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -2219,15 +2471,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 +2490,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 +2663,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 +2701,30 @@
     ];
     passthru.names = [ "character-parser" ];
   };
+  by-spec."cheerio"."^0.17.0" =
+    self.by-version."cheerio"."0.17.0";
+  by-version."cheerio"."0.17.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cheerio-0.17.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz";
+        name = "cheerio-0.17.0.tgz";
+        sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea";
+      })
+    ];
+    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."dom-serializer"."0.0.1"
+      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 +2869,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 +2889,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 {
@@ -2636,29 +2913,71 @@
     ];
     passthru.names = [ "clean-css" ];
   };
-  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."clean-css"."~2.2.0" =
+    self.by-version."clean-css"."2.2.5";
+  by-version."clean-css"."2.2.5" = lib.makeOverridable self.buildNodePackage {
+    name = "clean-css-2.2.5";
     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/clean-css/-/clean-css-2.2.5.tgz";
+        name = "clean-css-2.2.5.tgz";
+        sha1 = "d0ad26eba9ec072e406984200782a250daa86cf1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clean-css" or []);
+    deps = [
+      self.by-version."commander"."2.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clean-css" ];
+  };
+  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.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.4"
+      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 +2998,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 +3016,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 = [
     ];
@@ -2782,6 +3101,25 @@
     ];
     passthru.names = [ "clone" ];
   };
+  by-spec."clone-stats"."~0.0.1" =
+    self.by-version."clone-stats"."0.0.1";
+  by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-clone-stats-0.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
+        name = "clone-stats-0.0.1.tgz";
+        sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."clone-stats" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "clone-stats" ];
+  };
   by-spec."cmd-shim"."~1.1.1" =
     self.by-version."cmd-shim"."1.1.1";
   by-version."cmd-shim"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -2803,6 +3141,25 @@
     ];
     passthru.names = [ "cmd-shim" ];
   };
+  by-spec."co"."~3.0.2" =
+    self.by-version."co"."3.0.6";
+  by-version."co"."3.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-co-3.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/co/-/co-3.0.6.tgz";
+        name = "co-3.0.6.tgz";
+        sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."co" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "co" ];
+  };
   by-spec."coffee-script"."*" =
     self.by-version."coffee-script"."1.7.1";
   by-version."coffee-script"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -2891,7 +3248,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 +3262,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 =
@@ -3015,39 +3372,22 @@
     self.by-version."colors"."0.6.2";
   by-spec."colors"."~0.6.2" =
     self.by-version."colors"."0.6.2";
-  by-spec."colour"."*" =
-    self.by-version."colour"."0.7.1";
-  by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-colour-0.7.1";
+  by-spec."columnify"."~1.1.0" =
+    self.by-version."columnify"."1.1.0";
+  by-version."columnify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-columnify-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
-        name = "colour-0.7.1.tgz";
-        sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colour" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "colour" ];
-  };
-  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";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz";
-        name = "columnify-0.1.2.tgz";
-        sha1 = "ab1a1f1e37b26ba4b87c6920fb717fe51c827042";
+        url = "http://registry.npmjs.org/columnify/-/columnify-1.1.0.tgz";
+        name = "columnify-1.1.0.tgz";
+        sha1 = "0b908e6d4f1c80194358a1933aaf9dc49271c679";
       })
     ];
     buildInputs =
       (self.nativeDeps."columnify" or []);
     deps = [
+      self.by-version."strip-ansi"."0.2.2"
+      self.by-version."wcwidth.js"."0.0.4"
     ];
     peerDependencies = [
     ];
@@ -3068,22 +3408,22 @@
       (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."source-map"."0.1.33"
+      self.by-version."convert-source-map"."0.3.4"
+      self.by-version."source-map"."0.1.34"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "combine-source-map" ];
   };
   by-spec."combined-stream"."~0.0.4" =
-    self.by-version."combined-stream"."0.0.4";
-  by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-combined-stream-0.0.4";
+    self.by-version."combined-stream"."0.0.5";
+  by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-combined-stream-0.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz";
-        name = "combined-stream-0.0.4.tgz";
-        sha1 = "2d1a43347dbe9515a4a2796732e5b88473840b22";
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz";
+        name = "combined-stream-0.0.5.tgz";
+        sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2";
       })
     ];
     buildInputs =
@@ -3114,26 +3454,6 @@
     ];
     passthru.names = [ "commander" ];
   };
-  by-spec."commander"."1.2.x" =
-    self.by-version."commander"."1.2.0";
-  by-version."commander"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-commander-1.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz";
-        name = "commander-1.2.0.tgz";
-        sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."commander" or []);
-    deps = [
-      self.by-version."keypress"."0.1.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "commander" ];
-  };
   by-spec."commander"."1.3.1" =
     self.by-version."commander"."1.3.1";
   by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -3214,8 +3534,29 @@
   };
   by-spec."commander"."2.1.x" =
     self.by-version."commander"."2.1.0";
+  by-spec."commander"."2.2.x" =
+    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.0.0" =
+    self.by-version."commander"."2.0.0";
   by-spec."commander"."~2.1.0" =
     self.by-version."commander"."2.1.0";
   by-spec."commondir"."0.0.1" =
@@ -3237,15 +3578,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.1.0" =
+    self.by-version."compressible"."1.1.0";
+  by-version."compressible"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compressible-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/compressible/-/compressible-1.1.0.tgz";
+        name = "compressible-1.1.0.tgz";
+        sha1 = "124d8a7bba18a05a410a2f25bad413b1b94aff67";
       })
     ];
     buildInputs =
@@ -3256,44 +3616,46 @@
     ];
     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.8" =
+    self.by-version."compression"."1.0.8";
+  by-version."compression"."1.0.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-compression-1.0.8";
     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.8.tgz";
+        name = "compression-1.0.8.tgz";
+        sha1 = "803ecc67183e71e42b1efcc6a29f6144fdd9afad";
       })
     ];
     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.6"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."compressible"."1.1.0"
+      self.by-version."on-headers"."0.0.0"
+      self.by-version."vary"."0.1.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 +3663,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 {
@@ -3338,8 +3702,8 @@
     buildInputs =
       (self.nativeDeps."config-chain" or []);
     deps = [
-      self.by-version."proto-list"."1.2.2"
-      self.by-version."ini"."1.1.0"
+      self.by-version."proto-list"."1.2.3"
+      self.by-version."ini"."1.2.1"
     ];
     peerDependencies = [
     ];
@@ -3347,6 +3711,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.1";
+  by-version."configstore"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-configstore-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/configstore/-/configstore-0.3.1.tgz";
+        name = "configstore-0.3.1.tgz";
+        sha1 = "e1b4715994fe5f8e22e69b21d54c7a448339314d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."configstore" or []);
+    deps = [
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."js-yaml"."3.0.2"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."object-assign"."0.3.1"
+      self.by-version."osenv"."0.1.0"
+      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 +3761,29 @@
     ];
     passthru.names = [ "configstore" ];
   };
-  by-spec."configstore"."~0.2.2" =
-    self.by-version."configstore"."0.2.3";
+  by-spec."connect"."*" =
+    self.by-version."connect"."3.0.1";
+  by-version."connect"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-3.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-3.0.1.tgz";
+        name = "connect-3.0.1.tgz";
+        sha1 = "030e2cdf0372b12892a6857c465a298bb944ef50";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect" or []);
+    deps = [
+      self.by-version."debug"."1.0.2"
+      self.by-version."finalhandler"."0.0.2"
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."utils-merge"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
   by-spec."connect"."1.x" =
     self.by-version."connect"."1.9.2";
   by-version."connect"."1.9.2" = lib.makeOverridable self.buildNodePackage {
@@ -3390,7 +3800,7 @@
     deps = [
       self.by-version."qs"."0.6.6"
       self.by-version."mime"."1.2.11"
-      self.by-version."formidable"."1.0.14"
+      self.by-version."formidable"."1.0.15"
     ];
     peerDependencies = [
     ];
@@ -3419,7 +3829,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.2"
       self.by-version."methods"."0.0.1"
       self.by-version."raw-body"."0.0.3"
       self.by-version."negotiator"."0.3.0"
@@ -3429,42 +3839,49 @@
     ];
     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.21.1" =
+    self.by-version."connect"."2.21.1";
+  by-version."connect"."2.21.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-2.21.1";
     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.21.1.tgz";
+        name = "connect-2.21.1.tgz";
+        sha1 = "a948ee661674881e5615c06db982d5d47cd0aa12";
       })
     ];
     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.0.0"
-      self.by-version."errorhandler"."1.0.0"
-      self.by-version."express-session"."1.0.2"
+      self.by-version."body-parser"."1.4.3"
+      self.by-version."bytes"."1.0.0"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-parser"."1.3.2"
+      self.by-version."cookie-signature"."1.0.4"
+      self.by-version."compression"."1.0.8"
+      self.by-version."connect-timeout"."1.1.1"
+      self.by-version."csurf"."1.2.2"
+      self.by-version."debug"."1.0.2"
+      self.by-version."depd"."0.3.0"
+      self.by-version."errorhandler"."1.1.1"
+      self.by-version."express-session"."1.5.2"
+      self.by-version."finalhandler"."0.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."media-typer"."0.2.0"
+      self.by-version."method-override"."2.0.2"
+      self.by-version."morgan"."1.1.1"
+      self.by-version."multiparty"."3.2.9"
+      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."vhost"."1.0.0"
-      self.by-version."bytes"."0.2.1"
+      self.by-version."response-time"."2.0.0"
+      self.by-version."serve-favicon"."2.0.1"
+      self.by-version."serve-index"."1.1.4"
+      self.by-version."serve-static"."1.2.3"
+      self.by-version."type-is"."1.3.2"
+      self.by-version."vhost"."2.0.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 = [
     ];
@@ -3491,7 +3908,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.2"
     ];
     peerDependencies = [
     ];
@@ -3520,7 +3937,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.2"
     ];
     peerDependencies = [
     ];
@@ -3549,54 +3966,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.2"
     ];
     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.21.1";
   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 +4069,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,22 +4088,23 @@
     ];
     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.1" =
+    self.by-version."connect-timeout"."1.1.1";
+  by-version."connect-timeout"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-timeout-1.1.1";
     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.1.tgz";
+        name = "connect-timeout-1.1.1.tgz";
+        sha1 = "6c7e31c98f0ac68eb6d1305f67f21f5a6e90fd04";
       })
     ];
     buildInputs =
       (self.nativeDeps."connect-timeout" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.2"
+      self.by-version."on-headers"."0.0.0"
     ];
     peerDependencies = [
     ];
@@ -3751,44 +4129,28 @@
     ];
     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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."console-browserify" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "console-browserify" ];
-  };
-  by-spec."console-browserify"."~1.0.1" =
-    self.by-version."console-browserify"."1.0.3";
-  by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-console-browserify-1.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz";
-        name = "console-browserify-1.0.3.tgz";
-        sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e";
+        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 = [
     ];
     passthru.names = [ "console-browserify" ];
   };
+  by-spec."console-browserify"."^1.1.0" =
+    self.by-version."console-browserify"."1.1.0";
   by-spec."constantinople"."~1.0.1" =
     self.by-version."constantinople"."1.0.2";
   by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -3803,7 +4165,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.13"
+      self.by-version."uglify-js"."2.4.14"
     ];
     peerDependencies = [
     ];
@@ -3825,7 +4187,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.13"
+      self.by-version."uglify-js"."2.4.14"
     ];
     peerDependencies = [
     ];
@@ -3851,14 +4213,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 +4288,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 +4345,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.3.2" =
+    self.by-version."cookie-parser"."1.3.2";
+  by-version."cookie-parser"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-parser-1.3.2";
     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.3.2.tgz";
+        name = "cookie-parser-1.3.2.tgz";
+        sha1 = "52211cc82c955d79ff0c088954407724e19cf562";
       })
     ];
     buildInputs =
       (self.nativeDeps."cookie-parser" or []);
     deps = [
-      self.by-version."cookie"."0.1.0"
-      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-signature"."1.0.4"
     ];
     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.3.2" =
+    self.by-version."cookie-parser"."1.3.2";
   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 {
@@ -4082,6 +4425,25 @@
     ];
     passthru.names = [ "cookie-signature" ];
   };
+  by-spec."cookie-signature"."1.0.4" =
+    self.by-version."cookie-signature"."1.0.4";
+  by-version."cookie-signature"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-signature-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
+        name = "cookie-signature-1.0.4.tgz";
+        sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie-signature" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie-signature" ];
+  };
   by-spec."cookiejar"."1.3.0" =
     self.by-version."cookiejar"."1.3.0";
   by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -4101,35 +4463,56 @@
     ];
     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."cookies"."~0.4.0" =
+    self.by-version."cookies"."0.4.1";
   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,21 +4557,48 @@
     buildInputs =
       (self.nativeDeps."couch-login" or []);
     deps = [
-      self.by-version."request"."2.34.0"
+      self.by-version."request"."2.36.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "couch-login" ];
   };
-  by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.10.0";
-  by-version."coveralls"."2.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "coveralls-2.10.0";
+  by-spec."couchapp"."*" =
+    self.by-version."couchapp"."0.11.0";
+  by-version."couchapp"."0.11.0" = lib.makeOverridable self.buildNodePackage {
+    name = "couchapp-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.10.0.tgz";
-        name = "coveralls-2.10.0.tgz";
-        sha1 = "03f0c54070f30e0d336c79ef2b16a5c53728a7e5";
+        url = "http://registry.npmjs.org/couchapp/-/couchapp-0.11.0.tgz";
+        name = "couchapp-0.11.0.tgz";
+        sha1 = "f09dc315d610f6f6e79fd0caf5e5d624b0cc783e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."couchapp" or []);
+    deps = [
+      self.by-version."watch"."0.8.0"
+      self.by-version."request"."2.36.0"
+      self.by-version."http-proxy"."0.8.7"
+      self.by-version."connect"."3.0.1"
+      self.by-version."nano"."5.10.0"
+      self.by-version."url"."0.10.1"
+      self.by-version."coffee-script"."1.7.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "couchapp" ];
+  };
+  "couchapp" = self.by-version."couchapp"."0.11.0";
+  by-spec."coveralls"."*" =
+    self.by-version."coveralls"."2.11.0";
+  by-version."coveralls"."2.11.0" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.11.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.0.tgz";
+        name = "coveralls-2.11.0.tgz";
+        sha1 = "0516da3bb40672061f27d60d9504e457a57201ec";
       })
     ];
     buildInputs =
@@ -4197,13 +4607,13 @@
       self.by-version."js-yaml"."3.0.1"
       self.by-version."request"."2.16.2"
       self.by-version."lcov-parse"."0.0.6"
-      self.by-version."log-driver"."1.2.1"
+      self.by-version."log-driver"."1.2.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "coveralls" ];
   };
-  "coveralls" = self.by-version."coveralls"."2.10.0";
+  "coveralls" = self.by-version."coveralls"."2.11.0";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -4223,6 +4633,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.3"
+    ];
+    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 {
@@ -4302,20 +4733,22 @@
     ];
     passthru.names = [ "crypto" ];
   };
-  by-spec."crypto-browserify"."~1.0.9" =
-    self.by-version."crypto-browserify"."1.0.9";
-  by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-crypto-browserify-1.0.9";
+  by-spec."crypto-browserify"."^2.1.8" =
+    self.by-version."crypto-browserify"."2.1.8";
+  by-version."crypto-browserify"."2.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-crypto-browserify-2.1.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
-        name = "crypto-browserify-1.0.9.tgz";
-        sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
+        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-2.1.8.tgz";
+        name = "crypto-browserify-2.1.8.tgz";
+        sha1 = "3ef8ccd7da5a4debdd379e7d64a2ae128b9d977a";
       })
     ];
     buildInputs =
       (self.nativeDeps."crypto-browserify" or []);
     deps = [
+      self.by-version."ripemd160"."0.2.0"
+      self.by-version."sha.js"."2.1.3"
     ];
     peerDependencies = [
     ];
@@ -4340,6 +4773,29 @@
     ];
     passthru.names = [ "cscodegen" ];
   };
+  by-spec."csrf-tokens"."~2.0.0" =
+    self.by-version."csrf-tokens"."2.0.0";
+  by-version."csrf-tokens"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-csrf-tokens-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/csrf-tokens/-/csrf-tokens-2.0.0.tgz";
+        name = "csrf-tokens-2.0.0.tgz";
+        sha1 = "c821003fb8b6ad17bc977d6fd1a84bedc3ed619b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."csrf-tokens" or []);
+    deps = [
+      self.by-version."rndm"."1.0.0"
+      self.by-version."scmp"."0.0.3"
+      self.by-version."uid-safe"."1.0.1"
+      self.by-version."base64-url"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "csrf-tokens" ];
+  };
   by-spec."css"."~1.0.8" =
     self.by-version."css"."1.0.8";
   by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -4418,42 +4874,21 @@
     ];
     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.2" =
+    self.by-version."csurf"."1.2.2";
+  by-version."csurf"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-csurf-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/csurf/-/csurf-1.0.0.tgz";
-        name = "csurf-1.0.0.tgz";
-        sha1 = "a68d5718b988032e270abf1f4b34f272753d745b";
+        url = "http://registry.npmjs.org/csurf/-/csurf-1.2.2.tgz";
+        name = "csurf-1.2.2.tgz";
+        sha1 = "2ea9f2d3f2d67b1e2253290e676b62195dcb7756";
       })
     ];
     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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."csurf" or []);
-    deps = [
-      self.by-version."uid2"."0.0.3"
-      self.by-version."scmp"."0.0.3"
+      self.by-version."csrf-tokens"."2.0.0"
     ];
     peerDependencies = [
     ];
@@ -4516,7 +4951,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 +4990,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 +5031,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 +5050,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.2";
+  by-version."debug"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-1.0.2";
     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.2.tgz";
+        name = "debug-1.0.2.tgz";
+        sha1 = "3849591c10cce648476c3c7c2e2e3416db5963c4";
       })
     ];
     buildInputs =
       (self.nativeDeps."debug" or []);
     deps = [
+      self.by-version."ms"."0.6.2"
     ];
     peerDependencies = [
     ];
@@ -4630,23 +5107,46 @@
     ];
     passthru.names = [ "debug" ];
   };
+  by-spec."debug"."1.0.2" =
+    self.by-version."debug"."1.0.2";
   by-spec."debug".">= 0.7.3 < 1" =
     self.by-version."debug"."0.8.1";
-  by-spec."debug"."~0.7.0" =
-    self.by-version."debug"."0.7.4";
+  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.1" =
+    self.by-version."debug"."1.0.2";
+  by-spec."debug"."^1.0.2" =
+    self.by-version."debug"."1.0.2";
   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"."~1.0.2" =
+    self.by-version."debug"."1.0.2";
   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,12 +5155,12 @@
       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."tar"."0.1.20"
       self.by-version."tempfile"."0.1.3"
     ];
     peerDependencies = [
@@ -4668,14 +5168,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 +5186,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.2"
     ];
     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 {
@@ -4752,34 +5255,17 @@
   };
   by-spec."deep-equal"."~0.0.0" =
     self.by-version."deep-equal"."0.0.0";
-  by-spec."deep-equal"."~0.1.0" =
-    self.by-version."deep-equal"."0.1.2";
-  by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-deep-equal-0.1.2";
+  by-spec."deep-equal"."~0.2.1" =
+    self.by-version."deep-equal"."0.2.1";
+  by-spec."deep-extend"."~0.2.10" =
+    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-equal/-/deep-equal-0.1.2.tgz";
-        name = "deep-equal-0.1.2.tgz";
-        sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-equal" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    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";
-    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 =
@@ -4790,8 +5276,8 @@
     ];
     passthru.names = [ "deep-extend" ];
   };
-  by-spec."deep-extend"."~0.2.8" =
-    self.by-version."deep-extend"."0.2.8";
+  by-spec."deep-extend"."~0.2.5" =
+    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 +5317,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.3"
+    ];
+    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 {
@@ -4850,15 +5356,53 @@
     ];
     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";
+  by-spec."delegates"."0.0.3" =
+    self.by-version."delegates"."0.0.3";
+  by-version."delegates"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-delegates-0.0.3";
     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/delegates/-/delegates-0.0.3.tgz";
+        name = "delegates-0.0.3.tgz";
+        sha1 = "4f25cbf8e1c061967f834e003f3bd18ded4baeea";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."delegates" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "delegates" ];
+  };
+  by-spec."depd"."0.3.0" =
+    self.by-version."depd"."0.3.0";
+  by-version."depd"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-depd-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/depd/-/depd-0.3.0.tgz";
+        name = "depd-0.3.0.tgz";
+        sha1 = "11c9bc28e425325fbd8b38940beff69fa5326883";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."depd" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "depd" ];
+  };
+  by-spec."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.2.tgz";
+        name = "deps-sort-0.1.2.tgz";
+        sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a";
       })
     ];
     buildInputs =
@@ -4866,7 +5410,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 = [
     ];
@@ -4915,6 +5459,45 @@
     ];
     passthru.names = [ "detective" ];
   };
+  by-spec."dethroy"."~1.0.0" =
+    self.by-version."dethroy"."1.0.1";
+  by-version."dethroy"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dethroy-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dethroy/-/dethroy-1.0.1.tgz";
+        name = "dethroy-1.0.1.tgz";
+        sha1 = "fd9e5025d9a030ae4695bf46c9feb93ded6b233b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dethroy" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dethroy" ];
+  };
+  by-spec."dezalgo"."^1.0.0" =
+    self.by-version."dezalgo"."1.0.0";
+  by-version."dezalgo"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dezalgo-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.0.tgz";
+        name = "dezalgo-1.0.0.tgz";
+        sha1 = "050bb723f18b5617b309f26c2dc8fe6f2573b6fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dezalgo" or []);
+    deps = [
+      self.by-version."asap"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dezalgo" ];
+  };
   by-spec."di"."~0.0.1" =
     self.by-version."di"."0.0.1";
   by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -4953,7 +5536,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 +5555,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 +5580,57 @@
     ];
     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";
+  by-spec."dom-serializer"."~0.0.0" =
+    self.by-version."dom-serializer"."0.0.1";
+  by-version."dom-serializer"."0.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-dom-serializer-0.0.1";
     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/dom-serializer/-/dom-serializer-0.0.1.tgz";
+        name = "dom-serializer-0.0.1.tgz";
+        sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."dom-serializer" or []);
+    deps = [
+      self.by-version."domelementtype"."1.1.1"
+      self.by-version."entities"."1.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "dom-serializer" ];
+  };
+  by-spec."domain-browser"."~1.1.0" =
+    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.2.tgz";
+        name = "domain-browser-1.1.2.tgz";
+        sha1 = "5a21f30a29a9891533915061426974dc2f14e56b";
       })
     ];
     buildInputs =
@@ -5054,6 +5660,8 @@
     ];
     passthru.names = [ "domelementtype" ];
   };
+  by-spec."domelementtype"."~1.1.1" =
+    self.by-version."domelementtype"."1.1.1";
   by-spec."domhandler"."2.0" =
     self.by-version."domhandler"."2.0.3";
   by-version."domhandler"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -5074,26 +5682,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 +5762,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.18";
+  by-version."download"."0.1.18" = lib.makeOverridable self.buildNodePackage {
+    name = "download-0.1.18";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/download/-/download-0.1.18.tgz";
+        name = "download-0.1.18.tgz";
+        sha1 = "f1b0aaa42c2d0e2145ffcf6648ef8ea6f80b6a0b";
       })
     ];
     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.18";
   by-spec."dox"."~0.4.4" =
     self.by-version."dox"."0.4.4";
   by-version."dox"."0.4.4" = lib.makeOverridable self.buildNodePackage {
@@ -5260,15 +5870,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 =
@@ -5279,15 +5909,15 @@
     ];
     passthru.names = [ "each-async" ];
   };
-  by-spec."editor"."0.0.5" =
-    self.by-version."editor"."0.0.5";
-  by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-editor-0.0.5";
+  by-spec."editor"."~0.1.0" =
+    self.by-version."editor"."0.1.0";
+  by-version."editor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-editor-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz";
-        name = "editor-0.0.5.tgz";
-        sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a";
+        url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz";
+        name = "editor-0.1.0.tgz";
+        sha1 = "542f4662c6a8c88e862fc11945e204e51981b9a1";
       })
     ];
     buildInputs =
@@ -5298,6 +5928,25 @@
     ];
     passthru.names = [ "editor" ];
   };
+  by-spec."ee-first"."1.0.3" =
+    self.by-version."ee-first"."1.0.3";
+  by-version."ee-first"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ee-first-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz";
+        name = "ee-first-1.0.3.tgz";
+        sha1 = "6c98c4089abecb5a7b85c1ac449aa603d3b3dabe";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ee-first" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ee-first" ];
+  };
   by-spec."ejs"."0.8.3" =
     self.by-version."ejs"."0.8.3";
   by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage {
@@ -5336,45 +5985,46 @@
     ];
     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";
+  by-spec."encoding"."~0.1.7" =
+    self.by-version."encoding"."0.1.8";
+  by-version."encoding"."0.1.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-encoding-0.1.8";
     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" =
-    self.by-version."encoding"."0.1.7";
-  by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-encoding-0.1.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.7.tgz";
-        name = "encoding-0.1.7.tgz";
-        sha1 = "25cc19b34e9225d120c2ea769f9136c91cecc908";
+        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.8.tgz";
+        name = "encoding-0.1.8.tgz";
+        sha1 = "3c48d355f6f4da0545de88c6f2673ccf70df11e7";
       })
     ];
     buildInputs =
       (self.nativeDeps."encoding" or []);
     deps = [
-      self.by-version."iconv-lite"."0.2.11"
+      self.by-version."iconv-lite"."0.4.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "encoding" ];
   };
+  by-spec."end-of-stream"."~0.1.3" =
+    self.by-version."end-of-stream"."0.1.5";
+  by-version."end-of-stream"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-end-of-stream-0.1.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
+        name = "end-of-stream-0.1.5.tgz";
+        sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
+      })
+    ];
+    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 +6044,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,25 +6105,88 @@
     ];
     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."error-inject"."~1.0.0" =
+    self.by-version."error-inject"."1.0.0";
+  by-version."error-inject"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-error-inject-1.0.0";
     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/error-inject/-/error-inject-1.0.0.tgz";
+        name = "error-inject-1.0.0.tgz";
+        sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."error-inject" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "error-inject" ];
+  };
+  by-spec."errorhandler"."1.1.1" =
+    self.by-version."errorhandler"."1.1.1";
+  by-version."errorhandler"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-errorhandler-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz";
+        name = "errorhandler-1.1.1.tgz";
+        sha1 = "18defd436d8ca2efe0a2d886c5c4d6ee6d76d691";
       })
     ];
     buildInputs =
       (self.nativeDeps."errorhandler" or []);
     deps = [
+      self.by-version."accepts"."1.0.6"
+      self.by-version."escape-html"."1.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "errorhandler" ];
   };
+  by-spec."errs"."~0.2.4" =
+    self.by-version."errs"."0.2.4";
+  by-version."errs"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-errs-0.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/errs/-/errs-0.2.4.tgz";
+        name = "errs-0.2.4.tgz";
+        sha1 = "48ccefec94fd3e613d6469840dd1c038937983f6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."errs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "errs" ];
+  };
+  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 +6206,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 {
@@ -5477,15 +6271,17 @@
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
+  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 =
@@ -5494,7 +6290,7 @@
       self.by-version."esutils"."1.0.0"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esprima"."1.1.1"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
     ];
     peerDependencies = [
     ];
@@ -5516,7 +6312,7 @@
     deps = [
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.3.2"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
     ];
     peerDependencies = [
     ];
@@ -5541,12 +6337,14 @@
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
     ];
     peerDependencies = [
     ];
     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 {
@@ -5605,7 +6403,7 @@
       self.by-version."escope"."1.0.1"
       self.by-version."escodegen"."0.0.28"
       self.by-version."estraverse"."1.3.2"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
       self.by-version."esshorten"."0.0.2"
       self.by-version."optimist"."0.6.1"
     ];
@@ -5613,15 +6411,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 +6455,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 +6657,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 {
@@ -5882,14 +6718,14 @@
     passthru.names = [ "eventemitter2" ];
   };
   by-spec."eventemitter2"."~0.4.11" =
-    self.by-version."eventemitter2"."0.4.13";
-  by-version."eventemitter2"."0.4.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-eventemitter2-0.4.13";
+    self.by-version."eventemitter2"."0.4.14";
+  by-version."eventemitter2"."0.4.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-eventemitter2-0.4.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz";
-        name = "eventemitter2-0.4.13.tgz";
-        sha1 = "0a8ab97f9c1b563361b8927f9e80606277509153";
+        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+        name = "eventemitter2-0.4.14.tgz";
+        sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       })
     ];
     buildInputs =
@@ -5901,16 +6737,35 @@
     passthru.names = [ "eventemitter2" ];
   };
   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";
+    self.by-version."eventemitter2"."0.4.14";
+  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 +6812,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.12.1"
     ];
     peerDependencies = [
     ];
@@ -5988,7 +6843,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,45 +6862,49 @@
     ];
     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.5";
+  by-version."express"."4.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.4.5";
     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.5.tgz";
+        name = "express-4.4.5.tgz";
+        sha1 = "5f2f302f277187abd721c3a36e44d86c5e3f03eb";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
+      self.by-version."accepts"."1.0.6"
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."debug"."1.0.2"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."methods"."1.0.1"
       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."proxy-addr"."1.0.1"
       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."send"."0.4.3"
+      self.by-version."serve-static"."1.2.3"
+      self.by-version."type-is"."1.2.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."cookie-signature"."1.0.4"
       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" ];
   };
-  "express" = self.by-version."express"."4.0.0";
+  "express" = self.by-version."express"."4.4.5";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -6088,12 +6947,12 @@
       self.by-version."range-parser"."0.0.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."cookie"."0.0.5"
-      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."buffer-crc32"."0.2.3"
       self.by-version."fresh"."0.1.0"
       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.2"
     ];
     peerDependencies = [
     ];
@@ -6123,45 +6982,51 @@
       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.2"
     ];
     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.12.1";
+  by-version."express"."3.12.1" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.12.1";
     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.12.1.tgz";
+        name = "express-3.12.1.tgz";
+        sha1 = "f13d260d1ac6ebc4913a42dfee913cdc65dd96d4";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
-      self.by-version."connect"."2.14.1"
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."connect"."2.21.1"
       self.by-version."commander"."1.3.2"
+      self.by-version."debug"."1.0.2"
+      self.by-version."depd"."0.3.0"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."media-typer"."0.2.0"
+      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."mkdirp"."0.3.5"
-      self.by-version."cookie"."0.1.1"
-      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."send"."0.4.3"
+      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."cookie-signature"."1.0.4"
       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.5";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -6181,21 +7046,55 @@
       self.by-version."range-parser"."0.0.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."cookie"."0.0.5"
-      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."buffer-crc32"."0.2.3"
       self.by-version."fresh"."0.1.0"
       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.2"
+    ];
+    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"."~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"."~4.4.5" =
+    self.by-version."express"."4.4.5";
   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 +7114,7 @@
       self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
-      self.by-version."express"."4.0.0"
+      self.by-version."express"."4.4.5"
     ];
     passthru.names = [ "express-form" ];
   };
@@ -6239,51 +7138,55 @@
     ];
     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.5.2" =
+    self.by-version."express-session"."1.5.2";
+  by-version."express-session"."1.5.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-session-1.5.2";
     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.5.2.tgz";
+        name = "express-session-1.5.2.tgz";
+        sha1 = "e7a4ebef8a1bffc13232dd09fe6ab5f0331e330f";
       })
     ];
     buildInputs =
       (self.nativeDeps."express-session" or []);
     deps = [
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-signature"."1.0.4"
+      self.by-version."debug"."1.0.2"
+      self.by-version."depd"."0.3.0"
+      self.by-version."on-headers"."0.0.0"
+      self.by-version."uid-safe"."1.0.1"
       self.by-version."utils-merge"."1.0.0"
-      self.by-version."cookie"."0.1.0"
-      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"
     ];
     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.6.1" =
+    self.by-version."express-session"."1.6.1";
+  by-version."express-session"."1.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-session-1.6.1";
     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.6.1.tgz";
+        name = "express-session-1.6.1.tgz";
+        sha1 = "b2614a9e6dd64442b2fafac9646e6b559f6bcc8e";
       })
     ];
     buildInputs =
       (self.nativeDeps."express-session" or []);
     deps = [
-      self.by-version."utils-merge"."1.0.0"
+      self.by-version."buffer-crc32"."0.2.3"
       self.by-version."cookie"."0.1.2"
-      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."cookie-signature"."1.0.4"
+      self.by-version."debug"."1.0.2"
+      self.by-version."depd"."0.3.0"
+      self.by-version."on-headers"."0.0.0"
+      self.by-version."uid-safe"."1.0.1"
+      self.by-version."utils-merge"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -6309,6 +7212,26 @@
     passthru.names = [ "ext-list" ];
   };
   by-spec."extend"."*" =
+    self.by-version."extend"."1.3.0";
+  by-version."extend"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-extend-1.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
+        name = "extend-1.3.0.tgz";
+        sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."extend" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "extend" ];
+  };
+  "extend" = self.by-version."extend"."1.3.0";
+  by-spec."extend"."~1.2.1" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-extend-1.2.1";
@@ -6327,9 +7250,6 @@
     ];
     passthru.names = [ "extend" ];
   };
-  "extend" = self.by-version."extend"."1.2.1";
-  by-spec."extend"."~1.2.1" =
-    self.by-version."extend"."1.2.1";
   by-spec."extname"."^0.1.1" =
     self.by-version."extname"."0.1.2";
   by-version."extname"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -6345,7 +7265,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 +7365,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 +7390,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.6"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
@@ -6520,6 +7422,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 +7464,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 +7474,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 +7490,43 @@
     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";
+  by-spec."finalhandler"."0.0.2" =
+    self.by-version."finalhandler"."0.0.2";
+  by-version."finalhandler"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-finalhandler-0.0.2";
     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/finalhandler/-/finalhandler-0.0.2.tgz";
+        name = "finalhandler-0.0.2.tgz";
+        sha1 = "0603d875ee87d567a266692815cc8ad44fcceeda";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."finalhandler" or []);
+    deps = [
+      self.by-version."debug"."1.0.2"
+      self.by-version."escape-html"."1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "finalhandler" ];
+  };
+  by-spec."findit".">=1.1.0 <2.0.0" =
+    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.2.0.tgz";
+        name = "findit-1.2.0.tgz";
+        sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
       })
     ];
     buildInputs =
@@ -6588,7 +7537,7 @@
     ];
     passthru.names = [ "findit" ];
   };
-  by-spec."findup"."~0.1.3" =
+  by-spec."findup"."^0.1.3" =
     self.by-version."findup"."0.1.5";
   by-version."findup"."0.1.5" = lib.makeOverridable self.buildNodePackage {
     name = "findup-0.1.5";
@@ -6609,7 +7558,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 +7572,58 @@
     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.2.2" =
+    self.by-version."finished"."1.2.2";
+  by-version."finished"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-finished-1.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/finished/-/finished-1.2.2.tgz";
+        name = "finished-1.2.2.tgz";
+        sha1 = "41608eafadfd65683b46a1220bc4b1ec3daedcd8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."finished" or []);
+    deps = [
+      self.by-version."ee-first"."1.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "finished" ];
+  };
+  by-spec."finished"."~1.2.0" =
+    self.by-version."finished"."1.2.2";
+  by-spec."first-chunk-stream"."^0.1.0" =
+    self.by-version."first-chunk-stream"."0.1.0";
+  by-version."first-chunk-stream"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-first-chunk-stream-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-0.1.0.tgz";
+        name = "first-chunk-stream-0.1.0.tgz";
+        sha1 = "755d3ec14d49a86e3d2fcc08beead5c0ca2b9c0a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."first-chunk-stream" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "first-chunk-stream" ];
+  };
   by-spec."flatiron"."*" =
     self.by-version."flatiron"."0.3.11";
   by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage {
@@ -6658,6 +7650,28 @@
   "flatiron" = self.by-version."flatiron"."0.3.11";
   by-spec."flatiron"."~0.3.11" =
     self.by-version."flatiron"."0.3.11";
+  by-spec."follow"."~0.11.2" =
+    self.by-version."follow"."0.11.2";
+  by-version."follow"."0.11.2" = lib.makeOverridable self.buildNodePackage {
+    name = "follow-0.11.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/follow/-/follow-0.11.2.tgz";
+        name = "follow-0.11.2.tgz";
+        sha1 = "7a3ed97593d3b23980aaa2039c9bb26233871d98";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."follow" or []);
+    deps = [
+      self.by-version."request"."2.34.0"
+      self.by-version."browser-request"."0.3.1"
+      self.by-version."debug"."0.7.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "follow" ];
+  };
   by-spec."follow-redirects"."0.0.3" =
     self.by-version."follow-redirects"."0.0.3";
   by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -6698,15 +7712,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 +7762,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 +7854,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.5"
+      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 {
@@ -6835,7 +7890,7 @@
     buildInputs =
       (self.nativeDeps."form-data" or []);
     deps = [
-      self.by-version."combined-stream"."0.0.4"
+      self.by-version."combined-stream"."0.0.5"
       self.by-version."mime"."1.2.11"
       self.by-version."async"."0.2.10"
     ];
@@ -6844,22 +7899,22 @@
     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.4";
+  by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-form-data-0.1.4";
     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.4.tgz";
+        name = "form-data-0.1.4.tgz";
+        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
       })
     ];
     buildInputs =
       (self.nativeDeps."form-data" or []);
     deps = [
-      self.by-version."combined-stream"."0.0.4"
+      self.by-version."combined-stream"."0.0.5"
       self.by-version."mime"."1.2.11"
-      self.by-version."async"."0.2.10"
+      self.by-version."async"."0.9.0"
     ];
     peerDependencies = [
     ];
@@ -6962,7 +8017,24 @@
     passthru.names = [ "formidable" ];
   };
   by-spec."formidable"."1.0.x" =
-    self.by-version."formidable"."1.0.14";
+    self.by-version."formidable"."1.0.15";
+  by-version."formidable"."1.0.15" = lib.makeOverridable self.buildNodePackage {
+    name = "node-formidable-1.0.15";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz";
+        name = "formidable-1.0.15.tgz";
+        sha1 = "91363d59cc51ddca2be84ca0336ec0135606c155";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."formidable" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "formidable" ];
+  };
   by-spec."fresh"."0.1.0" =
     self.by-version."fresh"."0.1.0";
   by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -7039,12 +8111,33 @@
       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 = [
     ];
     passthru.names = [ "fs-extra" ];
   };
+  by-spec."fs-vacuum"."~1.2.1" =
+    self.by-version."fs-vacuum"."1.2.1";
+  by-version."fs-vacuum"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fs-vacuum-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.1.tgz";
+        name = "fs-vacuum-1.2.1.tgz";
+        sha1 = "1bc3c62da30d6272569b8b9089c9811abb0a600b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fs-vacuum" or []);
+    deps = [
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."rimraf"."2.2.8"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fs-vacuum" ];
+  };
   by-spec."fs-walk"."*" =
     self.by-version."fs-walk"."0.0.1";
   by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -7059,7 +8152,7 @@
     buildInputs =
       (self.nativeDeps."fs-walk" or []);
     deps = [
-      self.by-version."async"."0.7.0"
+      self.by-version."async"."0.9.0"
     ];
     peerDependencies = [
     ];
@@ -7111,124 +8204,186 @@
     passthru.names = [ "fsevents" ];
   };
   by-spec."fstream"."0" =
-    self.by-version."fstream"."0.1.25";
-  by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fstream-0.1.25";
+    self.by-version."fstream"."0.1.28";
+  by-version."fstream"."0.1.28" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fstream-0.1.28";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz";
-        name = "fstream-0.1.25.tgz";
-        sha1 = "deef2db7c7898357c2b37202212a9e5b36abc732";
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz";
+        name = "fstream-0.1.28.tgz";
+        sha1 = "2b9286f3a646e30075efd0354729361c4b762a29";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream" or []);
     deps = [
-      self.by-version."rimraf"."2.2.6"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."graceful-fs"."3.0.2"
       self.by-version."inherits"."2.0.1"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."rimraf"."2.2.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fstream" ];
   };
   by-spec."fstream"."~0.1.17" =
-    self.by-version."fstream"."0.1.25";
+    self.by-version."fstream"."0.1.28";
   by-spec."fstream"."~0.1.22" =
-    self.by-version."fstream"."0.1.25";
-  by-spec."fstream"."~0.1.25" =
-    self.by-version."fstream"."0.1.25";
+    self.by-version."fstream"."0.1.28";
+  by-spec."fstream"."~0.1.28" =
+    self.by-version."fstream"."0.1.28";
   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";
+    self.by-version."fstream"."0.1.28";
+  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."fstream"."0.1.28"
       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 = [
     ];
     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";
+  by-spec."fullname"."^0.1.0" =
+    self.by-version."fullname"."0.1.0";
+  by-version."fullname"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "fullname-0.1.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/fullname/-/fullname-0.1.0.tgz";
+        name = "fullname-0.1.0.tgz";
+        sha1 = "51740585ffb772ea7c6033f829d83dd1c1e09427";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fullname" or []);
+    deps = [
+      self.by-version."fullname-native"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fullname" ];
+  };
+  by-spec."fullname-native"."^0.1.0" =
+    self.by-version."fullname-native"."0.1.1";
+  by-version."fullname-native"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "fullname-native-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/fullname-native/-/fullname-native-0.1.1.tgz";
+        name = "fullname-native-0.1.1.tgz";
+        sha1 = "a48e8343bc7213031fa85394c60eb39049a1e4ff";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."fullname-native" or []);
+    deps = [
+      self.by-version."nan"."0.8.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "fullname-native" ];
+  };
+  by-spec."gaze"."^0.5.1" =
+    self.by-version."gaze"."0.5.1";
+  by-version."gaze"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gaze-0.5.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz";
+        name = "gaze-0.5.1.tgz";
+        sha1 = "22e731078ef3e49d1c4ab1115ac091192051824c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."gaze" or []);
+    deps = [
+      self.by-version."globule"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "gaze" ];
+  };
+  by-spec."generator-angular"."*" =
+    self.by-version."generator-angular"."0.9.2";
+  by-version."generator-angular"."0.9.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-angular-0.9.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.9.2.tgz";
+        name = "generator-angular-0.9.2.tgz";
+        sha1 = "0d69ca85a7f10a4465c6d5d7374ecfff9736cc67";
       })
     ];
     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.8.1"
       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."yo"."1.1.2"
+      self.by-version."generator-karma"."0.8.3"
+      self.by-version."yo"."1.2.0"
     ];
     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.2";
+  by-spec."generator-karma".">=0.8.2" =
+    self.by-version."generator-karma"."0.8.3";
+  by-version."generator-karma"."0.8.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-karma-0.8.3";
     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.3.tgz";
+        name = "generator-karma-0.8.3.tgz";
+        sha1 = "6399fda9fc6cbab73568707e83fab73a915acbc8";
       })
     ];
     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.1"
     ];
     peerDependencies = [
-      self.by-version."yo"."1.1.2"
+      self.by-version."yo"."1.2.0"
     ];
     passthru.names = [ "generator-karma" ];
   };
@@ -7249,35 +8404,36 @@
       self.by-version."yeoman-generator"."0.14.2"
     ];
     peerDependencies = [
-      self.by-version."yo"."1.1.2"
+      self.by-version."yo"."1.2.0"
     ];
     passthru.names = [ "generator-mocha" ];
   };
   by-spec."generator-webapp"."*" =
-    self.by-version."generator-webapp"."0.4.9";
-  by-version."generator-webapp"."0.4.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-webapp-0.4.9";
+    self.by-version."generator-webapp"."0.5.0-rc.1";
+  by-version."generator-webapp"."0.5.0-rc.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-webapp-0.5.0-rc.1";
     src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.9.tgz";
-        name = "generator-webapp-0.4.9.tgz";
-        sha1 = "df8aa10af9bac7fd59f4072b9cdf0f120e8bb611";
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.5.0-rc.1.tgz";
+        name = "generator-webapp-0.5.0-rc.1.tgz";
+        sha1 = "1f126a6d876d65c8b464f56cfb37386ab110565d";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-webapp" or []);
     deps = [
-      self.by-version."yeoman-generator"."0.16.0"
-      self.by-version."cheerio"."0.13.1"
       self.by-version."chalk"."0.4.0"
+      self.by-version."cheerio"."0.17.0"
+      self.by-version."yeoman-generator"."0.17.0"
+      self.by-version."yosay"."0.2.1"
     ];
     peerDependencies = [
-      self.by-version."yo"."1.1.2"
+      self.by-version."yo"."1.2.0"
       self.by-version."generator-mocha"."0.1.3"
     ];
     passthru.names = [ "generator-webapp" ];
   };
-  "generator-webapp" = self.by-version."generator-webapp"."0.4.9";
+  "generator-webapp" = self.by-version."generator-webapp"."0.5.0-rc.1";
   by-spec."get-stdin"."^0.1.0" =
     self.by-version."get-stdin"."0.1.0";
   by-version."get-stdin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -7298,14 +8454,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 +8529,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 +8605,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.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/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.2.0.tgz";
+        name = "github-url-from-username-repo-0.2.0.tgz";
+        sha1 = "7590b4fa605b7a6cbb7e06ffcd9d253210f9dbe1";
       })
     ];
     buildInputs =
@@ -7468,22 +8624,44 @@
     ];
     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-spec."github-username"."~0.1.1" =
+    self.by-version."github-username"."0.1.1";
+  by-version."github-username"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "github-username-0.1.1";
     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-username/-/github-username-0.1.1.tgz";
+        name = "github-username-0.1.1.tgz";
+        sha1 = "cb9f026d5b8c50c79be096233d2a8b512bb057d9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."github-username" or []);
+    deps = [
+      self.by-version."request"."2.36.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "github-username" ];
+  };
+  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 +8690,38 @@
     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"."^4.0.0" =
+    self.by-version."glob"."4.0.3";
+  by-version."glob"."4.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-4.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob/-/glob-4.0.3.tgz";
+        name = "glob-4.0.3.tgz";
+        sha1 = "cb30c860359801cb7d56436976888fc4a09a35db";
+      })
+    ];
+    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"
+      self.by-version."graceful-fs"."3.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob" ];
+  };
+  by-spec."glob"."^4.0.2" =
+    self.by-version."glob"."4.0.3";
+  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 +8745,108 @@
     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.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."glob"."~4.0.2" =
+    self.by-version."glob"."4.0.3";
+  by-spec."glob"."~4.0.3" =
+    self.by-version."glob"."4.0.3";
+  by-spec."glob-stream"."^3.1.5" =
+    self.by-version."glob-stream"."3.1.13";
+  by-version."glob-stream"."3.1.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-stream-3.1.13";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.13.tgz";
+        name = "glob-stream-3.1.13.tgz";
+        sha1 = "1411fd2749a4420378aa8d21a6033edc7698a003";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob-stream" or []);
+    deps = [
+      self.by-version."glob"."4.0.3"
+      self.by-version."minimatch"."0.3.0"
+      self.by-version."ordered-read-streams"."0.0.7"
+      self.by-version."glob2base"."0.0.9"
+      self.by-version."unique-stream"."1.0.0"
+      self.by-version."through2"."0.5.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob-stream" ];
+  };
+  by-spec."glob-watcher"."^0.0.6" =
+    self.by-version."glob-watcher"."0.0.6";
+  by-version."glob-watcher"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-watcher-0.0.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
+        name = "glob-watcher-0.0.6.tgz";
+        sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob-watcher" or []);
+    deps = [
+      self.by-version."gaze"."0.5.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob-watcher" ];
+  };
+  by-spec."glob2base"."^0.0.9" =
+    self.by-version."glob2base"."0.0.9";
+  by-version."glob2base"."0.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob2base-0.0.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.9.tgz";
+        name = "glob2base-0.0.9.tgz";
+        sha1 = "50a7bb1fc1260e1eb5ba1b136003569a1fe57f98";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."glob2base" or []);
+    deps = [
+      self.by-version."lodash.findindex"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "glob2base" ];
+  };
+  by-spec."globule"."~0.1.0" =
+    self.by-version."globule"."0.1.0";
+  by-version."globule"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-globule-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
+        name = "globule-0.1.0.tgz";
+        sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."globule" or []);
+    deps = [
+      self.by-version."lodash"."1.0.1"
+      self.by-version."glob"."3.1.21"
+      self.by-version."minimatch"."0.2.14"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "globule" ];
+  };
   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 +8866,29 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
+  by-spec."graceful-fs"."2 || 3" =
+    self.by-version."graceful-fs"."3.0.2";
+  by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-graceful-fs-3.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz";
+        name = "graceful-fs-3.0.2.tgz";
+        sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."graceful-fs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "graceful-fs" ];
+  };
+  by-spec."graceful-fs"."^3.0.0" =
+    self.by-version."graceful-fs"."3.0.2";
+  by-spec."graceful-fs"."^3.0.2" =
+    self.by-version."graceful-fs"."3.0.2";
   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 +8929,27 @@
   };
   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" =
+  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.2";
+  by-spec."graceful-fs"."~3.0.1" =
+    self.by-version."graceful-fs"."3.0.2";
+  by-spec."graceful-fs"."~3.0.2" =
+    self.by-version."graceful-fs"."3.0.2";
   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 +8960,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.3.0" =
+    self.by-version."grouped-queue"."0.3.0";
+  by-version."grouped-queue"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grouped-queue-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.0.tgz";
+        name = "grouped-queue-0.3.0.tgz";
+        sha1 = "4f5e1a768bba722862993285820f980e227fc4a6";
+      })
+    ];
+    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 +9002,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 =
@@ -7677,34 +9019,35 @@
       self.by-version."coffee-script"."1.3.3"
       self.by-version."colors"."0.6.2"
       self.by-version."dateformat"."1.0.2-1.2.3"
-      self.by-version."eventemitter2"."0.4.13"
+      self.by-version."eventemitter2"."0.4.14"
       self.by-version."findup-sync"."0.1.3"
       self.by-version."glob"."3.1.21"
       self.by-version."hooker"."0.2.3"
       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 {
@@ -7754,32 +9097,32 @@
     passthru.names = [ "grunt-cli" ];
   };
   "grunt-cli" = self.by-version."grunt-cli"."0.1.13";
-  by-spec."grunt-cli"."~0.1.7" =
+  by-spec."grunt-cli".">=0.1.7" =
     self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
-    self.by-version."grunt-contrib-cssmin"."0.9.0";
-  by-version."grunt-contrib-cssmin"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-cssmin-0.9.0";
+    self.by-version."grunt-contrib-cssmin"."0.10.0";
+  by-version."grunt-contrib-cssmin"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-cssmin-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.9.0.tgz";
-        name = "grunt-contrib-cssmin-0.9.0.tgz";
-        sha1 = "27241f0160a8866659dab40dc8c2776c01ec7ce2";
+        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.10.0.tgz";
+        name = "grunt-contrib-cssmin-0.10.0.tgz";
+        sha1 = "e05f341e753a9674b2b1070220fdcbac22079418";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
       self.by-version."chalk"."0.4.0"
-      self.by-version."clean-css"."2.1.8"
-      self.by-version."maxmin"."0.1.0"
+      self.by-version."clean-css"."2.2.5"
+      self.by-version."maxmin"."0.2.0"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.4"
+      self.by-version."grunt"."0.4.5"
     ];
     passthru.names = [ "grunt-contrib-cssmin" ];
   };
-  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0";
+  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.10.0";
   by-spec."grunt-contrib-jshint"."*" =
     self.by-version."grunt-contrib-jshint"."0.10.0";
   by-version."grunt-contrib-jshint"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -7794,96 +9137,97 @@
     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.3";
+  by-version."grunt-contrib-less"."0.11.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-less-0.11.3";
     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.3.tgz";
+        name = "grunt-contrib-less-0.11.3.tgz";
+        sha1 = "ec66618a5f0ed0ff13bdb3633169ef60f26b3c20";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
-      self.by-version."less"."1.7.0"
+      self.by-version."less"."1.7.3"
       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.3";
   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 {
-    name = "node-grunt-contrib-uglify-0.4.0";
+    self.by-version."grunt-contrib-uglify"."0.5.0";
+  by-version."grunt-contrib-uglify"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-uglify-0.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.4.0.tgz";
-        name = "grunt-contrib-uglify-0.4.0.tgz";
-        sha1 = "6a4df3e85ccf4bbae484b0328cc71c9f102e80be";
+        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.5.0.tgz";
+        name = "grunt-contrib-uglify-0.5.0.tgz";
+        sha1 = "9e4c1962b4bbf877b02c0c50b3e8ae6651fe2595";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.13"
+      self.by-version."uglify-js"."2.4.14"
       self.by-version."chalk"."0.4.0"
       self.by-version."maxmin"."0.1.0"
+      self.by-version."lodash"."2.4.1"
     ];
     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";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.5.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 +9236,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 +9308,34 @@
       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.1";
+  by-version."gruntfile-editor"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-gruntfile-editor-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gruntfile-editor/-/gruntfile-editor-0.1.1.tgz";
+        name = "gruntfile-editor-0.1.1.tgz";
+        sha1 = "b8db939fdc9831fcea46519b99eb507d9a51ed41";
+      })
+    ];
+    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."gruntfile-editor"."^0.1.1" =
+    self.by-version."gruntfile-editor"."0.1.1";
   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 +9352,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,13 +9375,34 @@
     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 = [
     ];
     passthru.names = [ "gzip-size" ];
   };
+  by-spec."gzip-size"."^0.2.0" =
+    self.by-version."gzip-size"."0.2.0";
+  by-version."gzip-size"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "gzip-size-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.2.0.tgz";
+        name = "gzip-size-0.2.0.tgz";
+        sha1 = "e3a2a191205fe56ee326f5c271435dfaecfb3e1c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."gzip-size" or []);
+    deps = [
+      self.by-version."concat-stream"."1.4.6"
+      self.by-version."browserify-zlib"."0.1.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "gzip-size" ];
+  };
   by-spec."gzippo"."*" =
     self.by-version."gzippo"."0.2.0";
   by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -8006,7 +9417,7 @@
     buildInputs =
       (self.nativeDeps."gzippo" or []);
     deps = [
-      self.by-version."send"."0.2.0"
+      self.by-version."send"."0.5.0"
     ];
     peerDependencies = [
     ];
@@ -8206,44 +9617,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."bindings"."1.2.1"
+      self.by-version."nan"."1.1.2"
     ];
     peerDependencies = [
     ];
@@ -8325,6 +9737,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 +9779,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 +9826,8 @@
     ];
     passthru.names = [ "htmlparser2" ];
   };
+  by-spec."htmlparser2"."~3.7.2" =
+    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 {
@@ -8415,15 +9849,15 @@
     ];
     passthru.names = [ "http-auth" ];
   };
-  by-spec."http-browserify"."~1.3.1" =
-    self.by-version."http-browserify"."1.3.2";
-  by-version."http-browserify"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-http-browserify-1.3.2";
+  by-spec."http-browserify"."^1.4.0" =
+    self.by-version."http-browserify"."1.4.1";
+  by-version."http-browserify"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-http-browserify-1.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.3.2.tgz";
-        name = "http-browserify-1.3.2.tgz";
-        sha1 = "b562c34479349a690d7a6597df495aefa8c604f5";
+        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.4.1.tgz";
+        name = "http-browserify-1.4.1.tgz";
+        sha1 = "31d9938e32f3b392bad0c35ef3b80a847e923dc7";
       })
     ];
     buildInputs =
@@ -8436,15 +9870,15 @@
     ];
     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"."0.8.7" =
+    self.by-version."http-proxy"."0.8.7";
+  by-version."http-proxy"."0.8.7" = lib.makeOverridable self.buildNodePackage {
+    name = "http-proxy-0.8.7";
     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-0.8.7.tgz";
+        name = "http-proxy-0.8.7.tgz";
+        sha1 = "a7bc538618092cd26ed191e4625933baef6de80e";
       })
     ];
     buildInputs =
@@ -8453,7 +9887,26 @@
       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"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "http-proxy" ];
+  };
+  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 = [
+      (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."eventemitter3"."0.1.2"
     ];
     peerDependencies = [
     ];
@@ -8584,26 +10037,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 +10073,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.14"
       self.by-version."estraverse"."1.5.0"
       self.by-version."escodegen"."1.1.0"
       self.by-version."which"."1.0.5"
@@ -8631,7 +10084,26 @@
     ];
     passthru.names = [ "ibrik" ];
   };
-  by-spec."iconv-lite"."~0.2.10" =
+  by-spec."iconv-lite"."0.4.3" =
+    self.by-version."iconv-lite"."0.4.3";
+  by-version."iconv-lite"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-iconv-lite-0.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.3.tgz";
+        name = "iconv-lite-0.4.3.tgz";
+        sha1 = "9e7887793b769cc695eb22d2546a4fd2d79b7a1e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."iconv-lite" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "iconv-lite" ];
+  };
+  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,8 +10122,12 @@
     ];
     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."iconv-lite"."~0.4.3" =
+    self.by-version."iconv-lite"."0.4.3";
   by-spec."ieee754"."~1.1.1" =
     self.by-version."ieee754"."1.1.3";
   by-version."ieee754"."1.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -8690,6 +10166,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 +10235,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 +10276,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.1.0" =
+    self.by-version."init-package-json"."0.1.0";
+  by-version."init-package-json"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-init-package-json-0.1.0";
     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.1.0.tgz";
+        name = "init-package-json-0.1.0.tgz";
+        sha1 = "249c982759a102556f294f2592c14a2dad855f52";
       })
     ];
     buildInputs =
       (self.nativeDeps."init-package-json" or []);
     deps = [
-      self.by-version."promzard"."0.2.1"
+      self.by-version."glob"."4.0.3"
+      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.3"
+      self.by-version."semver"."2.3.1"
     ];
     peerDependencies = [
     ];
@@ -8799,12 +10316,38 @@
     buildInputs =
       (self.nativeDeps."inline-source-map" or []);
     deps = [
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
     ];
     peerDependencies = [
     ];
     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 {
@@ -8857,31 +10400,34 @@
   };
   by-spec."inquirer"."~0.4.1" =
     self.by-version."inquirer"."0.4.1";
-  by-spec."insert-module-globals"."~5.0.1" =
-    self.by-version."insert-module-globals"."5.0.1";
-  by-version."insert-module-globals"."5.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "insert-module-globals-5.0.1";
+  by-spec."inquirer"."~0.5.1" =
+    self.by-version."inquirer"."0.5.1";
+  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-5.0.1.tgz";
-        name = "insert-module-globals-5.0.1.tgz";
-        sha1 = "eec9c0dfad30380e8eda313a094165dc2f2350d2";
+        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.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"
+      self.by-version."xtend"."3.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "insert-module-globals" ];
   };
-  by-spec."insight"."~0.3.0" =
+  by-spec."insight"."^0.3.0" =
     self.by-version."insight"."0.3.1";
   by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-insight-0.3.1";
@@ -8907,6 +10453,8 @@
     ];
     passthru.names = [ "insight" ];
   };
+  by-spec."insight"."~0.3.0" =
+    self.by-version."insight"."0.3.1";
   by-spec."intersect"."~0.0.3" =
     self.by-version."intersect"."0.0.3";
   by-version."intersect"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -8926,6 +10474,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 +10511,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.5"
       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.8.1"
+      self.by-version."redis"."0.10.3"
+      self.by-version."hiredis"."0.1.17"
     ];
     peerDependencies = [
     ];
@@ -8963,14 +10530,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 =
@@ -8981,7 +10548,7 @@
     ];
     passthru.names = [ "is-promise" ];
   };
-  by-spec."is-root"."~0.1.0" =
+  by-spec."is-root"."^0.1.0" =
     self.by-version."is-root"."0.1.0";
   by-version."is-root"."0.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-is-root-0.1.0";
@@ -9000,6 +10567,27 @@
     ];
     passthru.names = [ "is-root" ];
   };
+  by-spec."is-root"."~0.1.0" =
+    self.by-version."is-root"."0.1.0";
+  by-spec."is-utf8"."^0.2.0" =
+    self.by-version."is-utf8"."0.2.0";
+  by-version."is-utf8"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-is-utf8-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz";
+        name = "is-utf8-0.2.0.tgz";
+        sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."is-utf8" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "is-utf8" ];
+  };
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -9019,6 +10607,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,59 +10649,42 @@
     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.14";
+  by-version."istanbul"."0.2.14" = lib.makeOverridable self.buildNodePackage {
+    name = "istanbul-0.2.14";
     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.14.tgz";
+        name = "istanbul-0.2.14.tgz";
+        sha1 = "6667623254b33d33cf0ab6b5c70ca7e819ec582f";
       })
     ];
     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"."3.0.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.9.0"
       self.by-version."abbrev"."1.0.5"
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."resolve"."0.6.3"
+      self.by-version."resolve"."0.7.1"
       self.by-version."js-yaml"."3.0.2"
     ];
     peerDependencies = [
     ];
     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.14";
+  by-spec."istanbul"."~0.2.10" =
+    self.by-version."istanbul"."0.2.14";
   by-spec."istanbul"."~0.2.4" =
-    self.by-version."istanbul"."0.2.7";
+    self.by-version."istanbul"."0.2.14";
   by-spec."jade"."*" =
     self.by-version."jade"."1.3.1";
   by-version."jade"."1.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -9369,35 +10959,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,60 +11185,81 @@
     ];
     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"
       self.by-version."mime"."1.2.11"
-      self.by-version."log4js"."0.6.14"
+      self.by-version."log4js"."0.6.15"
       self.by-version."useragent"."2.0.8"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."connect"."2.12.0"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
     ];
     peerDependencies = [
     ];
     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.12.8" =
+    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 +11267,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.14"
       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,20 +11314,20 @@
       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" ];
   };
   "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2";
   by-spec."karma-mocha"."*" =
-    self.by-version."karma-mocha"."0.1.3";
-  by-version."karma-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-mocha-0.1.3";
+    self.by-version."karma-mocha"."0.1.4";
+  by-version."karma-mocha"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-mocha-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.3.tgz";
-        name = "karma-mocha-0.1.3.tgz";
-        sha1 = "396e44be8ddb4abf28bfca0387924c3aeddbce1a";
+        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.4.tgz";
+        name = "karma-mocha-0.1.4.tgz";
+        sha1 = "66617dead3f52311ab3b042cc046b63731ef1697";
       })
     ];
     buildInputs =
@@ -9723,21 +11335,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";
+  "karma-mocha" = self.by-version."karma-mocha"."0.1.4";
   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 +11357,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.9";
+  by-version."karma-sauce-launcher"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-sauce-launcher-0.2.9";
     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.9.tgz";
+        name = "karma-sauce-launcher-0.2.9.tgz";
+        sha1 = "20202c09844d9787723728344c98500719eb5404";
       })
     ];
     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.9";
+  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 +11467,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,47 +11526,124 @@
     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.9.0";
+  by-version."knox"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-knox-0.9.0";
     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.9.0.tgz";
+        name = "knox-0.9.0.tgz";
+        sha1 = "8810e1dfe4332db505a796f5c9a11aee8b393e2c";
       })
     ];
     buildInputs =
       (self.nativeDeps."knox" or []);
     deps = [
       self.by-version."mime"."1.2.11"
-      self.by-version."xml2js"."0.2.8"
-      self.by-version."debug"."0.7.4"
-      self.by-version."stream-counter"."0.1.0"
+      self.by-version."xml2js"."0.4.4"
+      self.by-version."debug"."1.0.2"
+      self.by-version."stream-counter"."1.0.0"
+      self.by-version."once"."1.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "knox" ];
   };
-  "knox" = self.by-version."knox"."0.8.9";
-  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";
+  "knox" = self.by-version."knox"."0.9.0";
+  by-spec."koa"."*" =
+    self.by-version."koa"."0.8.1";
+  by-version."koa"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-koa-0.8.1";
     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/koa/-/koa-0.8.1.tgz";
+        name = "koa-0.8.1.tgz";
+        sha1 = "bd8af6b6f8bd5afdbaa71a26238dfe5ed6e68f6e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."koa" or []);
+    deps = [
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."statuses"."1.0.3"
+      self.by-version."accepts"."1.0.6"
+      self.by-version."type-is"."1.3.2"
+      self.by-version."mime-types"."1.0.1"
+      self.by-version."finished"."1.2.2"
+      self.by-version."co"."3.0.6"
+      self.by-version."debug"."1.0.2"
+      self.by-version."fresh"."0.2.2"
+      self.by-version."koa-compose"."2.3.0"
+      self.by-version."koa-is-json"."1.0.0"
+      self.by-version."cookies"."0.4.1"
+      self.by-version."delegates"."0.0.3"
+      self.by-version."dethroy"."1.0.1"
+      self.by-version."error-inject"."1.0.0"
+      self.by-version."vary"."0.1.0"
+      self.by-version."only"."0.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "koa" ];
+  };
+  by-spec."koa-compose"."~2.3.0" =
+    self.by-version."koa-compose"."2.3.0";
+  by-version."koa-compose"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-koa-compose-2.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/koa-compose/-/koa-compose-2.3.0.tgz";
+        name = "koa-compose-2.3.0.tgz";
+        sha1 = "4617fa832a16412a56967334304efd797d6ed35c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."koa-compose" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "koa-compose" ];
+  };
+  by-spec."koa-is-json"."~1.0.0" =
+    self.by-version."koa-is-json"."1.0.0";
+  by-version."koa-is-json"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-koa-is-json-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz";
+        name = "koa-is-json-1.0.0.tgz";
+        sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."koa-is-json" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "koa-is-json" ];
+  };
+  by-spec."kue"."*" =
+    self.by-version."kue"."0.8.1";
+  by-version."kue"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-kue-0.8.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/kue/-/kue-0.8.1.tgz";
+        name = "kue-0.8.1.tgz";
+        sha1 = "ca3f3aa705b150e6527b7dd718433efc246611e4";
       })
     ];
     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"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."lodash-deep"."1.2.1"
       self.by-version."nib"."0.5.0"
       self.by-version."reds"."0.2.4"
     ];
@@ -9962,7 +11651,7 @@
     ];
     passthru.names = [ "kue" ];
   };
-  "kue" = self.by-version."kue"."0.7.5";
+  "kue" = self.by-version."kue"."0.8.1";
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
@@ -10022,55 +11711,56 @@
     passthru.names = [ "lcov-parse" ];
   };
   by-spec."lcov-result-merger"."*" =
-    self.by-version."lcov-result-merger"."0.0.2";
-  by-version."lcov-result-merger"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "lcov-result-merger-0.0.2";
+    self.by-version."lcov-result-merger"."1.0.0";
+  by-version."lcov-result-merger"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "lcov-result-merger-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-0.0.2.tgz";
-        name = "lcov-result-merger-0.0.2.tgz";
-        sha1 = "72a538c09f76e5c79b511bcd1053948d4aa98f10";
+        url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.0.tgz";
+        name = "lcov-result-merger-1.0.0.tgz";
+        sha1 = "c0afba9711b1cd8ef6a43e71254a39a9882f6ff5";
       })
     ];
     buildInputs =
       (self.nativeDeps."lcov-result-merger" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."through2"."0.5.1"
+      self.by-version."vinyl"."0.2.3"
+      self.by-version."vinyl-fs"."0.3.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "lcov-result-merger" ];
   };
-  "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
+  "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.0";
   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.3";
+  by-version."less"."1.7.3" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.7.3";
     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.3.tgz";
+        name = "less-1.7.3.tgz";
+        sha1 = "89acc0e8adcdb1934aa21c7611d35b97b52652a6";
       })
     ];
     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"
       self.by-version."clean-css"."2.1.8"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "less" ];
   };
-  "less" = self.by-version."less"."1.7.0";
-  by-spec."less"."^1.7.0" =
-    self.by-version."less"."1.7.0";
-  by-spec."less"."~1.7.0" =
-    self.by-version."less"."1.7.0";
+  "less" = self.by-version."less"."1.7.3";
+  by-spec."less"."~1.7.2" =
+    self.by-version."less"."1.7.3";
   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 {
@@ -10091,35 +11781,36 @@
     ];
     passthru.names = [ "lexical-scope" ];
   };
-  by-spec."libxmljs"."~0.8.1" =
-    self.by-version."libxmljs"."0.8.1";
-  by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-libxmljs-0.8.1";
+  by-spec."libxmljs"."~0.10.0" =
+    self.by-version."libxmljs"."0.10.0";
+  by-version."libxmljs"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-libxmljs-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.8.1.tgz";
-        name = "libxmljs-0.8.1.tgz";
-        sha1 = "b8b1d3962a92dbc5be9dc798bac028e09db8d630";
+        url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz";
+        name = "libxmljs-0.10.0.tgz";
+        sha1 = "847eb4b0545b02d1c235e1f8371818cf709d3256";
       })
     ];
     buildInputs =
       (self.nativeDeps."libxmljs" or []);
     deps = [
-      self.by-version."bindings"."1.0.0"
+      self.by-version."bindings"."1.1.1"
+      self.by-version."nan"."1.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "libxmljs" ];
   };
   by-spec."libyaml"."*" =
-    self.by-version."libyaml"."0.2.3";
-  by-version."libyaml"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-libyaml-0.2.3";
+    self.by-version."libyaml"."0.2.4";
+  by-version."libyaml"."0.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-libyaml-0.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.3.tgz";
-        name = "libyaml-0.2.3.tgz";
-        sha1 = "c07e7fefcad6e09218ebf9ff814bbd520172add6";
+        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.4.tgz";
+        name = "libyaml-0.2.4.tgz";
+        sha1 = "46b6abe00ef0bc0ac60ca599c0e7c80ff920e959";
       })
     ];
     buildInputs =
@@ -10130,7 +11821,7 @@
     ];
     passthru.names = [ "libyaml" ];
   };
-  "libyaml" = self.by-version."libyaml"."0.2.3";
+  "libyaml" = self.by-version."libyaml"."0.2.4";
   by-spec."lockfile"."~0.4.0" =
     self.by-version."lockfile"."0.4.2";
   by-version."lockfile"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -10152,7 +11843,7 @@
   };
   by-spec."lockfile"."~0.4.2" =
     self.by-version."lockfile"."0.4.2";
-  by-spec."lodash"."^2.4.1" =
+  by-spec."lodash".">=2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-lodash-2.4.1";
@@ -10171,6 +11862,8 @@
     ];
     passthru.names = [ "lodash" ];
   };
+  by-spec."lodash"."^2.4.1" =
+    self.by-version."lodash"."2.4.1";
   by-spec."lodash"."~0.10.0" =
     self.by-version."lodash"."0.10.0";
   by-version."lodash"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -10209,6 +11902,25 @@
     ];
     passthru.names = [ "lodash" ];
   };
+  by-spec."lodash"."~1.0.1" =
+    self.by-version."lodash"."1.0.1";
+  by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
+        name = "lodash-1.0.1.tgz";
+        sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash" ];
+  };
   by-spec."lodash"."~1.2.1" =
     self.by-version."lodash"."1.2.1";
   by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -10289,6 +12001,26 @@
   };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
+  by-spec."lodash-deep"."^1.1.0" =
+    self.by-version."lodash-deep"."1.2.1";
+  by-version."lodash-deep"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash-deep-1.2.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.2.1.tgz";
+        name = "lodash-deep-1.2.1.tgz";
+        sha1 = "04ea62f43112151388de983f7e07c3e6ded07225";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash-deep" or []);
+    deps = [
+      self.by-version."lodash"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash-deep" ];
+  };
   by-spec."lodash-node"."~2.4.1" =
     self.by-version."lodash-node"."2.4.1";
   by-version."lodash-node"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10308,6 +12040,183 @@
     ];
     passthru.names = [ "lodash-node" ];
   };
+  by-spec."lodash._arraypool"."~2.4.1" =
+    self.by-version."lodash._arraypool"."2.4.1";
+  by-version."lodash._arraypool"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._arraypool-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz";
+        name = "lodash._arraypool-2.4.1.tgz";
+        sha1 = "e88eecb92e2bb84c9065612fd958a0719cd47f94";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._arraypool" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._arraypool" ];
+  };
+  by-spec."lodash._basebind"."~2.4.1" =
+    self.by-version."lodash._basebind"."2.4.1";
+  by-version."lodash._basebind"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._basebind-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz";
+        name = "lodash._basebind-2.4.1.tgz";
+        sha1 = "e940b9ebdd27c327e0a8dab1b55916c5341e9575";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._basebind" or []);
+    deps = [
+      self.by-version."lodash._basecreate"."2.4.1"
+      self.by-version."lodash.isobject"."2.4.1"
+      self.by-version."lodash._setbinddata"."2.4.1"
+      self.by-version."lodash._slice"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._basebind" ];
+  };
+  by-spec."lodash._basecreate"."~2.4.1" =
+    self.by-version."lodash._basecreate"."2.4.1";
+  by-version."lodash._basecreate"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._basecreate-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz";
+        name = "lodash._basecreate-2.4.1.tgz";
+        sha1 = "f8e6f5b578a9e34e541179b56b8eeebf4a287e08";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._basecreate" or []);
+    deps = [
+      self.by-version."lodash._isnative"."2.4.1"
+      self.by-version."lodash.isobject"."2.4.1"
+      self.by-version."lodash.noop"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._basecreate" ];
+  };
+  by-spec."lodash._basecreatecallback"."~2.4.1" =
+    self.by-version."lodash._basecreatecallback"."2.4.1";
+  by-version."lodash._basecreatecallback"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._basecreatecallback-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz";
+        name = "lodash._basecreatecallback-2.4.1.tgz";
+        sha1 = "7d0b267649cb29e7a139d0103b7c11fae84e4851";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._basecreatecallback" or []);
+    deps = [
+      self.by-version."lodash.bind"."2.4.1"
+      self.by-version."lodash.identity"."2.4.1"
+      self.by-version."lodash._setbinddata"."2.4.1"
+      self.by-version."lodash.support"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._basecreatecallback" ];
+  };
+  by-spec."lodash._basecreatewrapper"."~2.4.1" =
+    self.by-version."lodash._basecreatewrapper"."2.4.1";
+  by-version."lodash._basecreatewrapper"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._basecreatewrapper-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz";
+        name = "lodash._basecreatewrapper-2.4.1.tgz";
+        sha1 = "4d31f2e7de7e134fbf2803762b8150b32519666f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._basecreatewrapper" or []);
+    deps = [
+      self.by-version."lodash._basecreate"."2.4.1"
+      self.by-version."lodash.isobject"."2.4.1"
+      self.by-version."lodash._setbinddata"."2.4.1"
+      self.by-version."lodash._slice"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._basecreatewrapper" ];
+  };
+  by-spec."lodash._baseisequal"."~2.4.1" =
+    self.by-version."lodash._baseisequal"."2.4.1";
+  by-version."lodash._baseisequal"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._baseisequal-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-2.4.1.tgz";
+        name = "lodash._baseisequal-2.4.1.tgz";
+        sha1 = "6b1e62e587c5523111f6f228553dab19e445fc03";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._baseisequal" or []);
+    deps = [
+      self.by-version."lodash.forin"."2.4.1"
+      self.by-version."lodash._getarray"."2.4.1"
+      self.by-version."lodash.isfunction"."2.4.1"
+      self.by-version."lodash._objecttypes"."2.4.1"
+      self.by-version."lodash._releasearray"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._baseisequal" ];
+  };
+  by-spec."lodash._createwrapper"."~2.4.1" =
+    self.by-version."lodash._createwrapper"."2.4.1";
+  by-version."lodash._createwrapper"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._createwrapper-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz";
+        name = "lodash._createwrapper-2.4.1.tgz";
+        sha1 = "51d6957973da4ed556e37290d8c1a18c53de1607";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._createwrapper" or []);
+    deps = [
+      self.by-version."lodash._basebind"."2.4.1"
+      self.by-version."lodash._basecreatewrapper"."2.4.1"
+      self.by-version."lodash.isfunction"."2.4.1"
+      self.by-version."lodash._slice"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._createwrapper" ];
+  };
+  by-spec."lodash._getarray"."~2.4.1" =
+    self.by-version."lodash._getarray"."2.4.1";
+  by-version."lodash._getarray"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._getarray-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz";
+        name = "lodash._getarray-2.4.1.tgz";
+        sha1 = "faf1f7f810fa985a251c2187404481094839e5ee";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._getarray" or []);
+    deps = [
+      self.by-version."lodash._arraypool"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._getarray" ];
+  };
   by-spec."lodash._isnative"."~2.4.1" =
     self.by-version."lodash._isnative"."2.4.1";
   by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10327,6 +12236,25 @@
     ];
     passthru.names = [ "lodash._isnative" ];
   };
+  by-spec."lodash._maxpoolsize"."~2.4.1" =
+    self.by-version."lodash._maxpoolsize"."2.4.1";
+  by-version."lodash._maxpoolsize"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._maxpoolsize-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz";
+        name = "lodash._maxpoolsize-2.4.1.tgz";
+        sha1 = "9d482f463b8e66afbe59c2c14edb117060172334";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._maxpoolsize" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._maxpoolsize" ];
+  };
   by-spec."lodash._objecttypes"."~2.4.1" =
     self.by-version."lodash._objecttypes"."2.4.1";
   by-version."lodash._objecttypes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10346,6 +12274,48 @@
     ];
     passthru.names = [ "lodash._objecttypes" ];
   };
+  by-spec."lodash._releasearray"."~2.4.1" =
+    self.by-version."lodash._releasearray"."2.4.1";
+  by-version."lodash._releasearray"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._releasearray-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz";
+        name = "lodash._releasearray-2.4.1.tgz";
+        sha1 = "a6139630d76d1536b07ddc80962889b082f6a641";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._releasearray" or []);
+    deps = [
+      self.by-version."lodash._arraypool"."2.4.1"
+      self.by-version."lodash._maxpoolsize"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._releasearray" ];
+  };
+  by-spec."lodash._setbinddata"."~2.4.1" =
+    self.by-version."lodash._setbinddata"."2.4.1";
+  by-version."lodash._setbinddata"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._setbinddata-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz";
+        name = "lodash._setbinddata-2.4.1.tgz";
+        sha1 = "f7c200cd1b92ef236b399eecf73c648d17aa94d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._setbinddata" or []);
+    deps = [
+      self.by-version."lodash._isnative"."2.4.1"
+      self.by-version."lodash.noop"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._setbinddata" ];
+  };
   by-spec."lodash._shimkeys"."~2.4.1" =
     self.by-version."lodash._shimkeys"."2.4.1";
   by-version."lodash._shimkeys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10366,6 +12336,70 @@
     ];
     passthru.names = [ "lodash._shimkeys" ];
   };
+  by-spec."lodash._slice"."~2.4.1" =
+    self.by-version."lodash._slice"."2.4.1";
+  by-version."lodash._slice"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash._slice-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz";
+        name = "lodash._slice-2.4.1.tgz";
+        sha1 = "745cf41a53597b18f688898544405efa2b06d90f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash._slice" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash._slice" ];
+  };
+  by-spec."lodash.bind"."~2.4.1" =
+    self.by-version."lodash.bind"."2.4.1";
+  by-version."lodash.bind"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.bind-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz";
+        name = "lodash.bind-2.4.1.tgz";
+        sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.bind" or []);
+    deps = [
+      self.by-version."lodash._createwrapper"."2.4.1"
+      self.by-version."lodash._slice"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.bind" ];
+  };
+  by-spec."lodash.createcallback"."~2.4.1" =
+    self.by-version."lodash.createcallback"."2.4.1";
+  by-version."lodash.createcallback"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.createcallback-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.createcallback/-/lodash.createcallback-2.4.1.tgz";
+        name = "lodash.createcallback-2.4.1.tgz";
+        sha1 = "c81645ac3a1d7f9dc6b36b8bc0d84c013c98ea95";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.createcallback" or []);
+    deps = [
+      self.by-version."lodash._basecreatecallback"."2.4.1"
+      self.by-version."lodash._baseisequal"."2.4.1"
+      self.by-version."lodash.isobject"."2.4.1"
+      self.by-version."lodash.keys"."2.4.1"
+      self.by-version."lodash.property"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.createcallback" ];
+  };
   by-spec."lodash.debounce"."~2.4.1" =
     self.by-version."lodash.debounce"."2.4.1";
   by-version."lodash.debounce"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10388,7 +12422,7 @@
     ];
     passthru.names = [ "lodash.debounce" ];
   };
-  by-spec."lodash.defaults"."~2.4.1" =
+  by-spec."lodash.defaults"."^2.4.1" =
     self.by-version."lodash.defaults"."2.4.1";
   by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-lodash.defaults-2.4.1";
@@ -10409,6 +12443,66 @@
     ];
     passthru.names = [ "lodash.defaults" ];
   };
+  by-spec."lodash.findindex"."^2.4.1" =
+    self.by-version."lodash.findindex"."2.4.1";
+  by-version."lodash.findindex"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.findindex-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.findindex/-/lodash.findindex-2.4.1.tgz";
+        name = "lodash.findindex-2.4.1.tgz";
+        sha1 = "738d108641cf2ef087207f35f2c6a5eacf807caa";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.findindex" or []);
+    deps = [
+      self.by-version."lodash.createcallback"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.findindex" ];
+  };
+  by-spec."lodash.forin"."~2.4.1" =
+    self.by-version."lodash.forin"."2.4.1";
+  by-version."lodash.forin"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.forin-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.forin/-/lodash.forin-2.4.1.tgz";
+        name = "lodash.forin-2.4.1.tgz";
+        sha1 = "8089eaed7d25b08672b7c66fd07ac55d062320eb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.forin" or []);
+    deps = [
+      self.by-version."lodash._basecreatecallback"."2.4.1"
+      self.by-version."lodash._objecttypes"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.forin" ];
+  };
+  by-spec."lodash.identity"."~2.4.1" =
+    self.by-version."lodash.identity"."2.4.1";
+  by-version."lodash.identity"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.identity-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz";
+        name = "lodash.identity-2.4.1.tgz";
+        sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.identity" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.identity" ];
+  };
   by-spec."lodash.isfunction"."~2.4.1" =
     self.by-version."lodash.isfunction"."2.4.1";
   by-version."lodash.isfunction"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10470,6 +12564,25 @@
     ];
     passthru.names = [ "lodash.keys" ];
   };
+  by-spec."lodash.noop"."~2.4.1" =
+    self.by-version."lodash.noop"."2.4.1";
+  by-version."lodash.noop"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.noop-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz";
+        name = "lodash.noop-2.4.1.tgz";
+        sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.noop" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.noop" ];
+  };
   by-spec."lodash.now"."~2.4.1" =
     self.by-version."lodash.now"."2.4.1";
   by-version."lodash.now"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10490,15 +12603,54 @@
     ];
     passthru.names = [ "lodash.now" ];
   };
-  by-spec."log-driver"."1.2.1" =
-    self.by-version."log-driver"."1.2.1";
-  by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log-driver-1.2.1";
+  by-spec."lodash.property"."~2.4.1" =
+    self.by-version."lodash.property"."2.4.1";
+  by-version."lodash.property"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.property-2.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.1.tgz";
-        name = "log-driver-1.2.1.tgz";
-        sha1 = "ada8202a133e99764306652e195e28268b0bea5b";
+        url = "http://registry.npmjs.org/lodash.property/-/lodash.property-2.4.1.tgz";
+        name = "lodash.property-2.4.1.tgz";
+        sha1 = "4049c0549daf5a7102bc5e93eeaebb379deb132f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.property" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.property" ];
+  };
+  by-spec."lodash.support"."~2.4.1" =
+    self.by-version."lodash.support"."2.4.1";
+  by-version."lodash.support"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash.support-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz";
+        name = "lodash.support-2.4.1.tgz";
+        sha1 = "320e0b67031673c28d7a2bb5d9e0331a45240515";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash.support" or []);
+    deps = [
+      self.by-version."lodash._isnative"."2.4.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash.support" ];
+  };
+  by-spec."log-driver"."1.2.4" =
+    self.by-version."log-driver"."1.2.4";
+  by-version."log-driver"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log-driver-1.2.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
+        name = "log-driver-1.2.4.tgz";
+        sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3";
       })
     ];
     buildInputs =
@@ -10510,14 +12662,14 @@
     passthru.names = [ "log-driver" ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.14";
-  by-version."log4js"."0.6.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log4js-0.6.14";
+    self.by-version."log4js"."0.6.15";
+  by-version."log4js"."0.6.15" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log4js-0.6.15";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.14.tgz";
-        name = "log4js-0.6.14.tgz";
-        sha1 = "7c26a0a25536b42bafa17fd937b87536fad3b229";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.15.tgz";
+        name = "log4js-0.6.15.tgz";
+        sha1 = "f28815e44711fa6535bd072abf86f7d55a004df0";
       })
     ];
     buildInputs =
@@ -10531,25 +12683,6 @@
     ];
     passthru.names = [ "log4js" ];
   };
-  by-spec."long"."*" =
-    self.by-version."long"."1.1.2";
-  by-version."long"."1.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-long-1.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz";
-        name = "long-1.1.2.tgz";
-        sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."long" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "long" ];
-  };
   by-spec."longjohn"."~0.2.2" =
     self.by-version."longjohn"."0.2.4";
   by-version."longjohn"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -10645,6 +12778,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 +12820,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 +12860,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,15 +12940,35 @@
       (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 = [
     ];
     passthru.names = [ "maxmin" ];
   };
-  by-spec."maxmin"."~0.1.0" =
-    self.by-version."maxmin"."0.1.0";
+  by-spec."maxmin"."~0.2.0" =
+    self.by-version."maxmin"."0.2.0";
+  by-version."maxmin"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-maxmin-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/maxmin/-/maxmin-0.2.0.tgz";
+        name = "maxmin-0.2.0.tgz";
+        sha1 = "a0ba0db0a5ee2069738553cd3163e1c730a8a4bc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."maxmin" or []);
+    deps = [
+      self.by-version."chalk"."0.4.0"
+      self.by-version."gzip-size"."0.2.0"
+      self.by-version."pretty-bytes"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "maxmin" ];
+  };
   by-spec."meat"."*" =
     self.by-version."meat"."0.2.5";
   by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -10819,6 +12995,50 @@
     passthru.names = [ "meat" ];
   };
   "meat" = self.by-version."meat"."0.2.5";
+  by-spec."media-typer"."0.2.0" =
+    self.by-version."media-typer"."0.2.0";
+  by-version."media-typer"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-media-typer-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
+        name = "media-typer-0.2.0.tgz";
+        sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."media-typer" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "media-typer" ];
+  };
+  by-spec."memoizee"."0.3.x" =
+    self.by-version."memoizee"."0.3.4";
+  by-version."memoizee"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-memoizee-0.3.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.4.tgz";
+        name = "memoizee-0.3.4.tgz";
+        sha1 = "e6e675eeab30c3e21fb6104c26be0219de15186c";
+      })
+    ];
+    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 +13080,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 +13123,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 +13275,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,21 +13287,61 @@
     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."mime-types"."1.0.0" =
+    self.by-version."mime-types"."1.0.0";
+  by-version."mime-types"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mime-types-1.0.0";
     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/mime-types/-/mime-types-1.0.0.tgz";
+        name = "mime-types-1.0.0.tgz";
+        sha1 = "6a7b4a6af2e7d92f97afe03f047c7801e8f001d2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime-types" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime-types" ];
+  };
+  by-spec."mime-types"."~1.0.0" =
+    self.by-version."mime-types"."1.0.1";
+  by-version."mime-types"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mime-types-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.1.tgz";
+        name = "mime-types-1.0.1.tgz";
+        sha1 = "4d9ad71bcd4cdef6be892c21b5b81645607c0b8f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mime-types" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mime-types" ];
+  };
+  by-spec."mime-types"."~1.0.1" =
+    self.by-version."mime-types"."1.0.1";
+  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.16.tgz";
+        name = "mimelib-0.2.16.tgz";
+        sha1 = "2df4fc292c381b662d81d0b926f6795e6aa1c4f4";
       })
     ];
     buildInputs =
       (self.nativeDeps."mimelib" or []);
     deps = [
-      self.by-version."encoding"."0.1.7"
+      self.by-version."encoding"."0.1.8"
       self.by-version."addressparser"."0.2.1"
     ];
     peerDependencies = [
@@ -11051,14 +13349,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 +13391,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 +13449,76 @@
     ];
     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.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 +13550,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 +13591,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 +13614,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 +13652,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,34 +13669,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."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mocha" ];
-  };
-  "mocha" = self.by-version."mocha"."1.18.2";
-  by-spec."mocha"."1.13.x" =
-    self.by-version."mocha"."1.13.0";
-  by-version."mocha"."1.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.13.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.13.0.tgz";
-        name = "mocha-1.13.0.tgz";
-        sha1 = "8d8fa4e310b94cc6efeb3ed26aeca96dea93307c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mocha" or []);
-    deps = [
-      self.by-version."commander"."0.6.1"
-      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.2"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -11302,29 +13677,32 @@
     ];
     passthru.names = [ "mocha" ];
   };
+  "mocha" = self.by-version."mocha"."1.20.1";
+  by-spec."mocha"."~1.20.1" =
+    self.by-version."mocha"."1.20.1";
   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.5.0";
+  by-version."mocha-phantomjs"."3.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-phantomjs-3.5.0";
     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.5.0.tgz";
+        name = "mocha-phantomjs-3.5.0.tgz";
+        sha1 = "56fb4072122b4061b21e9c3901e35f4a7c58a93e";
       })
     ];
     buildInputs =
       (self.nativeDeps."mocha-phantomjs" or []);
     deps = [
-      self.by-version."mocha"."1.13.0"
-      self.by-version."commander"."1.2.0"
-      self.by-version."which"."1.0.5"
+      self.by-version."mocha"."1.20.1"
+      self.by-version."commander"."2.0.0"
     ];
     peerDependencies = [
+      self.by-version."phantomjs"."1.9.7-12"
     ];
     passthru.names = [ "mocha-phantomjs" ];
   };
-  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.3.2";
+  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.0";
   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,62 +13720,59 @@
       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";
+  by-spec."modmod"."^0.1.1" =
+    self.by-version."modmod"."0.1.2";
+  by-version."modmod"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-modmod-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.10.0.tgz";
-        name = "module-deps-1.10.0.tgz";
-        sha1 = "57a9cac9dbd092428ec5249f6cf37fb249d77db6";
+        url = "http://registry.npmjs.org/modmod/-/modmod-0.1.2.tgz";
+        name = "modmod-0.1.2.tgz";
+        sha1 = "86d5abdc5f6528acceb9f29225ace6089eb3af59";
       })
     ];
     buildInputs =
-      (self.nativeDeps."module-deps" or []);
+      (self.nativeDeps."modmod" 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" ];
+    passthru.names = [ "modmod" ];
   };
-  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 {
-    name = "module-deps-1.8.1";
+  by-spec."module-deps"."~2.1.1" =
+    self.by-version."module-deps"."2.1.3";
+  by-version."module-deps"."2.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "module-deps-2.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.8.1.tgz";
-        name = "module-deps-1.8.1.tgz";
-        sha1 = "9d603b286f87cf62aad9e3f7b65a2f8bfa21de5b";
+        url = "http://registry.npmjs.org/module-deps/-/module-deps-2.1.3.tgz";
+        name = "module-deps-2.1.3.tgz";
+        sha1 = "05211cfd29bf60e64593b79b976c6d57410318e4";
       })
     ];
     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."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."through"."2.3.4"
+      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 = [
     ];
@@ -11460,28 +13835,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.7.0" =
+    self.by-version."moment"."2.7.0";
+  by-version."moment"."2.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-moment-2.7.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.7.0.tgz";
+        name = "moment-2.7.0.tgz";
+        sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."moment" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "moment" ];
+  };
+  by-spec."mongodb"."*" =
+    self.by-version."mongodb"."1.4.7";
+  by-version."mongodb"."1.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.7";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.7.tgz";
+        name = "mongodb-1.4.7.tgz";
+        sha1 = "f605b5d43c6c018c7d56d2fb53984dd60a7be128";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongodb" or []);
     deps = [
-      self.by-version."bson"."0.2.7"
+      self.by-version."bson"."0.2.9"
       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.7";
   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 +13918,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 +13939,51 @@
     ];
     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-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.8"
+      self.by-version."kerberos"."0.0.3"
+      self.by-version."readable-stream"."1.1.13-1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mongodb" ];
+  };
   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 +14123,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 +14183,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 +14241,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 +14260,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 +14301,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 +14360,27 @@
     ];
     passthru.names = [ "multiparty" ];
   };
+  by-spec."multiparty"."3.2.9" =
+    self.by-version."multiparty"."3.2.9";
+  by-version."multiparty"."3.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-multiparty-3.2.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/multiparty/-/multiparty-3.2.9.tgz";
+        name = "multiparty-3.2.9.tgz";
+        sha1 = "c73373ea9c012e7776ce5bc40c936264b6ba2c1e";
+      })
+    ];
+    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 +14459,82 @@
     ];
     passthru.names = [ "mv" ];
   };
+  by-spec."mz"."1" =
+    self.by-version."mz"."1.0.0";
+  by-version."mz"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mz-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mz/-/mz-1.0.0.tgz";
+        name = "mz-1.0.0.tgz";
+        sha1 = "f9d7e873b8bca8632cafad1ce649c198fe36e952";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mz" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mz" ];
+  };
+  by-spec."nan"."1.1.2" =
+    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."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.8.0" =
+    self.by-version."nan"."0.8.0";
+  by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-0.8.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nan/-/nan-0.8.0.tgz";
+        name = "nan-0.8.0.tgz";
+        sha1 = "022a8fa5e9fe8420964ac1fb3dc94e17f449f5fd";
+      })
+    ];
+    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 {
@@ -12023,15 +14554,17 @@
     ];
     passthru.names = [ "nan" ];
   };
-  by-spec."nan"."~0.6.0" =
-    self.by-version."nan"."0.6.0";
-  by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-nan-0.6.0";
+  by-spec."nan"."~0.8.0" =
+    self.by-version."nan"."0.8.0";
+  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-0.6.0.tgz";
-        name = "nan-0.6.0.tgz";
-        sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa";
+        url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+        name = "nan-1.0.0.tgz";
+        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
       })
     ];
     buildInputs =
@@ -12042,24 +14575,53 @@
     ];
     passthru.names = [ "nan" ];
   };
-  by-spec."nan"."~0.8.0" =
-    self.by-version."nan"."0.8.0";
-  by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-nan-0.8.0";
+  by-spec."nan"."~1.1.0" =
+    self.by-version."nan"."1.1.2";
+  by-spec."nan"."~1.2.0" =
+    self.by-version."nan"."1.2.0";
+  by-spec."nano"."*" =
+    self.by-version."nano"."5.10.0";
+  by-version."nano"."5.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nano-5.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-0.8.0.tgz";
-        name = "nan-0.8.0.tgz";
-        sha1 = "022a8fa5e9fe8420964ac1fb3dc94e17f449f5fd";
+        url = "http://registry.npmjs.org/nano/-/nano-5.10.0.tgz";
+        name = "nano-5.10.0.tgz";
+        sha1 = "c9b3e8c43162c4fd4603ac1b2df2a287bcce5cf5";
       })
     ];
     buildInputs =
-      (self.nativeDeps."nan" or []);
+      (self.nativeDeps."nano" or []);
     deps = [
+      self.by-version."request"."2.33.0"
+      self.by-version."follow"."0.11.2"
+      self.by-version."errs"."0.2.4"
+      self.by-version."underscore"."1.5.2"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "nan" ];
+    passthru.names = [ "nano" ];
+  };
+  by-spec."native-buffer-browserify"."~2.0.8" =
+    self.by-version."native-buffer-browserify"."2.0.17";
+  by-version."native-buffer-browserify"."2.0.17" = lib.makeOverridable self.buildNodePackage {
+    name = "node-native-buffer-browserify-2.0.17";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/native-buffer-browserify/-/native-buffer-browserify-2.0.17.tgz";
+        name = "native-buffer-browserify-2.0.17.tgz";
+        sha1 = "980577018c4884d169da40b47958ffac6c327d15";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."native-buffer-browserify" or []);
+    deps = [
+      self.by-version."base64-js"."0.0.7"
+      self.by-version."ieee754"."1.1.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "native-buffer-browserify" ];
   };
   by-spec."natural"."0.1.17" =
     self.by-version."natural"."0.1.17";
@@ -12098,7 +14660,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 +14752,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.7" =
+    self.by-version."negotiator"."0.4.7";
+  by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-negotiator-0.4.7";
     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.7.tgz";
+        name = "negotiator-0.4.7.tgz";
+        sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
       })
     ];
     buildInputs =
@@ -12250,6 +14812,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,111 +14907,113 @@
     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.3.0";
+  by-version."node-expat"."2.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-node-expat-2.3.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.3.0.tgz";
+        name = "node-expat-2.3.0.tgz";
+        sha1 = "4be94d52817996c96217be3439694336f84582b9";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-expat" or []);
     deps = [
-      self.by-version."nan"."0.6.0"
+      self.by-version."nan"."1.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-expat" ];
   };
-  "node-expat" = self.by-version."node-expat"."2.1.4";
+  "node-expat" = self.by-version."node-expat"."2.3.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."fstream"."0.1.28"
+      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.1"
+      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."tar"."0.1.20"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     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.6"
       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.1";
+  by-version."node-protobuf"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-node-protobuf-1.1.1";
     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.1.tgz";
+        name = "node-protobuf-1.1.1.tgz";
+        sha1 = "83ae987aa5e42c04ee601f39da1d81b4cd8c762f";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-protobuf" or []);
     deps = [
+      self.by-version."bindings"."1.2.1"
+      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.1";
   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 +15164,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 +15203,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 +15212,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.1";
+  by-version."nodemon"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-1.2.1";
     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.1.tgz";
+        name = "nodemon-1.2.1.tgz";
+        sha1 = "02a288045652e92350e7d752a8054472ed2c4824";
       })
     ];
     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.1";
   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 +15256,14 @@
     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 =
@@ -12711,10 +15295,30 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  by-spec."nopt"."2.2.x" =
-    self.by-version."nopt"."2.2.0";
+  by-spec."nopt"."3.x" =
+    self.by-version."nopt"."3.0.1";
+  by-version."nopt"."3.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-3.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
+        name = "nopt-3.0.1.tgz";
+        sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."nopt" or []);
+    deps = [
+      self.by-version."abbrev"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "nopt" ];
+  };
   by-spec."nopt"."^2.2.0" =
-    self.by-version."nopt"."2.2.0";
+    self.by-version."nopt"."2.2.1";
+  by-spec."nopt"."^3.0.0" =
+    self.by-version."nopt"."3.0.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,89 +15362,99 @@
   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"."~3.0.0" =
+    self.by-version."nopt"."3.0.1";
+  by-spec."nopt"."~3.0.1" =
+    self.by-version."nopt"."3.0.1";
+  by-spec."normalize-package-data"."^0.4.0" =
+    self.by-version."normalize-package-data"."0.4.1";
+  by-version."normalize-package-data"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-normalize-package-data-0.4.1";
     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.4.1.tgz";
+        name = "normalize-package-data-0.4.1.tgz";
+        sha1 = "c7c83d0927cda14332aa08cf48e944919ed9102f";
       })
     ];
     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.2.0"
+      self.by-version."semver"."2.3.1"
     ];
     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.5.0-alpha-1";
+  by-version."npm"."1.5.0-alpha-1" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.5.0-alpha-1";
     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.5.0-alpha-1.tgz";
+        name = "npm-1.5.0-alpha-1.tgz";
+        sha1 = "98dd2e1562e598e2df36a11ac27a5743a9c1afa0";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm" or []);
     deps = [
       self.by-version."abbrev"."1.0.5"
-      self.by-version."ansi"."0.2.1"
+      self.by-version."ansi"."0.3.0"
       self.by-version."ansicolors"."0.3.2"
       self.by-version."ansistyles"."0.1.3"
       self.by-version."archy"."0.0.2"
+      self.by-version."async-some"."1.0.1"
       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"
       self.by-version."cmd-shim"."1.1.1"
-      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."columnify"."1.1.0"
+      self.by-version."editor"."0.1.0"
+      self.by-version."fs-vacuum"."1.2.1"
+      self.by-version."fstream"."0.1.28"
+      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."graceful-fs"."2.0.3"
-      self.by-version."ini"."1.1.0"
-      self.by-version."init-package-json"."0.0.15"
+      self.by-version."github-url-from-username-repo"."0.2.0"
+      self.by-version."glob"."4.0.3"
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."inflight"."1.0.1"
+      self.by-version."ini"."1.2.1"
+      self.by-version."init-package-json"."0.1.0"
       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."npmlog"."0.0.6"
+      self.by-version."node-gyp"."0.13.1"
+      self.by-version."nopt"."3.0.1"
+      self.by-version."npm-cache-filename"."1.0.1"
+      self.by-version."npm-install-checks"."1.0.2"
+      self.by-version."npm-package-arg"."2.0.0"
+      self.by-version."npm-registry-client"."3.0.0"
+      self.by-version."npm-user-validate"."0.1.0"
+      self.by-version."npmconf"."2.0.1"
+      self.by-version."npmlog"."0.1.1"
       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.2.3"
       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."retry"."0.6.1"
+      self.by-version."rimraf"."2.2.8"
+      self.by-version."semver"."2.3.1"
+      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"
+      self.by-version."tar"."0.1.20"
       self.by-version."text-table"."0.2.0"
       self.by-version."uid-number"."0.0.5"
       self.by-version."which"."1.0.5"
@@ -12849,28 +15463,69 @@
     ];
     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.5.0-alpha-1";
+  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.2" =
+    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.1"
+      self.by-version."semver"."2.3.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-install-checks" ];
   };
+  by-spec."npm-package-arg"."~2.0.0" =
+    self.by-version."npm-package-arg"."2.0.0";
+  by-version."npm-package-arg"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-package-arg-2.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.0.0.tgz";
+        name = "npm-package-arg-2.0.0.tgz";
+        sha1 = "b573aa01f3405c085564dfec930e8acc199bee08";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."npm-package-arg" or []);
+    deps = [
+      self.by-version."semver"."2.3.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npm-package-arg" ];
+  };
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
@@ -12885,58 +15540,60 @@
     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.1"
     ];
     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"."~3.0.0" =
+    self.by-version."npm-registry-client"."3.0.0";
+  by-version."npm-registry-client"."3.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-3.0.0";
     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-3.0.0.tgz";
+        name = "npm-registry-client-3.0.0.tgz";
+        sha1 = "4febc5cdb274e9fa06bc3008910e3fa1ec007994";
       })
     ];
     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"."3.0.2"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.6"
+      self.by-version."normalize-package-data"."0.4.1"
+      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.1"
+      self.by-version."slide"."1.1.5"
+      self.by-version."npmlog"."0.1.1"
     ];
     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 +15618,14 @@
     buildInputs =
       (self.nativeDeps."npm2nix" or []);
     deps = [
-      self.by-version."semver"."2.2.1"
+      self.by-version."semver"."2.3.1"
       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 +15651,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 +15678,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.1"
       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,42 +15705,68 @@
       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.1"
       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."npmlog"."*" =
-    self.by-version."npmlog"."0.0.6";
-  by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npmlog-0.0.6";
+  by-spec."npmconf"."~2.0.1" =
+    self.by-version."npmconf"."2.0.1";
+  by-version."npmconf"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmconf-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz";
-        name = "npmlog-0.0.6.tgz";
-        sha1 = "685043fe71aa1665d6e3b2acef180640caf40873";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.1.tgz";
+        name = "npmconf-2.0.1.tgz";
+        sha1 = "e9464590aeb4bf61eea8e08417cdec3af3204115";
+      })
+    ];
+    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.1"
+      self.by-version."once"."1.3.0"
+      self.by-version."osenv"."0.1.0"
+      self.by-version."semver"."2.3.1"
+      self.by-version."uid-number"."0.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "npmconf" ];
+  };
+  by-spec."npmlog"."*" =
+    self.by-version."npmlog"."0.1.1";
+  by-version."npmlog"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmlog-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz";
+        name = "npmlog-0.1.1.tgz";
+        sha1 = "8b9b9e4405d7ec48c31c2346965aadc7abaecaa5";
       })
     ];
     buildInputs =
       (self.nativeDeps."npmlog" or []);
     deps = [
-      self.by-version."ansi"."0.2.1"
+      self.by-version."ansi"."0.3.0"
     ];
     peerDependencies = [
     ];
     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";
+    self.by-version."npmlog"."0.1.1";
+  by-spec."npmlog"."0.1" =
+    self.by-version."npmlog"."0.1.1";
+  by-spec."npmlog"."~0.1.1" =
+    self.by-version."npmlog"."0.1.1";
   by-spec."nssocket"."~0.5.1" =
     self.by-version."nssocket"."0.5.1";
   by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -13098,7 +15781,7 @@
     buildInputs =
       (self.nativeDeps."nssocket" or []);
     deps = [
-      self.by-version."eventemitter2"."0.4.13"
+      self.by-version."eventemitter2"."0.4.14"
       self.by-version."lazy"."1.0.11"
     ];
     peerDependencies = [
@@ -13133,7 +15816,7 @@
       (fetchurl {
         url = "https://github.com/ciaranj/node-oauth/tarball/master";
         name = "oauth-0.9.11.tgz";
-        sha256 = "14cc7a064e3eda0948ac8db72fae140cb7b0fdbe031375d02cd6d0359c8b8faa";
+        sha256 = "28bd5c01b560a08b202779792627aeb9675dcd1ad7676ecbe3499220543c907c";
       })
     ];
     buildInputs =
@@ -13222,6 +15905,25 @@
   };
   by-spec."object-assign"."~0.1.2" =
     self.by-version."object-assign"."0.1.2";
+  by-spec."object-assign"."~0.3.1" =
+    self.by-version."object-assign"."0.3.1";
+  by-version."object-assign"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-object-assign-0.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz";
+        name = "object-assign-0.3.1.tgz";
+        sha1 = "060e2a2a27d7c0d77ec77b78f11aa47fd88008d2";
+      })
+    ];
+    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 +15943,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 +15981,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 +16000,29 @@
     ];
     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."only"."0.0.2" =
+    self.by-version."only"."0.0.2";
+  by-version."only"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-only-0.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/only/-/only-0.0.2.tgz";
+        name = "only-0.0.2.tgz";
+        sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."only" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "only" ];
+  };
   by-spec."open"."0.0.2" =
     self.by-version."open"."0.0.2";
   by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -13300,25 +16042,6 @@
     ];
     passthru.names = [ "open" ];
   };
-  by-spec."open"."0.0.4" =
-    self.by-version."open"."0.0.4";
-  by-version."open"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-open-0.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz";
-        name = "open-0.0.4.tgz";
-        sha1 = "5de46a0858b9f49f9f211aa8f26628550657f262";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."open" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "open" ];
-  };
   by-spec."open"."~0.0.3" =
     self.by-version."open"."0.0.5";
   by-version."open"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -13340,6 +16063,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 +16085,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 +16103,27 @@
     ];
     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."opn"."~0.1.1" =
+    self.by-version."opn"."0.1.2";
   by-spec."optimist"."*" =
     self.by-version."optimist"."0.6.1";
   by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage {
@@ -13393,7 +16139,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 = [
     ];
@@ -13455,7 +16201,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 = [
     ];
@@ -13490,25 +16236,6 @@
     ];
     passthru.names = [ "options" ];
   };
-  by-spec."optjs"."*" =
-    self.by-version."optjs"."3.2.1-boom";
-  by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage {
-    name = "node-optjs-3.2.1-boom";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
-        name = "optjs-3.2.1-boom.tgz";
-        sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optjs" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "optjs" ];
-  };
   by-spec."optparse"."*" =
     self.by-version."optparse"."1.0.5";
   by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -13531,6 +16258,25 @@
   "optparse" = self.by-version."optparse"."1.0.5";
   by-spec."optparse".">= 1.0.3" =
     self.by-version."optparse"."1.0.5";
+  by-spec."ordered-read-streams"."^0.0.7" =
+    self.by-version."ordered-read-streams"."0.0.7";
+  by-version."ordered-read-streams"."0.0.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ordered-read-streams-0.0.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.7.tgz";
+        name = "ordered-read-streams-0.0.7.tgz";
+        sha1 = "64fb9a2e15c6513a5508389bd6df6829fad91ce9";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ordered-read-streams" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ordered-read-streams" ];
+  };
   by-spec."os-browserify"."~0.1.1" =
     self.by-version."os-browserify"."0.1.2";
   by-version."os-browserify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -13551,6 +16297,25 @@
     passthru.names = [ "os-browserify" ];
   };
   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,10 +16334,10 @@
     ];
     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."osenv"."^0.1.0" =
+    self.by-version."osenv"."0.1.0";
+  by-spec."osenv"."~0.1.0" =
+    self.by-version."osenv"."0.1.0";
   by-spec."owl-deepcopy"."*" =
     self.by-version."owl-deepcopy"."0.0.4";
   by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -13615,15 +16380,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 +16644,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-12";
+  by-version."phantomjs"."1.9.7-12" = lib.makeOverridable self.buildNodePackage {
+    name = "phantomjs-1.9.7-12";
     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-12.tgz";
+        name = "phantomjs-1.9.7-12.tgz";
+        sha1 = "b6d1f76b5a81689ff8acbce01468d04b103b860c";
       })
     ];
     buildInputs =
@@ -13878,16 +16662,21 @@
       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."progress"."1.1.7"
+      self.by-version."request"."2.36.0"
+      self.by-version."request-progress"."0.3.1"
+      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-12";
+  by-spec."phantomjs"."~1.9.1" =
+    self.by-version."phantomjs"."1.9.7-12";
+  by-spec."phantomjs"."~1.9.7" =
+    self.by-version."phantomjs"."1.9.7-12";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -13931,26 +16720,26 @@
   by-spec."pkginfo"."0.x.x" =
     self.by-version."pkginfo"."0.3.0";
   by-spec."plist-native"."*" =
-    self.by-version."plist-native"."0.2.3";
-  by-version."plist-native"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-plist-native-0.2.3";
+    self.by-version."plist-native"."0.3.1";
+  by-version."plist-native"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-plist-native-0.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.3.tgz";
-        name = "plist-native-0.2.3.tgz";
-        sha1 = "76843a2da80d587b75dcbcc1634c6f3968a2af17";
+        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz";
+        name = "plist-native-0.3.1.tgz";
+        sha1 = "c9cd71ae2ac6aa16c315dde213c65d6cc53dee1a";
       })
     ];
     buildInputs =
       (self.nativeDeps."plist-native" or []);
     deps = [
-      self.by-version."libxmljs"."0.8.1"
+      self.by-version."libxmljs"."0.10.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "plist-native" ];
   };
-  "plist-native" = self.by-version."plist-native"."0.2.3";
+  "plist-native" = self.by-version."plist-native"."0.3.1";
   by-spec."policyfile"."0.0.4" =
     self.by-version."policyfile"."0.0.4";
   by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -14010,14 +16799,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 +16817,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 {
@@ -14066,6 +16874,25 @@
     ];
     passthru.names = [ "process" ];
   };
+  by-spec."progress"."^1.1.5" =
+    self.by-version."progress"."1.1.7";
+  by-version."progress"."1.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-progress-1.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/progress/-/progress-1.1.7.tgz";
+        name = "progress-1.1.7.tgz";
+        sha1 = "0c739597be1cceb68e9a66d4a70fd92705aa975b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."progress" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "progress" ];
+  };
   by-spec."promise"."~2.0" =
     self.by-version."promise"."2.0.0";
   by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -14080,7 +16907,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 +16929,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 +16958,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 =
@@ -14150,15 +16977,34 @@
     ];
     passthru.names = [ "promzard" ];
   };
-  by-spec."proto-list"."~1.2.1" =
-    self.by-version."proto-list"."1.2.2";
-  by-version."proto-list"."1.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-proto-list-1.2.2";
+  by-spec."propprop"."^0.3.0" =
+    self.by-version."propprop"."0.3.0";
+  by-version."propprop"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-propprop-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz";
-        name = "proto-list-1.2.2.tgz";
-        sha1 = "48b88798261ec2c4a785720cdfec6200d57d3326";
+        url = "http://registry.npmjs.org/propprop/-/propprop-0.3.0.tgz";
+        name = "propprop-0.3.0.tgz";
+        sha1 = "78e396cc1e652685ae2bf452a6690644786dd258";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."propprop" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "propprop" ];
+  };
+  by-spec."proto-list"."~1.2.1" =
+    self.by-version."proto-list"."1.2.3";
+  by-version."proto-list"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-proto-list-1.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz";
+        name = "proto-list-1.2.3.tgz";
+        sha1 = "6235554a1bca1f0d15e3ca12ca7329d5def42bd9";
       })
     ];
     buildInputs =
@@ -14169,26 +17015,25 @@
     ];
     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";
+  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 = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz";
-        name = "protobufjs-2.0.5.tgz";
-        sha1 = "7f351178c959b333d2327b773325ca4b2627a242";
+      (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."protobufjs" or []);
+      (self.nativeDeps."proxy-addr" or []);
     deps = [
-      self.by-version."bytebuffer"."2.3.1"
-      self.by-version."ascli"."0.3.0"
+      self.by-version."ipaddr.js"."0.1.2"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "protobufjs" ];
+    passthru.names = [ "proxy-addr" ];
   };
   by-spec."ps-tree"."0.0.x" =
     self.by-version."ps-tree"."0.0.3";
@@ -14210,6 +17055,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 {
@@ -14230,16 +17077,14 @@
     passthru.names = [ "punycode" ];
   };
   by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.2.4";
-  by-spec."punycode".">=1.0.0 <1.1.0" =
-    self.by-version."punycode"."1.0.0";
-  by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-punycode-1.0.0";
+    self.by-version."punycode"."1.3.0";
+  by-version."punycode"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-punycode-1.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz";
-        name = "punycode-1.0.0.tgz";
-        sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3";
+        url = "http://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz";
+        name = "punycode-1.3.0.tgz";
+        sha1 = "7f5009ef539b9444be5c7a19abd2c3ca49e1731c";
       })
     ];
     buildInputs =
@@ -14252,6 +17097,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 +17120,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,36 +17325,15 @@
     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 {
-    name = "node-querystring-0.1.0";
+  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/querystring/-/querystring-0.1.0.tgz";
-        name = "querystring-0.1.0.tgz";
-        sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."querystring" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "querystring" ];
-  };
-  by-spec."querystring-es3"."0.2.0" =
-    self.by-version."querystring-es3"."0.2.0";
-  by-version."querystring-es3"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-querystring-es3-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.0.tgz";
-        name = "querystring-es3-0.2.0.tgz";
-        sha1 = "c365a08a69c443accfeb3a9deab35e3f0abaa476";
+        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 =
@@ -14518,15 +17344,15 @@
     ];
     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."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.9.tgz";
-        name = "rai-0.1.9.tgz";
-        sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc";
+        url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz";
+        name = "rai-0.1.11.tgz";
+        sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228";
       })
     ];
     buildInputs =
@@ -14577,24 +17403,27 @@
   };
   by-spec."range-parser"."~1.0.0" =
     self.by-version."range-parser"."1.0.0";
-  by-spec."raven"."~0.6.3" =
-    self.by-version."raven"."0.6.3";
-  by-version."raven"."0.6.3" = lib.makeOverridable self.buildNodePackage {
-    name = "raven-0.6.3";
+  by-spec."raven"."~0.7.0" =
+    self.by-version."raven"."0.7.0";
+  by-version."raven"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "raven-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raven/-/raven-0.6.3.tgz";
-        name = "raven-0.6.3.tgz";
-        sha1 = "3e7c72d45e0dff93ecc54978661331755c637320";
+        url = "http://registry.npmjs.org/raven/-/raven-0.7.0.tgz";
+        name = "raven-0.7.0.tgz";
+        sha1 = "ec7fea6c0b87c59b252a9491c93d5bcf8d0c7ba0";
       })
     ];
     buildInputs =
       (self.nativeDeps."raven" or []);
     deps = [
+      self.by-version."cookie"."0.1.0"
+      self.by-version."lsmod"."0.0.3"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."stack-trace"."0.0.7"
-      self.by-version."lsmod"."0.0.3"
-      self.by-version."cookie"."0.1.0"
+      self.by-version."connect"."3.0.1"
+      self.by-version."express"."4.4.5"
+      self.by-version."koa"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -14639,41 +17468,22 @@
     ];
     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.2.2" =
+    self.by-version."raw-body"."1.2.2";
+  by-version."raw-body"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-raw-body-1.2.2";
     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.2.2.tgz";
+        name = "raw-body-1.2.2.tgz";
+        sha1 = "0c68e1ee28cfed7dba4822234aec6078461cbc1f";
       })
     ];
     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"
+      self.by-version."iconv-lite"."0.4.3"
     ];
     peerDependencies = [
     ];
@@ -14732,16 +17542,37 @@
     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.4.0" =
+    self.by-version."rc"."0.4.0";
+  by-version."rc"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "rc-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
+        name = "rc-0.4.0.tgz";
+        sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rc" or []);
+    deps = [
+      self.by-version."minimist"."0.0.10"
+      self.by-version."deep-extend"."0.2.10"
+      self.by-version."strip-json-comments"."0.1.3"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rc" ];
   };
-  by-spec."rc"."~0.3.4" =
-    self.by-version."rc"."0.3.5";
   by-spec."react"."*" =
     self.by-version."react"."0.10.0";
   by-version."react"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -14789,55 +17620,78 @@
     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.5" =
+    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.3"
+      self.by-version."semver"."2.3.1"
       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.2"
     ];
     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.3";
+  by-version."read-package-json"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-read-package-json-1.2.3";
     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.3.tgz";
+        name = "read-package-json-1.2.3.tgz";
+        sha1 = "12efad3cce1ff64bed9da951e9f4ed3d1b1d185e";
       })
     ];
     buildInputs =
       (self.nativeDeps."read-package-json" or []);
     deps = [
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."4.0.3"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."normalize-package-data"."0.2.12"
-      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."normalize-package-data"."0.4.1"
+      self.by-version."graceful-fs"."3.0.2"
     ];
     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."read-package-json"."~1.2.3" =
+    self.by-version."read-package-json"."1.2.3";
+  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 +17715,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 +17749,7 @@
     buildInputs =
       (self.nativeDeps."readdirp" or []);
     deps = [
-      self.by-version."minimatch"."0.2.14"
+      self.by-version."minimatch"."0.3.0"
     ];
     peerDependencies = [
     ];
@@ -14976,14 +17817,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 +17835,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 +17852,7 @@
     buildInputs =
       (self.nativeDeps."redis" or []);
     deps = [
-      self.by-version."hiredis"."0.1.16"
+      self.by-version."hiredis"."0.1.17"
     ];
     peerDependencies = [
     ];
@@ -15034,27 +17877,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 {
@@ -15136,15 +17960,15 @@
     ];
     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";
+  by-spec."request"."*" =
+    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 +17976,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.4"
+      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"
@@ -15167,10 +17991,12 @@
     ];
     passthru.names = [ "request" ];
   };
+  by-spec."request"."2" =
+    self.by-version."request"."2.36.0";
   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 +18057,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 +18078,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 +18109,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.4"
     ];
     peerDependencies = [
     ];
@@ -15307,7 +18135,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.4"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
@@ -15338,7 +18166,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.4"
       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,7 +18177,40 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request-progress"."~0.3.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.34.0.tgz";
+        name = "request-2.34.0.tgz";
+        sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."request" or []);
+    deps = [
+      self.by-version."qs"."0.6.6"
+      self.by-version."json-stringify-safe"."5.0.0"
+      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.4"
+      self.by-version."tunnel-agent"."0.3.0"
+      self.by-version."http-signature"."0.10.0"
+      self.by-version."oauth-sign"."0.3.0"
+      self.by-version."hawk"."1.0.0"
+      self.by-version."aws-sign2"."0.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "request" ];
+  };
+  by-spec."request"."~2.36.0" =
+    self.by-version."request"."2.36.0";
+  by-spec."request-progress"."^0.3.1" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-request-progress-0.3.1";
@@ -15369,6 +18230,8 @@
     ];
     passthru.names = [ "request-progress" ];
   };
+  by-spec."request-progress"."~0.3.0" =
+    self.by-version."request-progress"."0.3.1";
   by-spec."request-replay"."~0.2.0" =
     self.by-version."request-replay"."0.2.0";
   by-version."request-replay"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -15383,21 +18246,21 @@
     buildInputs =
       (self.nativeDeps."request-replay" or []);
     deps = [
-      self.by-version."retry"."0.6.0"
+      self.by-version."retry"."0.6.1"
     ];
     peerDependencies = [
     ];
     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 +18272,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 {
@@ -15429,8 +18292,27 @@
     ];
     passthru.names = [ "resolve" ];
   };
-  by-spec."resolve"."0.6.x" =
-    self.by-version."resolve"."0.6.3";
+  by-spec."resolve"."0.7.1" =
+    self.by-version."resolve"."0.7.1";
+  by-version."resolve"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-resolve-0.7.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/resolve/-/resolve-0.7.1.tgz";
+        name = "resolve-0.7.1.tgz";
+        sha1 = "74c73ad05bb62da19391a79c3de63b5cf7aeba51";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."resolve" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "resolve" ];
+  };
+  by-spec."resolve"."0.7.x" =
+    self.by-version."resolve"."0.7.1";
   by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -15452,24 +18334,25 @@
   };
   by-spec."resolve"."~0.3.1" =
     self.by-version."resolve"."0.3.1";
-  by-spec."resolve"."~0.6.0" =
+  by-spec."resolve"."~0.6.3" =
     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.7.1" =
+    self.by-version."resolve"."0.7.1";
+  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 +18395,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.13.0-2";
+  by-version."rethinkdb"."1.13.0-2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rethinkdb-1.13.0-2";
     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.13.0-2.tgz";
+        name = "rethinkdb-1.13.0-2.tgz";
+        sha1 = "cde28ef912beba82aab695d95153de4b1f5019ca";
       })
     ];
     buildInputs =
       (self.nativeDeps."rethinkdb" or []);
     deps = [
-      self.by-version."protobufjs"."2.0.5"
+      self.by-version."bluebird"."2.1.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rethinkdb" ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.12.0-0";
+  "rethinkdb" = self.by-version."rethinkdb"."1.13.0-2";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -15552,16 +18435,33 @@
     passthru.names = [ "retry" ];
   };
   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."retry"."0.6.1";
+  by-version."retry"."0.6.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-retry-0.6.1";
     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/retry/-/retry-0.6.1.tgz";
+        name = "retry-0.6.1.tgz";
+        sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."retry" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "retry" ];
+  };
+  by-spec."revalidator"."0.1.x" =
+    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.8.tgz";
+        name = "revalidator-0.1.8.tgz";
+        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
       })
     ];
     buildInputs =
@@ -15615,14 +18515,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 +18534,15 @@
     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.2.8" =
+    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 +18584,53 @@
     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."ripemd160"."0.2.0" =
+    self.by-version."ripemd160"."0.2.0";
+  by-version."ripemd160"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ripemd160-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
+        name = "ripemd160-0.2.0.tgz";
+        sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ripemd160" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ripemd160" ];
+  };
+  by-spec."rndm"."1" =
+    self.by-version."rndm"."1.0.0";
+  by-version."rndm"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-rndm-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/rndm/-/rndm-1.0.0.tgz";
+        name = "rndm-1.0.0.tgz";
+        sha1 = "dcb6eb485b9b416d15e097f39c31458e4cfda2da";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."rndm" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "rndm" ];
+  };
   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 +18716,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 = [
     ];
@@ -15797,6 +18741,25 @@
     ];
     passthru.names = [ "saucelabs" ];
   };
+  by-spec."sax"."0.4.2" =
+    self.by-version."sax"."0.4.2";
+  by-version."sax"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sax-0.4.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
+        name = "sax-0.4.2.tgz";
+        sha1 = "39f3b601733d6bec97105b242a2a40fd6978ac3c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sax" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sax" ];
+  };
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.8";
   by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage {
@@ -15816,7 +18779,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 +18798,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 +18820,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.1";
+  by-version."selenium-webdriver"."2.42.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-selenium-webdriver-2.42.1";
     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.1.tgz";
+        name = "selenium-webdriver-2.42.1.tgz";
+        sha1 = "61984d1583b89c80a9f3bf31623d00bcc82a8d0e";
       })
     ];
     buildInputs =
@@ -15873,16 +18838,16 @@
     ];
     passthru.names = [ "selenium-webdriver" ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.41.0";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.42.1";
   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.1";
+  by-version."semver"."2.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.3.1";
     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.1.tgz";
+        name = "semver-2.3.1.tgz";
+        sha1 = "6f65ee7d1aed753cdf9dda70e5631a3fb42a5bee";
       })
     ];
     buildInputs =
@@ -15893,7 +18858,7 @@
     ];
     passthru.names = [ "semver" ];
   };
-  "semver" = self.by-version."semver"."2.2.1";
+  "semver" = self.by-version."semver"."2.3.1";
   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 +18898,17 @@
     passthru.names = [ "semver" ];
   };
   by-spec."semver"."2" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.1";
+  by-spec."semver"."2 >=2.2.1" =
+    self.by-version."semver"."2.3.1";
   by-spec."semver"."2.x" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.1";
   by-spec."semver".">=2.0.10 <3.0.0" =
-    self.by-version."semver"."2.2.1";
+    self.by-version."semver"."2.3.1";
   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.1";
+  by-spec."semver"."^2.3.0" =
+    self.by-version."semver"."2.3.1";
   by-spec."semver"."~1.1.0" =
     self.by-version."semver"."1.1.4";
   by-spec."semver"."~1.1.4" =
@@ -15986,23 +18953,47 @@
   };
   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.1";
+  by-spec."semver"."~2.3.1" =
+    self.by-version."semver"."2.3.1";
+  by-spec."send"."*" =
+    self.by-version."send"."0.5.0";
+  by-version."send"."0.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.5.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.5.0.tgz";
+        name = "send-0.5.0.tgz";
+        sha1 = "fc0f7e2f92e29aebfd8a1b2deb4a394e7a531a68";
       })
     ];
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
-      self.by-version."mime"."1.2.11"
+      self.by-version."debug"."1.0.2"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."finished"."1.2.2"
       self.by-version."fresh"."0.2.2"
+      self.by-version."mime"."1.2.11"
+      self.by-version."ms"."0.6.2"
       self.by-version."range-parser"."1.0.0"
     ];
     peerDependencies = [
@@ -16023,7 +19014,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.2"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -16046,7 +19037,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.2"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -16069,7 +19060,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."1.0.2"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.0"
       self.by-version."range-parser"."0.0.4"
@@ -16080,6 +19071,54 @@
   };
   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.2"
+      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.4.3" =
+    self.by-version."send"."0.4.3";
+  by-version."send"."0.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-send-0.4.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/send/-/send-0.4.3.tgz";
+        name = "send-0.4.3.tgz";
+        sha1 = "9627b23b7707fbf6373831cac5793330b594b640";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."send" or []);
+    deps = [
+      self.by-version."debug"."1.0.2"
+      self.by-version."escape-html"."1.0.1"
+      self.by-version."finished"."1.2.2"
+      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.5.0" =
+    self.by-version."send"."0.5.0";
   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 +19140,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.3" =
+    self.by-version."serve-index"."1.1.4";
+  by-version."serve-index"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-index-1.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.1.4.tgz";
+        name = "serve-index-1.1.4.tgz";
+        sha1 = "5aee90b78c0f6543af0df69f85c8443317fdd898";
       })
     ];
     buildInputs =
       (self.nativeDeps."serve-index" or []);
     deps = [
-      self.by-version."batch"."0.5.0"
-      self.by-version."negotiator"."0.4.2"
+      self.by-version."accepts"."1.0.6"
+      self.by-version."batch"."0.5.1"
     ];
     peerDependencies = [
     ];
@@ -16142,58 +19201,59 @@
     ];
     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.2.3" =
+    self.by-version."serve-static"."1.2.3";
+  by-version."serve-static"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.2.3";
     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.2.3.tgz";
+        name = "serve-static-1.2.3.tgz";
+        sha1 = "93cecbc340f079ecb8589281d1dc31c26c0cd158";
       })
     ];
     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.2.0"
+      self.by-version."send"."0.4.3"
     ];
     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.3.0" =
+    self.by-version."serve-static"."1.3.0";
+  by-version."serve-static"."1.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.3.0";
     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.3.0.tgz";
+        name = "serve-static-1.3.0.tgz";
+        sha1 = "0aba0b27c1b8264eee1a3f9c615886738d9727cb";
+      })
+    ];
+    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.5.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "serve-static" ];
+  };
+  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,26 +19265,46 @@
     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.2"
       self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "sha" ];
   };
+  by-spec."sha.js"."2.1.3" =
+    self.by-version."sha.js"."2.1.3";
+  by-version."sha.js"."2.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "sha.js-2.1.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sha.js/-/sha.js-2.1.3.tgz";
+        name = "sha.js-2.1.3.tgz";
+        sha1 = "cf55f22929f57a9cd1c27a8355ba09ac4d8ab0ce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sha.js" or []);
+    deps = [
+      self.by-version."native-buffer-browserify"."2.0.17"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sha.js" ];
+  };
   by-spec."shallow-copy"."0.0.1" =
     self.by-version."shallow-copy"."0.0.1";
   by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -16287,6 +19367,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 +19409,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.4";
+  by-version."should"."4.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-should-4.0.4";
     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.4.tgz";
+        name = "should-4.0.4.tgz";
+        sha1 = "8efaa304f1f148cf3d2e955862990f9ab9ea628f";
       })
     ];
     buildInputs =
@@ -16346,7 +19428,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.3.1";
+  "should" = self.by-version."should"."4.0.4";
   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 +19491,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 +19512,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 +19532,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 +19748,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 +19771,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 +19819,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 {
@@ -16778,14 +19860,14 @@
     passthru.names = [ "sorted-object" ];
   };
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.1.33";
-  by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage {
-    name = "node-source-map-0.1.33";
+    self.by-version."source-map"."0.1.34";
+  by-version."source-map"."0.1.34" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.34";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.33.tgz";
-        name = "source-map-0.1.33.tgz";
-        sha1 = "c659297a73af18c073b0aa2e7cc91e316b5c570c";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
+        name = "source-map-0.1.34.tgz";
+        sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
       })
     ];
     buildInputs =
@@ -16797,7 +19879,7 @@
     ];
     passthru.names = [ "source-map" ];
   };
-  "source-map" = self.by-version."source-map"."0.1.33";
+  "source-map" = self.by-version."source-map"."0.1.34";
   by-spec."source-map"."0.1.11" =
     self.by-version."source-map"."0.1.11";
   by-version."source-map"."0.1.11" = lib.makeOverridable self.buildNodePackage {
@@ -16839,19 +19921,19 @@
     passthru.names = [ "source-map" ];
   };
   by-spec."source-map"."0.1.x" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.34";
   by-spec."source-map".">= 0.1.2" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.34";
   by-spec."source-map"."~ 0.1.8" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.34";
   by-spec."source-map"."~0.1.30" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.34";
   by-spec."source-map"."~0.1.31" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.34";
   by-spec."source-map"."~0.1.33" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.34";
   by-spec."source-map"."~0.1.7" =
-    self.by-version."source-map"."0.1.33";
+    self.by-version."source-map"."0.1.34";
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
   by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -16952,14 +20034,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 +20052,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,22 +20096,41 @@
     passthru.names = [ "statsd-librato-backend" ];
   };
   "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2";
-  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 {
-    name = "node-stream-browserify-0.1.3";
+  by-spec."statuses"."~1.0.1" =
+    self.by-version."statuses"."1.0.3";
+  by-version."statuses"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-statuses-1.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz";
-        name = "stream-browserify-0.1.3.tgz";
-        sha1 = "95cf1b369772e27adaf46352265152689c6c4be9";
+        url = "http://registry.npmjs.org/statuses/-/statuses-1.0.3.tgz";
+        name = "statuses-1.0.3.tgz";
+        sha1 = "a7d9bfb30bce92281bdba717ceb9db10d8640afb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."statuses" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "statuses" ];
+  };
+  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."process"."0.5.2"
+      self.by-version."readable-stream"."1.1.13-1"
     ];
     peerDependencies = [
     ];
@@ -17095,21 +20158,41 @@
   };
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
-  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 {
-    name = "node-stream-counter-0.1.0";
+  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-counter/-/stream-counter-0.1.0.tgz";
-        name = "stream-counter-0.1.0.tgz";
-        sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b";
+        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"."^1.0.0" =
+    self.by-version."stream-counter"."1.0.0";
+  by-version."stream-counter"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stream-counter-1.0.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
+        name = "stream-counter-1.0.0.tgz";
+        sha1 = "91cf2569ce4dc5061febcd7acb26394a5a114751";
       })
     ];
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -17175,6 +20258,26 @@
     ];
     passthru.names = [ "string" ];
   };
+  by-spec."string-length"."^0.1.2" =
+    self.by-version."string-length"."0.1.2";
+  by-version."string-length"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-string-length-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz";
+        name = "string-length-0.1.2.tgz";
+        sha1 = "ab04bb33867ee74beed7fb89bb7f089d392780f2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."string-length" or []);
+    deps = [
+      self.by-version."strip-ansi"."0.2.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "string-length" ];
+  };
   by-spec."string_decoder"."~0.0.0" =
     self.by-version."string_decoder"."0.0.1";
   by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -17233,14 +20336,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 =
@@ -17251,6 +20354,26 @@
     ];
     passthru.names = [ "stringify-object" ];
   };
+  by-spec."strip-ansi"."^0.2.1" =
+    self.by-version."strip-ansi"."0.2.2";
+  by-version."strip-ansi"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "strip-ansi-0.2.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz";
+        name = "strip-ansi-0.2.2.tgz";
+        sha1 = "854d290c981525fc8c397a910b025ae2d54ffc08";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."strip-ansi" or []);
+    deps = [
+      self.by-version."ansi-regex"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "strip-ansi" ];
+  };
   by-spec."strip-ansi"."~0.1.0" =
     self.by-version."strip-ansi"."0.1.1";
   by-version."strip-ansi"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -17270,15 +20393,36 @@
     ];
     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";
+  by-spec."strip-bom"."^0.3.0" =
+    self.by-version."strip-bom"."0.3.1";
+  by-version."strip-bom"."0.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "strip-bom-0.3.1";
     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-bom/-/strip-bom-0.3.1.tgz";
+        name = "strip-bom-0.3.1.tgz";
+        sha1 = "9e8a39eff456ff9abc2f059f5f2225bb0f3f7ca5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."strip-bom" or []);
+    deps = [
+      self.by-version."first-chunk-stream"."0.1.0"
+      self.by-version."is-utf8"."0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "strip-bom" ];
+  };
+  by-spec."strip-json-comments"."0.1.x" =
+    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.3.tgz";
+        name = "strip-json-comments-0.1.3.tgz";
+        sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54";
       })
     ];
     buildInputs =
@@ -17310,14 +20454,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.47.1";
+  by-version."stylus"."0.47.1" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.47.1";
     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.47.1.tgz";
+        name = "stylus-0.47.1.tgz";
+        sha1 = "2822873555f8dcf920a4cad5b9e2813c4de68f6a";
       })
     ];
     buildInputs =
@@ -17325,16 +20469,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.2"
       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.47.1";
   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 +20494,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.2"
       self.by-version."sax"."0.5.8"
-      self.by-version."glob"."3.2.9"
+      self.by-version."glob"."3.2.11"
     ];
     peerDependencies = [
     ];
@@ -17373,12 +20516,33 @@
     buildInputs =
       (self.nativeDeps."subarg" or []);
     deps = [
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.0.10"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "subarg" ];
   };
+  by-spec."sudo-block"."^0.4.0" =
+    self.by-version."sudo-block"."0.4.0";
+  by-version."sudo-block"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sudo-block-0.4.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.4.0.tgz";
+        name = "sudo-block-0.4.0.tgz";
+        sha1 = "38b15f09a2ee0a4b0678a0d6236df96225eda56e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sudo-block" or []);
+    deps = [
+      self.by-version."chalk"."0.4.0"
+      self.by-version."is-root"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sudo-block" ];
+  };
   by-spec."sudo-block"."~0.2.0" =
     self.by-version."sudo-block"."0.2.1";
   by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -17399,49 +20563,31 @@
     ];
     passthru.names = [ "sudo-block" ];
   };
-  by-spec."sudo-block"."~0.3.0" =
-    self.by-version."sudo-block"."0.3.0";
-  by-version."sudo-block"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sudo-block-0.3.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/sudo-block/-/sudo-block-0.3.0.tgz";
-        name = "sudo-block-0.3.0.tgz";
-        sha1 = "aec27fbde8763ee32e3e47b8ba3c70584da7eb9c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sudo-block" or []);
-    deps = [
-      self.by-version."chalk"."0.3.0"
-    ];
-    peerDependencies = [
-    ];
-    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";
-    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 +20618,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 {
@@ -17581,30 +20727,30 @@
     passthru.names = [ "tape" ];
   };
   by-spec."tar"."*" =
-    self.by-version."tar"."0.1.19";
-  by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage {
-    name = "node-tar-0.1.19";
+    self.by-version."tar"."0.1.20";
+  by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tar-0.1.20";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz";
-        name = "tar-0.1.19.tgz";
-        sha1 = "fe45941799e660ce1ea52d875d37481b4bf13eac";
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
+        name = "tar-0.1.20.tgz";
+        sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
       })
     ];
     buildInputs =
       (self.nativeDeps."tar" or []);
     deps = [
-      self.by-version."inherits"."2.0.1"
       self.by-version."block-stream"."0.0.7"
-      self.by-version."fstream"."0.1.25"
+      self.by-version."fstream"."0.1.28"
+      self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "tar" ];
   };
-  "tar" = self.by-version."tar"."0.1.19";
+  "tar" = self.by-version."tar"."0.1.20";
   by-spec."tar"."0" =
-    self.by-version."tar"."0.1.19";
+    self.by-version."tar"."0.1.20";
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
   by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -17621,39 +20767,62 @@
     deps = [
       self.by-version."inherits"."1.0.0"
       self.by-version."block-stream"."0.0.7"
-      self.by-version."fstream"."0.1.25"
+      self.by-version."fstream"."0.1.28"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "tar" ];
   };
   by-spec."tar"."^0.1.18" =
-    self.by-version."tar"."0.1.19";
+    self.by-version."tar"."0.1.20";
   by-spec."tar"."~0.1.17" =
-    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";
+    self.by-version."tar"."0.1.20";
+  by-spec."tar"."~0.1.20" =
+    self.by-version."tar"."0.1.20";
+  by-spec."tar-stream"."~0.4.0" =
+    self.by-version."tar-stream"."0.4.4";
+  by-version."tar-stream"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tar-stream-0.4.4";
     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.4.4.tgz";
+        name = "tar-stream-0.4.4.tgz";
+        sha1 = "55733222ca3e1ebf58f2805b5b666596e1f8d5f3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."tar-stream" or []);
+    deps = [
+      self.by-version."bl"."0.8.2"
+      self.by-version."end-of-stream"."0.1.5"
+      self.by-version."readable-stream"."1.0.27-1"
+      self.by-version."xtend"."3.0.0"
+    ];
+    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 {
@@ -17697,8 +20866,8 @@
   };
   by-spec."temp"."~0.6.0" =
     self.by-version."temp"."0.6.0";
-  by-spec."temp"."~0.7.0" =
-    self.by-version."temp"."0.7.0";
+  by-spec."temp"."~0.8.0" =
+    self.by-version."temp"."0.8.0";
   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 +20888,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 +20907,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 +20969,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 =
@@ -17818,17 +20989,38 @@
     ];
     passthru.names = [ "through2" ];
   };
-  by-spec."through2"."~0.4.1" =
-    self.by-version."through2"."0.4.1";
-  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 {
-    name = "node-timers-browserify-1.0.1";
+  by-spec."through2"."^0.5.1" =
+    self.by-version."through2"."0.5.1";
+  by-version."through2"."0.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through2-0.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.1.tgz";
-        name = "timers-browserify-1.0.1.tgz";
-        sha1 = "7c93257b543cb1e3003d3663b57d560ee1d27057";
+        url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
+        name = "through2-0.5.1.tgz";
+        sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."through2" or []);
+    deps = [
+      self.by-version."readable-stream"."1.0.27-1"
+      self.by-version."xtend"."3.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "through2" ];
+  };
+  by-spec."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.3";
+  by-version."timers-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timers-browserify-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz";
+        name = "timers-browserify-1.0.3.tgz";
+        sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551";
       })
     ];
     buildInputs =
@@ -17840,6 +21032,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 +21073,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.33";
+  by-version."timezone"."0.0.33" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timezone-0.0.33";
     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.33.tgz";
+        name = "timezone-0.0.33.tgz";
+        sha1 = "b9ef1fae5eea241d32a022fbb8b6343afd3d2f40";
       })
     ];
     buildInputs =
@@ -17878,7 +21091,7 @@
     ];
     passthru.names = [ "timezone" ];
   };
-  "timezone" = self.by-version."timezone"."0.0.30";
+  "timezone" = self.by-version."timezone"."0.0.33";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -17952,6 +21165,8 @@
     ];
     passthru.names = [ "tmp" ];
   };
+  by-spec."tmp"."~0.0.23" =
+    self.by-version."tmp"."0.0.23";
   by-spec."touch"."0.0.2" =
     self.by-version."touch"."0.0.2";
   by-version."touch"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -17986,7 +21201,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.2.4"
+      self.by-version."punycode"."1.3.0"
     ];
     peerDependencies = [
     ];
@@ -18006,7 +21221,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.2.4"
+      self.by-version."punycode"."1.3.0"
     ];
     peerDependencies = [
     ];
@@ -18053,6 +21268,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 +21363,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,26 +21421,70 @@
     ];
     passthru.names = [ "type-is" ];
   };
-  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";
+  by-spec."type-is"."1.2.1" =
+    self.by-version."type-is"."1.2.1";
+  by-version."type-is"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/type-is/-/type-is-1.1.0.tgz";
-        name = "type-is-1.1.0.tgz";
-        sha1 = "d0245ec8b2676668d59dd0cf3255060676a57db6";
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.2.1.tgz";
+        name = "type-is-1.2.1.tgz";
+        sha1 = "73d448080a4f1dd18acb1eefff62968c5b5d54a2";
       })
     ];
     buildInputs =
       (self.nativeDeps."type-is" or []);
     deps = [
-      self.by-version."mime"."1.2.11"
+      self.by-version."mime-types"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "type-is" ];
   };
+  by-spec."type-is"."1.3.1" =
+    self.by-version."type-is"."1.3.1";
+  by-version."type-is"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.3.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.3.1.tgz";
+        name = "type-is-1.3.1.tgz";
+        sha1 = "a6789b5a52138289ade1ef8f6d9f2874ffd70b6b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."type-is" or []);
+    deps = [
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."mime-types"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "type-is" ];
+  };
+  by-spec."type-is"."~1.3.1" =
+    self.by-version."type-is"."1.3.2";
+  by-version."type-is"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
+        name = "type-is-1.3.2.tgz";
+        sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."type-is" or []);
+    deps = [
+      self.by-version."media-typer"."0.2.0"
+      self.by-version."mime-types"."1.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "type-is" ];
+  };
+  by-spec."type-is"."~1.3.2" =
+    self.by-version."type-is"."1.3.2";
   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 +21505,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 =
@@ -18247,21 +21544,21 @@
   };
   "typescript" = self.by-version."typescript"."1.0.1";
   by-spec."uglify-js"."*" =
-    self.by-version."uglify-js"."2.4.13";
-  by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.13";
+    self.by-version."uglify-js"."2.4.14";
+  by-version."uglify-js"."2.4.14" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz";
-        name = "uglify-js-2.4.13.tgz";
-        sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz";
+        name = "uglify-js-2.4.14.tgz";
+        sha1 = "2ae753ede3bb4ebbf25d07bb99cf13e9de007b3e";
       })
     ];
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -18269,7 +21566,7 @@
     ];
     passthru.names = [ "uglify-js" ];
   };
-  "uglify-js" = self.by-version."uglify-js"."2.4.13";
+  "uglify-js" = self.by-version."uglify-js"."2.4.14";
   by-spec."uglify-js"."1.2.5" =
     self.by-version."uglify-js"."1.2.5";
   by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -18304,7 +21601,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -18313,7 +21610,7 @@
     passthru.names = [ "uglify-js" ];
   };
   by-spec."uglify-js"."^2.4.0" =
-    self.by-version."uglify-js"."2.4.13";
+    self.by-version."uglify-js"."2.4.14";
   by-spec."uglify-js"."~2.2" =
     self.by-version."uglify-js"."2.2.5";
   by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -18328,7 +21625,7 @@
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -18352,7 +21649,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.33"
+      self.by-version."source-map"."0.1.34"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -18362,9 +21659,9 @@
   by-spec."uglify-js"."~2.3.6" =
     self.by-version."uglify-js"."2.3.6";
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.13";
+    self.by-version."uglify-js"."2.4.14";
   by-spec."uglify-js"."~2.4.12" =
-    self.by-version."uglify-js"."2.4.13";
+    self.by-version."uglify-js"."2.4.14";
   by-spec."uglify-to-browserify"."~1.0.0" =
     self.by-version."uglify-to-browserify"."1.0.2";
   by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -18403,6 +21700,29 @@
     ];
     passthru.names = [ "uid-number" ];
   };
+  by-spec."uid-safe"."1" =
+    self.by-version."uid-safe"."1.0.1";
+  by-version."uid-safe"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-uid-safe-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
+        name = "uid-safe-1.0.1.tgz";
+        sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uid-safe" or []);
+    deps = [
+      self.by-version."mz"."1.0.0"
+      self.by-version."base64-url"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uid-safe" ];
+  };
+  by-spec."uid-safe"."1.0.1" =
+    self.by-version."uid-safe"."1.0.1";
   by-spec."uid2"."0.0.3" =
     self.by-version."uid2"."0.0.3";
   by-version."uid2"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -18422,17 +21742,15 @@
     ];
     passthru.names = [ "uid2" ];
   };
-  by-spec."uid2"."~0.0.2" =
-    self.by-version."uid2"."0.0.3";
-  by-spec."umd"."~2.0.0" =
-    self.by-version."umd"."2.0.0";
-  by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "umd-2.0.0";
+  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.0.0.tgz";
-        name = "umd-2.0.0.tgz";
-        sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f";
+        url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
+        name = "umd-2.1.0.tgz";
+        sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf";
       })
     ];
     buildInputs =
@@ -18441,7 +21759,7 @@
       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"
+      self.by-version."uglify-js"."2.4.14"
     ];
     peerDependencies = [
     ];
@@ -18467,7 +21785,19 @@
     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.3.0" =
+    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 +21816,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" =
@@ -18517,8 +21839,31 @@
     ];
     passthru.names = [ "underscore" ];
   };
+  by-spec."underscore"."~1.5.1" =
+    self.by-version."underscore"."1.5.2";
   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 +21885,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,93 +21903,114 @@
     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.2";
+  by-version."ungit"."0.8.2" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.8.2";
     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.2.tgz";
+        name = "ungit-0.8.2.tgz";
+        sha1 = "11fe51329ab2aaafaccd155eb0c911a90036b27f";
       })
     ];
     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.4.5"
+      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."rc"."0.3.5"
+      self.by-version."temp"."0.8.0"
+      self.by-version."socket.io"."0.9.17"
+      self.by-version."moment"."2.7.0"
+      self.by-version."async"."0.9.0"
+      self.by-version."rc"."0.4.0"
       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.1"
       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."raven"."0.6.3"
+      self.by-version."deep-extend"."0.2.10"
+      self.by-version."raven"."0.7.0"
       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."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."npm-registry-client"."3.0.0"
+      self.by-version."npmconf"."2.0.1"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."body-parser"."1.4.3"
+      self.by-version."cookie-parser"."1.3.2"
+      self.by-version."express-session"."1.6.1"
+      self.by-version."serve-static"."1.3.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.8.0";
-  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";
+  "ungit" = self.by-version."ungit"."0.8.2";
+  by-spec."unique-stream"."^1.0.0" =
+    self.by-version."unique-stream"."1.0.0";
+  by-version."unique-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-unique-stream-1.0.0";
     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/unique-stream/-/unique-stream-1.0.0.tgz";
+        name = "unique-stream-1.0.0.tgz";
+        sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."unique-stream" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "unique-stream" ];
+  };
+  by-spec."update-notifier"."^0.1.3" =
+    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.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.1"
+      self.by-version."request"."2.36.0"
+      self.by-version."semver"."2.3.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "update-notifier" ];
   };
+  by-spec."update-notifier"."~0.1.3" =
+    self.by-version."update-notifier"."0.1.10";
   by-spec."update-notifier"."~0.1.7" =
-    self.by-version."update-notifier"."0.1.8";
-  by-spec."url"."~0.10.1" =
+    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"."*" =
     self.by-version."url"."0.10.1";
   by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-url-0.10.1";
@@ -18681,27 +22030,8 @@
     ];
     passthru.names = [ "url" ];
   };
-  by-spec."url"."~0.7.9" =
-    self.by-version."url"."0.7.9";
-  by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-url-0.7.9";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz";
-        name = "url-0.7.9.tgz";
-        sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."url" or []);
-    deps = [
-      self.by-version."querystring"."0.1.0"
-      self.by-version."punycode"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "url" ];
-  };
+  by-spec."url"."~0.10.1" =
+    self.by-version."url"."0.10.1";
   by-spec."useragent"."~2.0.4" =
     self.by-version."useragent"."2.0.8";
   by-version."useragent"."2.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -18839,7 +22169,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 +22194,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 +22204,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 +22286,27 @@
     ];
     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."vary"."~0.1.0" =
+    self.by-version."vary"."0.1.0";
   by-spec."vasync"."1.3.3" =
     self.by-version."vasync"."1.3.3";
   by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
@@ -19039,15 +22388,15 @@
     ];
     passthru.names = [ "verror" ];
   };
-  by-spec."vhost"."1.0.0" =
-    self.by-version."vhost"."1.0.0";
-  by-version."vhost"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-vhost-1.0.0";
+  by-spec."vhost"."2.0.0" =
+    self.by-version."vhost"."2.0.0";
+  by-version."vhost"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vhost-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
-        name = "vhost-1.0.0.tgz";
-        sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0";
+        url = "http://registry.npmjs.org/vhost/-/vhost-2.0.0.tgz";
+        name = "vhost-2.0.0.tgz";
+        sha1 = "1e26770bd0fce86c40945591e6f284c6891791e2";
       })
     ];
     buildInputs =
@@ -19059,14 +22408,14 @@
     passthru.names = [ "vhost" ];
   };
   by-spec."view-helpers"."*" =
-    self.by-version."view-helpers"."0.1.4";
-  by-version."view-helpers"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-view-helpers-0.1.4";
+    self.by-version."view-helpers"."0.1.5";
+  by-version."view-helpers"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-view-helpers-0.1.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.4.tgz";
-        name = "view-helpers-0.1.4.tgz";
-        sha1 = "aeadfbcc2c21343d2b0ef4d4f20f805764286cee";
+        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
+        name = "view-helpers-0.1.5.tgz";
+        sha1 = "175d220a6afeca8e3b497b003e2337bcc596f761";
       })
     ];
     buildInputs =
@@ -19077,7 +22426,56 @@
     ];
     passthru.names = [ "view-helpers" ];
   };
-  "view-helpers" = self.by-version."view-helpers"."0.1.4";
+  "view-helpers" = self.by-version."view-helpers"."0.1.5";
+  by-spec."vinyl"."^0.2.0" =
+    self.by-version."vinyl"."0.2.3";
+  by-version."vinyl"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vinyl-0.2.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz";
+        name = "vinyl-0.2.3.tgz";
+        sha1 = "bca938209582ec5a49ad538a00fa1f125e513252";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vinyl" or []);
+    deps = [
+      self.by-version."clone-stats"."0.0.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vinyl" ];
+  };
+  by-spec."vinyl"."^0.2.3" =
+    self.by-version."vinyl"."0.2.3";
+  by-spec."vinyl-fs"."^0.3.3" =
+    self.by-version."vinyl-fs"."0.3.4";
+  by-version."vinyl-fs"."0.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vinyl-fs-0.3.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.4.tgz";
+        name = "vinyl-fs-0.3.4.tgz";
+        sha1 = "0df7154a9e07d47b14d2fcff914303439da97a84";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."vinyl-fs" or []);
+    deps = [
+      self.by-version."glob-stream"."3.1.13"
+      self.by-version."glob-watcher"."0.0.6"
+      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."lodash.defaults"."2.4.1"
+      self.by-version."mkdirp"."0.5.0"
+      self.by-version."strip-bom"."0.3.1"
+      self.by-version."through2"."0.5.1"
+      self.by-version."vinyl"."0.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "vinyl-fs" ];
+  };
   by-spec."vm-browserify"."~0.0.1" =
     self.by-version."vm-browserify"."0.0.4";
   by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -19120,26 +22518,26 @@
     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";
+    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.1.tgz";
-        name = "walk-2.3.1.tgz";
-        sha1 = "015e0ef7a636ac43185661a9673d459572a44050";
+        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 {
@@ -19198,41 +22596,61 @@
     ];
     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";
+  by-spec."wcwidth.js"."~0.0.4" =
+    self.by-version."wcwidth.js"."0.0.4";
+  by-version."wcwidth.js"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-wcwidth.js-0.0.4";
     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/wcwidth.js/-/wcwidth.js-0.0.4.tgz";
+        name = "wcwidth.js-0.0.4.tgz";
+        sha1 = "44298a7c899c17501990fdaddd76ef6bd081be75";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wcwidth.js" or []);
+    deps = [
+      self.by-version."underscore"."1.6.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "wcwidth.js" ];
+  };
+  by-spec."wd"."~0.2.12" =
+    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.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.1"
+      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 +22662,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 +22678,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-12"
       self.by-version."tmp"."0.0.23"
       self.by-version."follow-redirects"."0.0.3"
     ];
@@ -19269,16 +22687,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 +22707,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 +22855,28 @@
     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.8.1";
+  by-version."wiredep"."1.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "wiredep-1.8.1";
     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.8.1.tgz";
+        name = "wiredep-1.8.1.tgz";
+        sha1 = "2ed95a4c3065760ac29831a78036b7a2e8bb0422";
       })
     ];
     buildInputs =
       (self.nativeDeps."wiredep" or []);
     deps = [
-      self.by-version."lodash"."1.3.1"
+      self.by-version."bower-config"."0.5.2"
       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."modmod"."0.1.2"
+      self.by-version."propprop"."0.3.0"
+      self.by-version."through2"."0.4.2"
     ];
     peerDependencies = [
     ];
@@ -19515,12 +22936,31 @@
     buildInputs =
       (self.nativeDeps."with" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.13"
+      self.by-version."uglify-js"."2.4.14"
     ];
     peerDependencies = [
     ];
     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 +23024,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 {
@@ -19688,41 +23109,41 @@
     ];
     passthru.names = [ "xml2js" ];
   };
-  by-spec."xml2js"."0.2.x" =
-    self.by-version."xml2js"."0.2.8";
-  by-version."xml2js"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xml2js-0.2.8";
+  by-spec."xml2js"."0.2.6" =
+    self.by-version."xml2js"."0.2.6";
+  by-version."xml2js"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xml2js-0.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
-        name = "xml2js-0.2.8.tgz";
-        sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
+        name = "xml2js-0.2.6.tgz";
+        sha1 = "d209c4e4dda1fc9c452141ef41c077f5adfdf6c4";
       })
     ];
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.5.8"
+      self.by-version."sax"."0.4.2"
     ];
     peerDependencies = [
     ];
     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 +23151,9 @@
     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."xml2js"."^0.4.4" =
+    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 +23173,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 +23231,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 +23250,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 +23291,159 @@
   };
   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."xtend"."~3.0.0" =
+    self.by-version."xtend"."3.0.0";
+  by-spec."yargs"."~1.2.1" =
+    self.by-version."yargs"."1.2.6";
+  by-version."yargs"."1.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-yargs-1.2.6";
     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.6.tgz";
+        name = "yargs-1.2.6.tgz";
+        sha1 = "9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b";
       })
     ];
     buildInputs =
       (self.nativeDeps."yargs" or []);
     deps = [
-      self.by-version."minimist"."0.0.8"
+      self.by-version."minimist"."0.1.0"
     ];
     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.18"
+      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.1";
+  by-version."yeoman-generator"."0.17.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-yeoman-generator-0.17.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.17.1.tgz";
+        name = "yeoman-generator-0.17.1.tgz";
+        sha1 = "f479d9a5fdf9d9590ef14f86954efd25ad1c0778";
+      })
+    ];
+    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.17.0"
+      self.by-version."class-extend"."0.1.1"
+      self.by-version."dargs"."0.1.0"
+      self.by-version."debug"."1.0.2"
+      self.by-version."diff"."1.0.8"
+      self.by-version."download"."0.1.18"
+      self.by-version."file-utils"."0.2.0"
+      self.by-version."findup-sync"."0.1.3"
+      self.by-version."github-username"."0.1.1"
+      self.by-version."glob"."4.0.3"
+      self.by-version."grouped-queue"."0.3.0"
+      self.by-version."gruntfile-editor"."0.1.1"
+      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"."3.0.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"."git://github.com/yeoman/generator#02dc62715d0bc0550def40290fd38a48bd6e63d3" =
+    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 = [
+      (fetchgit {
+        url = "git://github.com/yeoman/generator";
+        rev = "02dc62715d0bc0550def40290fd38a48bd6e63d3";
+        sha256 = "f00ff56324d77adea72131ea408ce1062edde74c41bd07a098ec313b29ccdd3f";
+      })
+    ];
+    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.17.0"
+      self.by-version."class-extend"."0.1.1"
+      self.by-version."dargs"."0.1.0"
+      self.by-version."debug"."1.0.2"
+      self.by-version."diff"."1.0.8"
+      self.by-version."download"."0.1.18"
+      self.by-version."file-utils"."0.2.0"
+      self.by-version."findup-sync"."0.1.3"
+      self.by-version."github-username"."0.1.1"
+      self.by-version."glob"."4.0.3"
+      self.by-version."grouped-queue"."0.3.0"
+      self.by-version."gruntfile-editor"."0.1.1"
+      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"."3.0.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 +23459,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 +23476,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.18"
       self.by-version."request"."2.27.0"
       self.by-version."file-utils"."0.1.5"
     ];
@@ -19909,84 +23484,74 @@
     ];
     passthru.names = [ "yeoman-generator" ];
   };
-  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 {
-    name = "yo-1.1.2";
+    self.by-version."yo"."1.2.0";
+  by-version."yo"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "yo-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yo/-/yo-1.1.2.tgz";
-        name = "yo-1.1.2.tgz";
-        sha1 = "a0d4da72e83fa0e0dbfe1d0ba258881b240ab854";
+        url = "http://registry.npmjs.org/yo/-/yo-1.2.0.tgz";
+        name = "yo-1.2.0.tgz";
+        sha1 = "ce499ba3f06963772d77c03e8daefe8686d8047d";
       })
     ];
     buildInputs =
       (self.nativeDeps."yo" or []);
     deps = [
-      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."insight"."0.3.1"
-      self.by-version."sudo-block"."0.3.0"
-      self.by-version."async"."0.2.10"
-      self.by-version."open"."0.0.4"
+      self.by-version."async"."0.9.0"
       self.by-version."chalk"."0.4.0"
       self.by-version."findup"."0.1.5"
-      self.by-version."shelljs"."0.2.6"
+      self.by-version."fullname"."0.1.0"
+      self.by-version."insight"."0.3.1"
+      self.by-version."is-root"."0.1.0"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."nopt"."3.0.1"
+      self.by-version."opn"."0.1.2"
+      self.by-version."shelljs"."0.3.0"
+      self.by-version."string-length"."0.1.2"
+      self.by-version."sudo-block"."0.4.0"
+      self.by-version."update-notifier"."0.1.10"
+      self.by-version."yeoman-generator"."0.17.1"
+      self.by-version."yosay"."0.2.1"
     ];
     peerDependencies = [
       self.by-version."grunt-cli"."0.1.13"
-      self.by-version."bower"."1.3.2"
+      self.by-version."bower"."1.3.6"
     ];
     passthru.names = [ "yo" ];
   };
-  "yo" = self.by-version."yo"."1.1.2";
+  "yo" = self.by-version."yo"."1.2.0";
   by-spec."yo".">=1.0.0" =
-    self.by-version."yo"."1.1.2";
+    self.by-version."yo"."1.2.0";
   by-spec."yo".">=1.0.0-rc.1.1" =
-    self.by-version."yo"."1.1.2";
+    self.by-version."yo"."1.2.0";
+  by-spec."yo".">=1.2.0" =
+    self.by-version."yo"."1.2.0";
+  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."yosay"."^0.2.1" =
+    self.by-version."yosay"."0.2.1";
   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 +23571,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.6";
+  by-version."zip-stream"."0.3.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-zip-stream-0.3.6";
     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.6.tgz";
+        name = "zip-stream-0.3.6.tgz";
+        sha1 = "0f5396e003d40c5052bc53357354d75f96d9b217";
       })
     ];
     buildInputs =
       (self.nativeDeps."zip-stream" or []);
     deps = [
+      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."crc32-stream"."0.2.0"
+      self.by-version."debug"."1.0.2"
+      self.by-version."deflate-crc32-stream"."0.1.1"
+      self.by-version."lodash"."2.4.1"
       self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."lodash.defaults"."2.4.1"
     ];
     peerDependencies = [
     ];
@@ -20047,6 +23616,4 @@
     ];
     passthru.names = [ "zlib-browserify" ];
   };
-  by-spec."zlib-browserify"."~0.0.3" =
-    self.by-version."zlib-browserify"."0.0.3";
 }
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 4d220a008290..58f01d064850 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -131,4 +131,5 @@
 , "sinon"
 , "shelljs"
 , "typescript"
+, "couchapp"
 ]

From d9d6af1bdaf7461903c5d63e2151ae4c099159fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:16 +0200
Subject: [PATCH 084/167] haskell-cpphs: update to version 1.18.5

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

diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 72a6571f3ccf..31a7dc1361c3 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cpphs";
-  version = "1.18.4";
-  sha256 = "0rmcq66wn7lsc5g1wk6bbsr7jiw8h6bz5cbvdywnv7vmwsx8gh51";
+  version = "1.18.5";
+  sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ polyparse ];

From 99c6b978a71478aef70500ef37032980bf52083f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:26 +0200
Subject: [PATCH 085/167] haskell-arbtt: update to version 0.8.1

---
 pkgs/applications/misc/arbtt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
index b5ecf8fa1d11..91053e57f12e 100644
--- a/pkgs/applications/misc/arbtt/default.nix
+++ b/pkgs/applications/misc/arbtt/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "arbtt";
-  version = "0.8";
-  sha256 = "0anjcg8ikd3jxc5rb3k215wj7ar4kg2plv8sdr8hv64758xkc5q9";
+  version = "0.8.1";
+  sha256 = "1qzmqjm8pfj59h0hrm28pp6qhzz2am5xq81mirnnchsgg52wrfn0";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 0d414a9399d795c3dad3cca12ea222b5dcb2308b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:28 +0200
Subject: [PATCH 086/167] haskell-sloane: update to version 1.8.2

---
 pkgs/applications/science/math/sloane/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix
index a2462e8eefee..bf2cf32d6465 100644
--- a/pkgs/applications/science/math/sloane/default.nix
+++ b/pkgs/applications/science/math/sloane/default.nix
@@ -1,16 +1,16 @@
 { cabal, ansiTerminal, filepath, HTTP, network, optparseApplicative
-, stringsearch, terminalSize, time, zlib
+, terminalSize, text, time, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "sloane";
-  version = "1.8";
-  sha256 = "0c30slsswfqwzi39hk6jraxz1y1a2yn8g8nyjvlnggwajx2rlm6p";
+  version = "1.8.2";
+  sha256 = "0kdznrvyrax1gihqxxw36jfbmjri808ii827fa71v2ijlm416hk1";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal filepath HTTP network optparseApplicative stringsearch
-    terminalSize time zlib
+    ansiTerminal filepath HTTP network optparseApplicative terminalSize
+    text time zlib
   ];
   postInstall = ''
     mkdir -p $out/share/man/man1

From a54ebb76b90652f2bb986aefff471bcf2e10f9b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:30 +0200
Subject: [PATCH 087/167] haskell-Chart-cairo: update to version 1.2.3

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

diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
index 90f93edd4dcd..90c5ce7ec65a 100644
--- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-cairo";
-  version = "1.2.2";
-  sha256 = "1bbi5bvrh8wmgzv5am5ndgdr68gd68ipparkkk9ld4majwf4vm6w";
+  version = "1.2.3";
+  sha256 = "1lbl1qvgm4yxslahlms6kzfrhh8s2fcdiwmvk1bs319k1fylia1b";
   buildDepends = [
     cairo Chart colour dataDefaultClass lens mtl operational time
   ];

From a6e7afead43b67199b3ed322f8f48af0808d671c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:32 +0200
Subject: [PATCH 088/167] haskell-Chart-diagrams: update to version 1.2.3

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

diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
index 22e432f2f329..4d63040f14b6 100644
--- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-diagrams";
-  version = "1.2.2";
-  sha256 = "144dy9vp3x04s03jrkyfqczpwayb8k7dq702w9wm3d8q4ysva62q";
+  version = "1.2.3";
+  sha256 = "08ps30vn9ljiyhgakwdbixn4csy504bsw3h5z9w1dxhn27wij772";
   buildDepends = [
     blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
     diagramsPostscript diagramsSvg lens mtl operational SVGFonts text

From c6498b3df089f8987d4c013343685ff52e703bc0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:34 +0200
Subject: [PATCH 089/167] haskell-Chart-gtk: update to version 1.2.3

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

diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
index 8b1ce6b89e73..3c5785ff945f 100644
--- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix
+++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart-gtk";
-  version = "1.2.2";
-  sha256 = "1mg6nln0jwp6hals9vhhsfqiwix424fv1v1p4h99s0xwy5cna1z9";
+  version = "1.2.3";
+  sha256 = "0vl9nh48pa7sdrqh5a6smmfallf4mwzrvspc2v94cpnrcnickiyq";
   buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
   jailbreak = true;
   meta = {

From 00a8b36e0367b2a0be4a8576ad483377b34d156f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:36 +0200
Subject: [PATCH 090/167] haskell-Chart: update to version 1.2.3

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

diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
index 7604cd28b8e3..f9bac323db8e 100644
--- a/pkgs/development/libraries/haskell/Chart/default.nix
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Chart";
-  version = "1.2.2";
-  sha256 = "0yd3xca500lbzvlvhdsbrkiy53laikq6hc290rc061agvd535a7p";
+  version = "1.2.3";
+  sha256 = "067bahxig5xyd6zasi74k86qb7bxvbs3shjn9fbslhyckxg50q1j";
   buildDepends = [
     colour dataDefaultClass lens mtl operational time
   ];

From 961cefe8143fe958fcdf84c9eb5ec8524fe1752c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:38 +0200
Subject: [PATCH 091/167] haskell-GLUtil: update to version 0.7.5

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

diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix
index 507beef06632..3e14151f61a0 100644
--- a/pkgs/development/libraries/haskell/GLUtil/default.nix
+++ b/pkgs/development/libraries/haskell/GLUtil/default.nix
@@ -1,11 +1,13 @@
-{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw, vector }:
+{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw
+, transformers, vector
+}:
 
 cabal.mkDerivation (self: {
   pname = "GLUtil";
-  version = "0.7.4";
-  sha256 = "0l1w0k3q5g22y90w5frljqh1v4jb7gjzb3scg79zp42pc9v3h4l5";
+  version = "0.7.5";
+  sha256 = "1rbnq1nrs2b06ph60lh0yvygk82vvnm8c4d0anhjrqw9i58nd3iz";
   buildDepends = [
-    cpphs JuicyPixels linear OpenGL OpenGLRaw vector
+    cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector
   ];
   buildTools = [ cpphs ];
   meta = {

From 8aa3b656e53ee3b01666aafe51d8ad1ec0ba694f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:40 +0200
Subject: [PATCH 092/167] haskell-HFuse: update to version 0.2.4.2

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

diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix
index 2012739afb45..03ef1f714eeb 100644
--- a/pkgs/development/libraries/haskell/HFuse/default.nix
+++ b/pkgs/development/libraries/haskell/HFuse/default.nix
@@ -2,12 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "HFuse";
-  version = "0.2.4.1";
-  sha256 = "12k04dvh92kk2i68bcb70xnk378qxmh46f241k06di5rkcgwyg1k";
+  version = "0.2.4.2";
+  sha256 = "043f5x807h1dajd0bvmhln9pjkviszx1279m298w711mrszapqrq";
   extraLibraries = [ fuse ];
   preConfigure = ''
     sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
-    sed -i -e "s@  Include-Dirs:           /usr/include, /usr/local/include, .@  Include-Dirs:           ${fuse}/include@" HFuse.cabal
     sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc
     sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc
     sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc
@@ -15,7 +14,7 @@ cabal.mkDerivation (self: {
     sed -i -e "s/const exitFailure/\\\\(_ :: IOException) -> exitFailure/" System/Fuse.hsc
   '';
   meta = {
-    homepage = "https://github.com/toothbrush/hfuse";
+    homepage = "https://github.com/m15k/hfuse";
     description = "HFuse is a binding for the Linux FUSE library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.linux;

From 485f73f6b38bd864be06f192a5d20681c49d0fde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:42 +0200
Subject: [PATCH 093/167] haskell-HTF: update to version 0.11.4.0

---
 pkgs/development/libraries/haskell/HTF/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 4ef4c4d75196..0514db9e3238 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -1,17 +1,17 @@
-{ cabal, aeson, cpphs, Diff, filepath, haskellSrcExts, HUnit
-, liftedBase, monadControl, mtl, QuickCheck, random, regexCompat
-, temporary, text, unorderedContainers, xmlgen
+{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath
+, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck
+, random, regexCompat, temporary, text, unorderedContainers, xmlgen
 }:
 
 cabal.mkDerivation (self: {
   pname = "HTF";
-  version = "0.11.3.4";
-  sha256 = "0db47fvp33k83dnhvpygprm06p3z397f5ci154vqk7krjpxb2ynx";
+  version = "0.11.4.0";
+  sha256 = "0bg84x6xk359zby04xw62yy227fk85mgs7x5nkdbsxcajm7j0bs9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson cpphs Diff haskellSrcExts HUnit liftedBase monadControl mtl
-    QuickCheck random regexCompat text xmlgen
+    aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase
+    monadControl mtl QuickCheck random regexCompat text xmlgen
   ];
   testDepends = [
     aeson filepath mtl random regexCompat temporary text

From 14370ad0807a13f0534c7fb68a6b5efb5a121723 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:44 +0200
Subject: [PATCH 094/167] haskell-alsa-pcm: update to version 0.6.0.3

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

diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix
index 7ac221299fdb..24869fc99982 100644
--- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix
+++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "alsa-pcm";
-  version = "0.6.0.2";
-  sha256 = "0zckp83wdqb6nl2k63fapa5h4vf1xyvbaycd0ixwr9k7mw75q7b9";
+  version = "0.6.0.3";
+  sha256 = "0rq0i17xhd0x7dnlhdf3i1fdvmyxrsbm0w0k9lrx20xpy4gw2zfs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 003f93bb796f42005e7d13ec0c6b8e58ba92aff4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:46 +0200
Subject: [PATCH 095/167] haskell-binary-conduit: update to version 1.2.2

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

diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix
index 4126910db752..c51f68e3182f 100644
--- a/pkgs/development/libraries/haskell/binary-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "binary-conduit";
-  version = "1.2.1.1";
-  sha256 = "0f6ki793fbgxpsqadfj796b4rbv6zhn4v4rrd48r48zzw9hmxmzd";
+  version = "1.2.2";
+  sha256 = "12dgqydc4zj1ffrcfqpd1dg40dc9hpynj1j69611kzpcqbj275pf";
   buildDepends = [ binary conduit resourcet vector ];
   testDepends = [
     binary conduit hspec QuickCheck quickcheckAssertions resourcet

From 7227516bc69a7da9684d0171eeaa2aff681cb94f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:49 +0200
Subject: [PATCH 096/167] haskell-boomerang: update to version 1.4.3

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

diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
index 74a4385aa928..2099f1b521a0 100644
--- a/pkgs/development/libraries/haskell/boomerang/default.nix
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "boomerang";
-  version = "1.4.2";
-  sha256 = "0vy70anwnh7649za6nzb65fx09vqkf50a961da6gzwvbaf526rd0";
+  version = "1.4.3";
+  sha256 = "1i72mrl8n2cbrdi05zn37y1339r13vzvmrcc1zbkcak4c7r004zw";
   buildDepends = [ mtl text ];
   meta = {
     description = "Library for invertible parsing and printing";

From 4b52f0bdffba96097caf32923ecf11846902505a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:51 +0200
Subject: [PATCH 097/167] haskell-cipher-aes: update to version 0.2.8

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

diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index 52ec2fab7114..0c250ed5feb1 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cipher-aes";
-  version = "0.2.7";
-  sha256 = "1a5viy2frkdqhzzlipd2ik89a04gv95v4b98lgpsas2958r9c9yp";
+  version = "0.2.8";
+  sha256 = "13hg8gxhs7hmni72kp14hmhvfv1kj7fnl83i72bz3aq15vx3z61z";
   buildDepends = [ byteable cryptoCipherTypes securemem ];
   testDepends = [
     byteable cryptoCipherTests cryptoCipherTypes QuickCheck

From 0585def399530ecf52a29164c9be3e7461fc7b3f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:53 +0200
Subject: [PATCH 098/167] haskell-conduit-combinators: update to version
 0.2.6.1

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

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index 99ac99ebc820..7ee4fd476a9f 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.5.2";
-  sha256 = "00zvai14cgh2g9wa436kfdgyfzm3pksnhzy365y1yn96dwbbh1ih";
+  version = "0.2.6.1";
+  sha256 = "01q585fwfl7qw5yr7ry1zfwm0lbmizyidifk9jzxdfxppbccfxfc";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet

From 80993520205ad0a2933856be969254a7eed79775 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:55 +0200
Subject: [PATCH 099/167] haskell-conduit-extra: update to version 1.1.1

---
 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 084f9f38ca28..eb4f926e72c4 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.4";
-  sha256 = "0l1cv65p8nvvb9qgcj87a682wh9xim0rbk2xzhdkd0r123csb118";
+  version = "1.1.1";
+  sha256 = "1876kg7zb0gasl7ijmx48r5r2jv3c5xxa1xb6g6iqfysx0qsv6z2";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet streamingCommons text transformers

From 6f7c6a857515476b1e5fa93608a4360826964d30 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:57 +0200
Subject: [PATCH 100/167] haskell-configurator: update to version 0.3.0.0

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

diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix
index 775c2e5027f8..21c15306de8a 100644
--- a/pkgs/development/libraries/haskell/configurator/default.nix
+++ b/pkgs/development/libraries/haskell/configurator/default.nix
@@ -1,14 +1,17 @@
-{ cabal, attoparsec, hashable, text, unixCompat
-, unorderedContainers
+{ cabal, attoparsec, filepath, hashable, HUnit, testFramework
+, testFrameworkHunit, text, unixCompat, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "configurator";
-  version = "0.2.0.2";
-  sha256 = "011rgd48gv4idkh2dwg4mlyx3s6pgm1263xq5ixsa4sg3jqh9d8b";
+  version = "0.3.0.0";
+  sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
   buildDepends = [
     attoparsec hashable text unixCompat unorderedContainers
   ];
+  testDepends = [
+    filepath HUnit testFramework testFrameworkHunit text
+  ];
   meta = {
     homepage = "http://github.com/bos/configurator";
     description = "Configuration management";

From 76a47d2cf031ef9cc1584b77dfdda05af4e0aadb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 16:59:59 +0200
Subject: [PATCH 101/167] haskell-data-accessor-mtl: update to version 0.2.0.4

---
 .../libraries/haskell/data-accessor/data-accessor-mtl.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
index ce550d02beb5..cc3b7ed39a2a 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor-mtl";
-  version = "0.2.0.3";
-  sha256 = "1aksmm4ykb96khgq5y4vd40zbn4c73hgl21xvyc295cwxsyrbvbk";
+  version = "0.2.0.4";
+  sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
   buildDepends = [ dataAccessor mtl ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";

From c7804aeca2d17eef8848043ebf64e3846f85bd5a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:01 +0200
Subject: [PATCH 102/167] haskell-data-accessor-transformers: update to version
 0.2.1.6

---
 .../haskell/data-accessor/data-accessor-transformers.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
index 83712b858c25..600b72614e2a 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor-transformers";
-  version = "0.2.1.4";
-  sha256 = "1bf1j8g5q81zw51bri89hj3i9jnlmhdggw8rhw3n2v103399pf7d";
+  version = "0.2.1.6";
+  sha256 = "1iawhp1h68ynr2axj12jrn47nf08mss0ar8blagp59yi8j7170fa";
   buildDepends = [ dataAccessor transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Record_access";

From 0cdf1161b5acb4c726dd069abbfb1160c43979bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:03 +0200
Subject: [PATCH 103/167] haskell-data-accessor: update to version 0.2.2.6

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

diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index 5f6dff99dd26..8e685a047793 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-accessor";
-  version = "0.2.2.5";
-  sha256 = "0z63fv41cnpk3h404gprk2f5jl7rrpyv97xmsgac9zgdm5zkkhm6";
+  version = "0.2.2.6";
+  sha256 = "0668qgllmp2911ppsb0g9z95nq2x0h2cvzyyjlb6iwhnjzyyg7gf";
   buildDepends = [ transformers ];
   jailbreak = true;
   meta = {

From 324cfb74473817300dc52e4ef3656569e791f3c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:06 +0200
Subject: [PATCH 104/167] haskell-dependent-sum: update to version 0.2.1.0

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

diff --git a/pkgs/development/libraries/haskell/dependent-sum/default.nix b/pkgs/development/libraries/haskell/dependent-sum/default.nix
index a92dd8064dad..9e7b2ef0cc08 100644
--- a/pkgs/development/libraries/haskell/dependent-sum/default.nix
+++ b/pkgs/development/libraries/haskell/dependent-sum/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dependent-sum";
-  version = "0.2.0.2";
-  sha256 = "06amnc50j246f2za0ri49j6vyq6admx03w3xxjhhfnfx9lp6zmhm";
+  version = "0.2.1.0";
+  sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3";
   meta = {
     homepage = "https://github.com/mokus0/dependent-sum";
     description = "Dependent sum type";

From 3a1a5bfb3939ee2d830f10d0db59aca74d115dfb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:08 +0200
Subject: [PATCH 105/167] haskell-dlist: update to version 0.7.1

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

diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix
index bf63239dd812..144ac45c7d87 100644
--- a/pkgs/development/libraries/haskell/dlist/default.nix
+++ b/pkgs/development/libraries/haskell/dlist/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dlist";
-  version = "0.7.0.1";
-  sha256 = "197k608ja69xc531r7h3gmy1mf6dsk27b3mkpgp4zdw46z6lcb5l";
+  version = "0.7.1";
+  sha256 = "13ka30bn742ldacfgj2lhxvhwf769d0ziy2358vmd5xaq6fn1xfr";
   buildDepends = [ deepseq ];
   testDepends = [ Cabal QuickCheck ];
   meta = {

From da780a691e8974107a2303b511de5851d7b91e2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:10 +0200
Subject: [PATCH 106/167] haskell-explicit-exception: update to version 0.1.7.3

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

diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
index 2542a4c10556..16f9ae1ad61d 100644
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "explicit-exception";
-  version = "0.1.7.2";
-  sha256 = "0zncj57mpngszl7jz3khhd4dajzis7aag0ad62hc8rkrv2j8f5q4";
+  version = "0.1.7.3";
+  sha256 = "0f1p1llz6z4ag1wnf57mgm861cbw7va0g0m8klp6f6pnirdhlwz1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ transformers ];

From 5013bdace3e09ce4d00ae4215663ce16cf4805f8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:12 +0200
Subject: [PATCH 107/167] haskell-fb: update to version 1.0.2

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

diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
index 92f256ae811a..1604d2c8e095 100644
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fb";
-  version = "1.0.1";
-  sha256 = "0xhwv8fmhb1an15fnfjxzq0ijnhxxmfjwzd99dq1lsm0f7gd4hfi";
+  version = "1.0.2";
+  sha256 = "1xgldk690dpbmhzmjlngpbalmbs0xrc7265zc7frphpsbbw3cnqc";
   buildDepends = [
     aeson attoparsec base16Bytestring base64Bytestring cereal conduit
     conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
@@ -23,7 +23,7 @@ cabal.mkDerivation (self: {
   jailbreak = true;
   doCheck = false;
   meta = {
-    homepage = "https://github.com/meteficha/fb";
+    homepage = "https://github.com/prowdsponsor/fb";
     description = "Bindings to Facebook's API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From b63dbe46d4072f08c889c899c284f24d56d5e7bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:16 +0200
Subject: [PATCH 108/167] haskell-gitit: update to version 0.10.4

---
 .../libraries/haskell/gitit/default.nix       | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 6c30ca18b883..d4bf86fc2776 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -1,32 +1,24 @@
-{ cabal, base64Bytestring, blazeHtml, cgi, ConfigFile, feed
-, filepath, filestore, ghcPaths, happstackServer, highlightingKate
-, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
-, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
-, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib, fetchpatch
+{ cabal, base64Bytestring, blazeHtml, ConfigFile, feed, filepath
+, filestore, ghcPaths, happstackServer, highlightingKate, hslogger
+, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
+, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text
+, time, uri, url, utf8String, xhtml, xml, xssSanitize, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.10.3.1";
-  sha256 = "1sm6rryfyqr0nd4flbc5d520xyw2ajnkylvqf4fi4dhl6fnbpam5";
+  version = "0.10.4";
+  sha256 = "1z06v1pamrpm70zisrw3z3kv0d19dsjkmm75pvj5yxkacxv7qk7n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    base64Bytestring blazeHtml cgi ConfigFile feed filepath filestore
+    base64Bytestring blazeHtml ConfigFile feed filepath filestore
     ghcPaths happstackServer highlightingKate hslogger HStringTemplate
     HTTP json mtl network pandoc pandocTypes parsec random recaptcha
-    safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
-    zlib
+    safe SHA split syb tagsoup text time uri url utf8String xhtml xml
+    xssSanitize zlib
   ];
   jailbreak = true;
-  patches = [ (fetchpatch {
-      url = "https://github.com/jgm/gitit/commit/48155008397bdaed4f97c5678d83c70d4bc3f0ff.patch";
-      sha256 = "16n372wrikwb3g4pb3zljxnp19in0828wp40diqgkplhlnwww6nw";
-    })
-  ];
-  preConfigure = ''
-    sed -i -e 's|network .*< 2.5|network|' gitit.cabal
-  '';
   meta = {
     homepage = "http://gitit.net";
     description = "Wiki using happstack, git or darcs, and pandoc";

From 6ba32aa8bdfd73b6b55d07f270a3f344007ab7cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:19 +0200
Subject: [PATCH 109/167] haskell-gtkglext: update to version 0.12.5.0

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

diff --git a/pkgs/development/libraries/haskell/gtkglext/default.nix b/pkgs/development/libraries/haskell/gtkglext/default.nix
index b98b478429cd..3612962ec882 100644
--- a/pkgs/development/libraries/haskell/gtkglext/default.nix
+++ b/pkgs/development/libraries/haskell/gtkglext/default.nix
@@ -1,12 +1,12 @@
-{ pkgs, cabal, gtk, gtk2hsBuildtools, pangox_compat }:
+{ cabal, glib, gtk, gtk2hsBuildtools, gtkglext, pango }:
 
 cabal.mkDerivation (self: {
   pname = "gtkglext";
   version = "0.12.5.0";
   sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
-  buildDepends = [ gtk ];
+  buildDepends = [ glib gtk pango ];
   buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ pkgs.gnome2.gtkglext pangox_compat ];
+  pkgconfigDepends = [ gtkglext ];
   meta = {
     homepage = "http://projects.haskell.org/gtk2hs/";
     description = "Binding to the GTK+ OpenGL Extension";

From ca4c1edc1d9c7e29d2be931bb0ba09ea3fb54a2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:21 +0200
Subject: [PATCH 110/167] haskell-happstack-lite: update to version 7.3.4

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

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
index 01cf72627835..f526d072c6dd 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-lite";
-  version = "7.3.3";
-  sha256 = "0iv60cch0fiy9kh21wcpk3s4nvd4j2p50pqr3y56bsqwxk53hhv8";
+  version = "7.3.4";
+  sha256 = "06ndqfd4x49yi17kgiz5xr05l1k6sj5g1f6kir10wgsqhmd0q811";
   buildDepends = [ happstackServer mtl text ];
   meta = {
     homepage = "http://www.happstack.com/";

From 7959a4343b34db4aeafbc145d9082e322e0f387c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:23 +0200
Subject: [PATCH 111/167] haskell-happstack-server: update to version 7.3.7

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

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index e59bccaf6b5a..02574b1a0f3e 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.3.6";
-  sha256 = "0js1rzg1zpqg9mbi0kdzb5i8ggsrq4l8p0c05k85ppw6h5lwkayd";
+  version = "7.3.7";
+  sha256 = "1phw3hpnklcdav3wv10kwjsmrg8gshnsgd564p459pc4k2zffgh1";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath

From abe293fda1d9983a8106c6e3f5aa51261fcd0578 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:25 +0200
Subject: [PATCH 112/167] haskell-hoauth2: update to version 0.4.1

---
 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 fa0a913e1819..5fe51db353ec 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.4.0";
-  sha256 = "1499rgcn3h4921x21s6l0spnjf3wvmsaa07pimgjgb4rjib3z2d5";
+  version = "0.4.1";
+  sha256 = "145lgy9bxx1xdljbkvi6s97n2z1k5fd0idp415r71ydw8h3i8ppx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 5900e9bef0670057be01877f98c2a4c9352d2870 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:27 +0200
Subject: [PATCH 113/167] haskell-http-client: update to version 0.3.4

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 54888a4b7b53..bdc2d2391dba 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.3.2";
-  sha256 = "02q2zph6clff0k86wkyf19j5dhfglqi3zvbs52hw8lygpkycpkk7";
+  version = "0.3.4";
+  sha256 = "0y4va0xfriv3qv31hbh7kbzmf61rr3ffr4z4vlfdlzacfv8307y4";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From a7fb91bd9d8a71c8bd774fc5cf2cdc9a9aeaf794 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:29 +0200
Subject: [PATCH 114/167] haskell-http-streams: update to version 0.7.2.0

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

diff --git a/pkgs/development/libraries/haskell/http-streams/default.nix b/pkgs/development/libraries/haskell/http-streams/default.nix
index a2c2bc6f8c0b..fae58b088ae1 100644
--- a/pkgs/development/libraries/haskell/http-streams/default.nix
+++ b/pkgs/development/libraries/haskell/http-streams/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-streams";
-  version = "0.7.1.1";
-  sha256 = "0wh07gdb9w48mwsjvg07dq6gjvdm8ls654ki180r7p38v93rsmfx";
+  version = "0.7.2.0";
+  sha256 = "0h7fjnpday34skhafv2v0ybhfv0x915prfb4qa0ld4gm50scsinz";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
     HsOpenSSL httpCommon ioStreams mtl network opensslStreams text

From cdfb5207e16d5f1ca4af5383040dd2dc0332a520 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:31 +0200
Subject: [PATCH 115/167] haskell-jack: update to version 0.7.0.3

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

diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix
index 3b8be28e790d..05ca90a1b046 100644
--- a/pkgs/development/libraries/haskell/jack/default.nix
+++ b/pkgs/development/libraries/haskell/jack/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "jack";
-  version = "0.7.0.2";
-  sha256 = "06mf1sw1lp81b3d4hsgc199m30drdnxzzlmsxg4p1yvydjfdk4gj";
+  version = "0.7.0.3";
+  sha256 = "12ap7xcgzmp5zwmqkwsgxplh5li21m7xngijr4mhnn9y33xc1lrk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 63f8f5ffc60ed3b080933fc5371b51289e3576b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:33 +0200
Subject: [PATCH 116/167] haskell-lens-family-core: update to version 1.1.0

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

diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix
index 7bfb401c7565..ebd1ba8e088a 100644
--- a/pkgs/development/libraries/haskell/lens-family-core/default.nix
+++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens-family-core";
-  version = "1.0.0";
-  sha256 = "149wfxddw58h5q42r3nknmac8wsc9c8xzsw6vrlfb4yasg7bhw53";
+  version = "1.1.0";
+  sha256 = "0pvc7iv7y5s3496w7ic9qzdw3l76ldnrg0my0jxi1dyn0vm9xwm3";
   buildDepends = [ transformers ];
   meta = {
     description = "Haskell 98 Lens Families";

From 03cb18157b4676afdbf93232f88921743239280a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:35 +0200
Subject: [PATCH 117/167] haskell-lifted-base: update to version 0.2.3.0

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

diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index cc8781ae1e1b..9dcce135eb6c 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.2.2";
-  sha256 = "02qjagh4a3zvad7xyvwjd6nkh44c41bqj32ddpn7ms1fv4sl0mam";
+  version = "0.2.3.0";
+  sha256 = "0wbh9l7hsbgvfplxyamvpb8nq6w147zsd2yskylfmpw7kyz6yp9n";
   buildDepends = [ monadControl transformersBase ];
   testDepends = [
     HUnit monadControl testFramework testFrameworkHunit transformers

From 7df262eddae230e31f0a4e7f61e52f1c5142b647 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:37 +0200
Subject: [PATCH 118/167] haskell-midi: update to version 0.2.1.3

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

diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix
index 71593bd21cd2..c7f104640ced 100644
--- a/pkgs/development/libraries/haskell/midi/default.nix
+++ b/pkgs/development/libraries/haskell/midi/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "midi";
-  version = "0.2.1.2";
-  sha256 = "077cxdazr97hjpq42l7hjn905pfhyshvaiwqjdfnzhjv6r48q4zk";
+  version = "0.2.1.3";
+  sha256 = "0mqf6q7686zdxljkz3bqa2zhkgirqz5c1fkbd3n4wyipzhjc773a";
   buildDepends = [
     binary eventList explicitException monoidTransformer nonNegative
     QuickCheck random transformers utilityHt

From 2c5e3a9b422d884a651a70d0ada39277c156954c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:39 +0200
Subject: [PATCH 119/167] haskell-monad-loops: update to version 0.4.2.1

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

diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix
index a58d90fc98bf..350397f719df 100644
--- a/pkgs/development/libraries/haskell/monad-loops/default.nix
+++ b/pkgs/development/libraries/haskell/monad-loops/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-loops";
-  version = "0.4.2";
-  sha256 = "08sz08p4z1p78dv7rmsqvin59h19i6i07sp7jg3zwxwjxa76fds8";
+  version = "0.4.2.1";
+  sha256 = "1dprwndc0bxzpmrkj1xb9kzjrg3i06zsg43yaabn5x5gcaj8is56";
   meta = {
     homepage = "https://github.com/mokus0/monad-loops";
     description = "Monadic loops";

From 9f9dcadb6496e0800d887655e65c85900e74c393 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:41 +0200
Subject: [PATCH 120/167] haskell-pipes-text: update to version 0.0.0.12

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

diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix
index 4b5a7973c525..ad6babc3e50c 100644
--- a/pkgs/development/libraries/haskell/pipes-text/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-text/default.nix
@@ -1,13 +1,13 @@
 { cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe
-, profunctors, streamingCommons, text, transformers
+, streamingCommons, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "pipes-text";
-  version = "0.0.0.11";
-  sha256 = "0c56gxm17bapdjgbp2f55z3f6vq8ryvsljqp3bcjjj18xv5pf1ls";
+  version = "0.0.0.12";
+  sha256 = "18xf0rhshbl03js50n98k96692w98j0j0dfyi67780i08c39dq6m";
   buildDepends = [
-    pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors
+    pipes pipesBytestring pipesGroup pipesParse pipesSafe
     streamingCommons text transformers
   ];
   jailbreak = true;

From 39573f8ad1c8185ecb79308e4ff496b8b5f616b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:43 +0200
Subject: [PATCH 121/167] haskell-purescript: update to version 0.5.2.5

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

diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
index c3fd7a357fbd..f4df50aa6b18 100644
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.5.2.4";
-  sha256 = "19k8kggmmy75qgg9xcvvd194s1vf5qx15ljx82zdscvks2j1r1sd";
+  version = "0.5.2.5";
+  sha256 = "17qbgdfhq9k4y7z3c879hkw22jcq86myd9xhs4saaa4xh3ix50x0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 6da8c3ab7477ec49a23e743d2437a10c406bd269 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:45 +0200
Subject: [PATCH 122/167] haskell-random-fu: update to version 0.2.6.0

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

diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 41999e535e04..ca2237d33f07 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "random-fu";
-  version = "0.2.5.0";
-  sha256 = "1yfq7mvplzdk64i7z5ip8vjynn48a65z28xrhcv91qi0yjxsxdm0";
+  version = "0.2.6.0";
+  sha256 = "1mi1hr3hxlnyjf01hgn7xinr1m0rax26759zbkhf5xn04ps0g01p";
   buildDepends = [
     erf mathFunctions monadLoops mtl randomShuffle randomSource rvar
     syb transformers vector

From 75b9298e5435f70df315a281e34812f365c986cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:47 +0200
Subject: [PATCH 123/167] haskell-safe: update to version 0.3.5

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

diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
index 49c77c5ea266..bfde39349c4e 100644
--- a/pkgs/development/libraries/haskell/safe/default.nix
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "safe";
-  version = "0.3.4";
-  sha256 = "0mwdaj0sjvqkgg077x1d896xphx64yrjvwbdhv7khdk3rh0vfl64";
+  version = "0.3.5";
+  sha256 = "0xv409ps1h1b28v8rkg59a09z001nmpvqvwf3mdkzkyzmxfgq30j";
   meta = {
     homepage = "http://community.haskell.org/~ndm/safe/";
-    description = "Library for safe (pattern match free) functions";
+    description = "Library of safe (exception free) functions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From 7bb9fbb2f00567edecbbc6804740e1ee02ddb2d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:49 +0200
Subject: [PATCH 124/167] haskell-semigroups: update to version 0.15.1

---
 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 21cbc893e229..1e8fc38f3a3d 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.15";
-  sha256 = "1fkinmjyx7r39c8hf8f6n9zgn6m7c2y7l0san43s4g2cfg8pxn5s";
+  version = "0.15.1";
+  sha256 = "1vacnw598pl9acbcjjblrpdmjhmj3wz1ifrn9ki4q7yrsh4ml7mc";
   buildDepends = [ hashable nats text unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";

From d0c41893b6afe020068f6d6e966f3478bc770aa6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:51 +0200
Subject: [PATCH 125/167] haskell-shakespeare: update to version 2.0.1

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

diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 54b93e10923a..850fe6b75dcb 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "2.0.0.3";
-  sha256 = "12dmhcv404bh7kn04d175bj2b0fadz4sjypwsq151mlhakr13x85";
+  version = "2.0.1";
+  sha256 = "1h1b7p4czdzrxb77515vqnck3rj3yw35h2ds6gzxzp7pdxprds27";
   buildDepends = [
     aeson blazeHtml blazeMarkup exceptions parsec systemFileio
     systemFilepath text time transformers

From 3be3743e3ca78cf2e8bd50e279f47495c1155540 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:54 +0200
Subject: [PATCH 126/167] haskell-storable-record: update to version 0.0.3

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

diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix
index 787956be46db..d0818808b0cb 100644
--- a/pkgs/development/libraries/haskell/storable-record/default.nix
+++ b/pkgs/development/libraries/haskell/storable-record/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "storable-record";
-  version = "0.0.2.5";
-  sha256 = "078vwwcr47d3dmzkhxr7ggjkq9d5rnxv4z8p049kdnmzfbcmisn3";
+  version = "0.0.3";
+  sha256 = "1mv2s4r7dqkl2fy0wjnywyr2zi2g53nkn0z72mgr8drkzdszzxx1";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ transformers utilityHt ];

From 3e8934f801f9dcf4461a3dacc2a0c6074f168ed8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:56 +0200
Subject: [PATCH 127/167] haskell-syntactic: update to version 2.0

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

diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix
index 17cb5039a640..a25c8beda387 100644
--- a/pkgs/development/libraries/haskell/syntactic/default.nix
+++ b/pkgs/development/libraries/haskell/syntactic/default.nix
@@ -1,21 +1,20 @@
-{ cabal, constraints, dataHash, mtl, QuickCheck, tasty, tastyGolden
-, tastyQuickcheck, tastyTh, transformers, treeView, tuple
+{ cabal, constraints, dataHash, mtl, QuickCheck, safe, tagged
+, tasty, tastyGolden, tastyQuickcheck, tastyTh, treeView
 , utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "syntactic";
-  version = "1.13";
-  sha256 = "1d5mb7ss6xr7rj93mwrdvkxkx1dlmywxx9sxsmqy7l6gaxs6gq8l";
-  buildDepends = [
-    constraints dataHash mtl transformers treeView tuple
-  ];
+  version = "2.0";
+  sha256 = "0b90afdfymsbgllk8np3xfkgrn2b5ry3n2wbpkn660rknsayw94x";
+  buildDepends = [ constraints dataHash mtl safe tagged treeView ];
   testDepends = [
-    mtl QuickCheck tasty tastyGolden tastyQuickcheck tastyTh utf8String
+    QuickCheck tagged tasty tastyGolden tastyQuickcheck tastyTh
+    utf8String
   ];
   meta = {
     homepage = "https://github.com/emilaxelsson/syntactic";
-    description = "Generic abstract syntax, and utilities for embedded languages";
+    description = "Generic representation and manipulation of abstract syntax";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From 1f239b2a1002763355377a451e443ad2f25ec6ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:00:58 +0200
Subject: [PATCH 128/167] haskell-tasty-golden: update to version 2.2.2.3

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

diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix
index d6d8f2d625d1..a5a8e9c3851f 100644
--- a/pkgs/development/libraries/haskell/tasty-golden/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix
@@ -1,14 +1,15 @@
 { cabal, deepseq, filepath, mtl, optparseApplicative, tagged, tasty
-, temporaryRc
+, tastyHunit, temporaryRc
 }:
 
 cabal.mkDerivation (self: {
   pname = "tasty-golden";
-  version = "2.2.1.2";
-  sha256 = "107c6i1abw6dsd3cx1bgiyk8dnih7i9x4bl4kw6dfnva2kjkp4d1";
+  version = "2.2.2.3";
+  sha256 = "0vphim4qbx0g53xvh8x90k0l5r6afivbb4y31nvbq2avmrm1i82w";
   buildDepends = [
     deepseq filepath mtl optparseApplicative tagged tasty temporaryRc
   ];
+  testDepends = [ filepath tasty tastyHunit temporaryRc ];
   meta = {
     homepage = "https://github.com/feuerbach/tasty-golden";
     description = "Golden tests support for tasty";

From efd0fa6e5a42e60cadae8ffdf732808dc466cfd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:00 +0200
Subject: [PATCH 129/167] haskell-tasty-th: update to version 0.1.2

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

diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix
index b1b9c179dbab..883f25f94680 100644
--- a/pkgs/development/libraries/haskell/tasty-th/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-th/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-th";
-  version = "0.1.1";
-  sha256 = "0ndwfz2gq0did6dfjilhdaxzya2qw9gckjkj090cp2rbkahywsga";
+  version = "0.1.2";
+  sha256 = "1x3kixv0hnb7icigz2kfq959pivdc4jaaalvdgn8dlyqzkvfjzx4";
   buildDepends = [ languageHaskellExtract tasty ];
   meta = {
     homepage = "http://github.com/bennofs/tasty-th";

From 9c67107c4fe988cde3e9295166bc66dfbb5f2c20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:02 +0200
Subject: [PATCH 130/167] haskell-tasty: update to version 0.8.1.2

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

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index bb8e20e98e45..1120413cb988 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.8.1.1";
-  sha256 = "04vzq5gwyd5zb6lsf8nbr5dypgf07b4aq70i1jghkg12v8h529dr";
+  version = "0.8.1.2";
+  sha256 = "07pxnm9cx28vlfypa4psnnxcfx1i4qwimkf0nkfzqkhzqb85a58s";
   buildDepends = [
     ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm
     tagged unboundedDelays

From a4a2aafceea432f53f118788a083162f848e310d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:04 +0200
Subject: [PATCH 131/167] haskell-th-desugar: update to version 1.4.1

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

diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix
index b8f478654245..5781e0f8655f 100644
--- a/pkgs/development/libraries/haskell/th-desugar/default.nix
+++ b/pkgs/development/libraries/haskell/th-desugar/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-desugar";
-  version = "1.4.0";
-  sha256 = "0jadwqhk9dqnicg3p958a6cyfvl70amjc1hl7bhlygpxpdfffwad";
+  version = "1.4.1";
+  sha256 = "1pjv301bshdmn3s5nrmmcx5d1b80c410lml73sai68dhx7v64vw2";
   buildDepends = [ mtl syb ];
   testDepends = [ hspec HUnit mtl syb ];
   meta = {

From 975696ea3d39aba4c58e126fdb7d4d08a15a2cb7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:06 +0200
Subject: [PATCH 132/167] haskell-twitter-conduit: update to version 0.0.5.1

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

diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
index 334b7fcfe399..972633a93556 100644
--- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "twitter-conduit";
-  version = "0.0.4";
-  sha256 = "0fv2m3sy1gklch4v3sarvq4xk9p7pdz1s3ssl52riy3mg076ab09";
+  version = "0.0.5.1";
+  sha256 = "0wmr5124s6n0xdilzh2cd693ar2i0mwkgsik9ns1d34ibnvfibgv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a841fef0978eb41270241956fe1d2cdcfc4fe0b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:11 +0200
Subject: [PATCH 133/167] haskell-vty-ui: update to version 1.7.1

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

diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
index 913451de213b..032726d978d6 100644
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ b/pkgs/development/libraries/haskell/vty-ui/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty-ui";
-  version = "1.7";
-  sha256 = "1wd7ada3x7d5rhl4z3h29m9h42513vbz6dp49xhn4j806mi164nd";
+  version = "1.7.1";
+  sha256 = "1xgv2psbqcqpzgj1f1pis6hr7yvny8y9ajimllam7zsk6kbhngzz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From e1811c9e3b0c3266a263db546faf64785f7a476f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:13 +0200
Subject: [PATCH 134/167] haskell-web-routes: update to version 0.27.6

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

diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
index 8c84f81bcc98..3cc7869a2914 100644
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes";
-  version = "0.27.5";
-  sha256 = "1jx5wwmlylwrf45wy3w29ck1p7509mgy8m02vipd8apibx6ghp22";
+  version = "0.27.6";
+  sha256 = "16jmiwnwmq9bkifk14dfs88a2kyy7rqybyq68ybrjq1x84x6pkkp";
   buildDepends = [
     blazeBuilder httpTypes mtl parsec split text utf8String
   ];

From 25e16e9f202b6c7efecfc30f4c873364d8078fa6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:15 +0200
Subject: [PATCH 135/167] haskell-webdriver: update to version 0.5.5

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

diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix
index 4af61ece80a5..d5adf04f1dad 100644
--- a/pkgs/development/libraries/haskell/webdriver/default.nix
+++ b/pkgs/development/libraries/haskell/webdriver/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "webdriver";
-  version = "0.5.4";
-  sha256 = "0839vw7drjn5iray4ma17f0pfgwx44q10ad8m564jvjgcml4yhvq";
+  version = "0.5.5";
+  sha256 = "1k656ghkaqlnp4a9dd99s3l2vm21zsqpqxwfg2lq5rx2yw402nga";
   buildDepends = [
     aeson attoparsec base64Bytestring cond dataDefault directoryTree
     exceptions filepath HTTP liftedBase monadControl mtl network

From 576d0c5210f15c43607a312bd23a6476b430bbaa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:17 +0200
Subject: [PATCH 136/167] haskell-websockets: update to version 0.8.2.5

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

diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
index 2ec9847e8ef6..37241a8f1f8f 100644
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ b/pkgs/development/libraries/haskell/websockets/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "websockets";
-  version = "0.8.2.4";
-  sha256 = "09mq04vhi53isj8z5930ibyai7bv634lnmhl4xl2d3fzz2afvff0";
+  version = "0.8.2.5";
+  sha256 = "1d8r9mrkwvac05gblxrnxdnnyqqidjcfv5j3njbb9dgzdj56gb1y";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
     entropy ioStreams mtl network random SHA text

From f5a5f46b57f6411ab17324a4eb48e590a82361b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jul 2014 17:01:19 +0200
Subject: [PATCH 137/167] haskell-hlint: update to version 1.9

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

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 69e880176a37..79387dfee11f 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.61";
-  sha256 = "08y8ny6dv14gxnzzr5f1hvs22m7y62yffyq2pzvw2aja8fbj5d2z";
+  version = "1.9";
+  sha256 = "1c8qpfrivsxx6raqnrz40li73hng4z0ygc1hl70qixbmsmv2a830";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 36426f2b49c9c709eba6363841c89674544502e4 Mon Sep 17 00:00:00 2001
From: tomberek <tomberek@gmail.com>
Date: Fri, 4 Jul 2014 09:10:57 -0400
Subject: [PATCH 138/167] Initial additions

---
 .../haskell/haste-compiler/default.nix        | 25 +++++++++++++++++++
 .../libraries/haskell/haste-perch/default.nix | 14 +++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/haste-compiler/default.nix
 create mode 100644 pkgs/development/libraries/haskell/haste-perch/default.nix

diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix
new file mode 100644
index 000000000000..0f0af455c27e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix
@@ -0,0 +1,25 @@
+{ cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754
+, dataDefault, executablePath, filepath, ghcPaths, HTTP, monadsTf
+, mtl, network, random, shellmate, systemFileio, tar, temporary
+, time, transformers, utf8String, websockets, zipArchive
+}:
+
+cabal.mkDerivation (self: {
+  pname = "haste-compiler";
+  version = "0.3";
+  sha256 = "0a0hyra1h484c404d95d411l7gddaazy1ikwzlgkgzaqzd7j7dbd";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    binary blazeBuilder bzlib dataBinaryIeee754 dataDefault
+    executablePath filepath ghcPaths HTTP monadsTf mtl network random
+    shellmate systemFileio tar temporary time transformers utf8String
+    websockets zipArchive
+  ];
+  meta = {
+    homepage = "http://github.com/valderman/haste-compiler";
+    description = "Haskell To ECMAScript compiler";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix
new file mode 100644
index 000000000000..e9e1dfb6a259
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haste-perch/default.nix
@@ -0,0 +1,14 @@
+{ cabal, hasteCompiler, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "haste-perch";
+  version = "0.1.0.0";
+  sha256 = "0g2ijb0mzqs2iq4i47biaxbsg4v15w9ky6yyz6wmngwf06rg4iwj";
+  buildDepends = [ hasteCompiler mtl ];
+  meta = {
+    homepage = "https://github.com/agocorona/haste-perch";
+    description = "Create dynamic HTML in the browser using blaze-html-style notation with Haste";
+    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 dd8255a87b33..b9740e509ee3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1016,6 +1016,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hastache = callPackage ../development/libraries/haskell/hastache {};
 
+  hasteCompiler = callPackage ../development/libraries/haskell/haste-compiler {};
+
+  hastePerch = callPackage ../development/libraries/haskell/haste-perch {};
+
   hcltest = callPackage ../development/libraries/haskell/hcltest {};
 
   hedis = callPackage ../development/libraries/haskell/hedis {};

From a628da8b64d4fb199d849a7d3a81f68985a128ee Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 3 Jul 2014 22:07:08 +0200
Subject: [PATCH 139/167] Update dwb to latest revision

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

diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 3f490315515b..855593ec11d6 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -2,12 +2,12 @@
   m4, glib_networking, gsettings_desktop_schemas, dconf }:
 
 stdenv.mkDerivation {
-  name = "dwb-2014-06-17";
+  name = "dwb-2014-07-03";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "9f4bdb9a1f8d5e45071019da4626231dfebd4d8e";
-    sha256 = "1nj34w2hhw47jsmswsc1y6a09my8zdd01qxwai8dxdvisld3marm";
+    rev = "6224470489eb5ba92987e01396269f8b7cd78ada";
+    sha256 = "04p9frsnh1qz067cw36anvr41an789fba839svdjrdva0f2751g8";
   };
 
   buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ];

From d4a320cd1234d9efcb588e3abe95f40a5c4b6c24 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Fri, 4 Jul 2014 17:34:37 +0200
Subject: [PATCH 140/167] Updated Mediawiki to 1.23.1

---
 .../services/web-servers/apache-httpd/mediawiki.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 7d59c13b9575..7984294e6315 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -72,11 +72,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.20.8";
+    name= "mediawiki-1.23.1";
 
     src = pkgs.fetchurl {
-      url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz";
-      sha256 = "0yfmh5vnfbgpvicfqh7nh4hwdk4qbc6gfniv02vchkg5al0nn7ag";
+      url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
+      sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl";
     };
 
     skins = config.skins;
@@ -93,9 +93,10 @@ let
         ensureDir $out
         cp -r * $out
         cp ${mediawikiConfig} $out/LocalSettings.php
-        sed -i 's|/bin/bash|${pkgs.stdenv.shell}|' \
-          $out/maintenance/fuzz-tester.php \
-          $out/bin/ulimit.sh \
+        sed -i \
+        -e 's|/bin/bash|${pkgs.bash}/bin/bash|g' \
+        -e 's|/usr/bin/timeout|${pkgs.coreutils}/bin/timeout|g' \
+          $out/includes/limit.sh \
           $out/includes/GlobalFunctions.php
       '';
   };

From ce5c883ecfad7b837c16c6da0c48902371c17fea Mon Sep 17 00:00:00 2001
From: tomberek <tomberek@gmail.com>
Date: Fri, 4 Jul 2014 12:16:12 -0400
Subject: [PATCH 141/167] jailbreak haste-perch for base==4.6 req

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

diff --git a/pkgs/development/libraries/haskell/haste-perch/default.nix b/pkgs/development/libraries/haskell/haste-perch/default.nix
index e9e1dfb6a259..3fb7f0499c03 100644
--- a/pkgs/development/libraries/haskell/haste-perch/default.nix
+++ b/pkgs/development/libraries/haskell/haste-perch/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.1.0.0";
   sha256 = "0g2ijb0mzqs2iq4i47biaxbsg4v15w9ky6yyz6wmngwf06rg4iwj";
   buildDepends = [ hasteCompiler mtl ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/agocorona/haste-perch";
     description = "Create dynamic HTML in the browser using blaze-html-style notation with Haste";

From ca6dba33ad7cba7717b617c5f1ee31b3d8f44754 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:22:58 +0400
Subject: [PATCH 142/167] Add Botan unstable branch - 1.11.9 release

---
 .../libraries/botan/default.upstream          |  2 +-
 pkgs/development/libraries/botan/unstable.nix | 58 +++++++++++++++++++
 .../libraries/botan/unstable.upstream         |  9 +++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/botan/unstable.nix
 create mode 100644 pkgs/development/libraries/botan/unstable.upstream

diff --git a/pkgs/development/libraries/botan/default.upstream b/pkgs/development/libraries/botan/default.upstream
index becbf348b34e..8b51ede3bc91 100644
--- a/pkgs/development/libraries/botan/default.upstream
+++ b/pkgs/development/libraries/botan/default.upstream
@@ -1,8 +1,8 @@
 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(){
+  ensure_hash
   set_var_value hash $CURRENT_HASH
   set_var_value baseVersion ${CURRENT_VERSION%.*}
   set_var_value revision ${CURRENT_VERSION##*.}
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
new file mode 100644
index 000000000000..677172dd3ac5
--- /dev/null
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -0,0 +1,58 @@
+x@{builderDefsPackage
+  , python
+  , bzip2, zlib, gmp, openssl
+  , boost
+  , ...}:
+builderDefsPackage
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="botan";
+    tarBaseName="Botan";
+    baseVersion = "1.11";
+    revision = "9";
+    version="${baseVersion}.${revision}";
+    name="${baseName}-${version}";
+    url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz";
+    hash = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"];
+  configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl";
+
+  fixPkgConfig = a.fullDepEntry ''
+    cd "$out"/lib/pkgconfig
+    ln -s botan-*.pc botan.pc || true
+  '' ["minInit" "doMakeInstall"];
+
+  meta = {
+    description = "Cryptographic algorithms library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      unix;
+    inherit version;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://files.randombit.net/botan/";
+    };
+  };
+}) x
diff --git a/pkgs/development/libraries/botan/unstable.upstream b/pkgs/development/libraries/botan/unstable.upstream
new file mode 100644
index 000000000000..9d539a2a6ea4
--- /dev/null
+++ b/pkgs/development/libraries/botan/unstable.upstream
@@ -0,0 +1,9 @@
+url http://botan.randombit.net/download.html
+version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$'
+ensure_version
+do_overwrite(){
+  ensure_hash
+  set_var_value hash $CURRENT_HASH
+  set_var_value baseVersion ${CURRENT_VERSION%.*}
+  set_var_value revision ${CURRENT_VERSION##*.}
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eef352fc1e84..d43a43a19f60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4267,6 +4267,7 @@ let
   boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
 
   botan = callPackage ../development/libraries/botan { };
+  botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
 
   box2d = callPackage ../development/libraries/box2d { };
   box2d_2_0_1 = callPackage ../development/libraries/box2d/2.0.1.nix { };

From 5e066f9741673c1ec7ef533dc7741ec82cc6e0d5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:30:11 +0400
Subject: [PATCH 143/167] Update acpi_call

---
 pkgs/os-specific/linux/acpi-call/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 2882c804c504..63c55341b143 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "git://github.com/mkottman/acpi_call.git";
-    rev = "46dd97e115ddc7219c88b0818c4d5b235162fe6e";
-    sha256 = "1bi0azd7xxhrivjhnmxllj2sfj12br56mxii20mnqdpqwyz0rhni";
+    rev = "ac67445bc75ec4fcf46ceb195fb84d74ad350d51";
+    sha256 = "0jl19irz9x9pxab2qp4z8c3jijv2m30zhmnzi6ygbrisqqlg4c75";
   };
   
   preBuild = ''

From 57890e29213f61fd8b68f149a362175a7db38cc6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:33:59 +0400
Subject: [PATCH 144/167] Mark allegro as allegro-4.*

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

diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 15bb6bf1d000..213b086c3ccf 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -41,6 +41,7 @@ rec {
   ];
 
   meta = {
+    branch = "4";
     description = "A game programming library";
     license = "free-noncopyleft"; # giftware
     maintainers = with a.lib.maintainers;

From db88d93335ec65aeea9dc7e9c740b1f690b5ef3b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:36:12 +0400
Subject: [PATCH 145/167] accountsservice: update from 0.6.35 to 0.6.37

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

diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 6609da5ac822..7b85d29c81b7 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -2,11 +2,11 @@
 , libtool, gobjectIntrospection, polkit, systemd, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "accountsservice-0.6.35";
+  name = "accountsservice-0.6.37";
   
   src = fetchurl {
-    url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.35.tar.xz;
-    sha256 = "0f1hzl6hw56xvwgmd4yvmdyj15xj1fafw45pzv3qarww7h0wg8b5";
+    url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.37.tar.xz;
+    sha256 = "1hd58lrl698ij7w1xk3fpj8zp7h6m2hpzvfmbw9sfx4xvhv13cmh";
   };
 
   buildInputs = [ pkgconfig glib intltool libtool makeWrapper

From 0b9a382fc8ae4653b568a7fba388b8674b7da4b2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:42:14 +0400
Subject: [PATCH 146/167] Apparently nobody ever noticed that aria was already
 packaged when packaging it once more; merging expressions

---
 pkgs/tools/networking/aria/default.nix | 21 ---------------------
 pkgs/top-level/all-packages.nix        |  3 +--
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 pkgs/tools/networking/aria/default.nix

diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix
deleted file mode 100644
index c7ccefd045b4..000000000000
--- a/pkgs/tools/networking/aria/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-
-args : with args; 
-let version="1.18.3"; in
-rec {
-  src = /* Here a fetchurl expression goes */
-  fetchurl {
-    url = "mirror://sourceforge/aria2/stable/aria2-${version}.tar.bz2";
-    sha256 = "0y5wv7llq5sdwrsxqkc67wzk8gpb1kl4l1c0zl6l7kr0bkidna9r";
-  };
-
-  buildInputs = [];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "aria-" + version;
-  meta = {
-    description = "Multiprotocol download manager";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d43a43a19f60..c0a27fa1ab84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -548,9 +548,8 @@ let
 
   inherit (androidenv) androidsdk_4_1;
 
-  aria = builderDefsPackage (import ../tools/networking/aria) { };
-
   aria2 = callPackage ../tools/networking/aria2 { };
+  aria = aria2;
 
   at = callPackage ../tools/system/at { };
 

From 3329d681993dc9fddd6a74267b48b75aec7430ce Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:42:31 +0400
Subject: [PATCH 147/167] aria2: update from 1.18.1 to 1.18.5

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 87613695be77..72f3b5ec8432 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "aria2-1.18.1";
+  name = "aria2-1.18.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2";
-    sha256 = "0fwm5d0i4nr9yzckmd8yc80yj4h1acrv6jca3h1vjji0rbgk49zy";
+    sha256 = "0gyfp4zw7rlaxcxhb402azazf1fi83kk3qg4w0j8d2i7pfa1zqi5";
   };
 
   buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ];

From 5aef461e72228b0050b8aa03368c48bd13223bb2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:42:48 +0400
Subject: [PATCH 148/167] asio: update from 1.10.1 to 1.10.2

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

diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix
index 039c2e85d63d..b5ed6f30e34b 100644
--- a/pkgs/development/libraries/asio/default.nix
+++ b/pkgs/development/libraries/asio/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, boost, openssl}:
 
 stdenv.mkDerivation rec {
-  name = "asio-1.10.1";
+  name = "asio-1.10.2";
   
   src = fetchurl {
     url = "mirror://sourceforge/asio/${name}.tar.bz2";
-    sha256 = "16dxzkra0wmhm2vp2p9lb1h6qsdjk82sxfgj6zlz792n7jnms2l2";
+    sha256 = "1lqxm3gc8rzzjq0m843l59ggbw32bih7smm5spry1j5khfc86p41";
   };
 
   propagatedBuildInputs = [ boost ];

From cb84c4d6a4ae323ec92e084a72d6d0926ffd97fe Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:45:07 +0400
Subject: [PATCH 149/167] babeld: update from 1.4.3 to 1.5.0

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

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 08805738f505..34bdd153f3ab 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.4.3";
+  name = "babeld-1.5.0";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "18qb0g7pxxgl9j0jwpyzhxk2h8bf26sk5bwmnqxv34a5f6lhzf6h";
+    sha256 = "0lpm1zras74b71y01fxndrcvfjzb1ny2hh62pjw6idaqpyrp797s";
   };
 
   preBuild = ''

From b243ef6bef2f217165b28408540ba5cb6f3f3574 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:45:30 +0400
Subject: [PATCH 150/167] maven: update from 3.0.4 to 3.1.1, potentially fixes
 CVE-2013-0253

---
 pkgs/misc/maven/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix
index 8367e6ea72a1..b7cb84fbb3c4 100644
--- a/pkgs/misc/maven/default.nix
+++ b/pkgs/misc/maven/default.nix
@@ -3,13 +3,13 @@
 assert jdk != null;
 
 stdenv.mkDerivation {
-  name = "apache-maven-3.0.4";
+  name = "apache-maven-3.1.1";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz;
-    sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk";
+    url = mirror://apache/maven/binaries/apache-maven-3.1.1-bin.tar.gz;
+    sha256 = "06ymc5y8bp5crcz74z2m9pf58aid5q11v2klnjmxb4ar8mkd8zh7";
   };
 
   buildInputs = [ makeWrapper ];

From 94e11b2f91d44a4171d161360a5697dedf1d3d3e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 21:51:43 +0400
Subject: [PATCH 151/167] Update autocutsel

---
 pkgs/tools/X11/autocutsel/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix
index bc7679b1670e..1fe3cb646ff4 100644
--- a/pkgs/tools/X11/autocutsel/default.nix
+++ b/pkgs/tools/X11/autocutsel/default.nix
@@ -1,14 +1,12 @@
 {stdenv, fetchurl, libX11, libXaw}:
 
-let
-  name = "autocutsel-0.9.0";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  version = "0.10.0";
+  name = "autocutsel-${version}";
  
   src = fetchurl {
-    url = "mirror://savannah/autocutsel/${name}.tar.gz";
-    sha256 = "0hp335qq57l0kp58pfwb0bk930zx5497frq8y0lzr4icvk1fpw5y";
+    url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2";
   };
  
   buildInputs = [ libX11 libXaw ];
@@ -18,9 +16,11 @@ stdenv.mkDerivation {
   '';
 
   meta = {
+    inherit version;
     homepage = "http://www.nongnu.org/autocutsel/";
     description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
     license = "GPLv2+";
     platforms = with stdenv.lib.platforms; all;
+    updateWalker = true;
   };
 }

From 01d9778625fe6b7e68f71c869e43fae0e6673f72 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Jul 2014 22:18:49 +0400
Subject: [PATCH 152/167] Update boinc

---
 pkgs/applications/science/misc/boinc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 0bc5c3cb7c7c..f4b79c8d236f 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -3,12 +3,12 @@ mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
 sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "boinc-7.0.44";
+  name = "boinc-7.2.42";
 
   src = fetchgit {
     url = "git://boinc.berkeley.edu/boinc-v2.git";
-    rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
-    sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
+    rev = "dd0d630882547c123ca0f8fda7a62e058d60f6a9";
+    sha256 = "1zifpi3mjgaj68fba6kammp3x7z8n2x164zz6fj91xfiapnan56j";
   };
 
   buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi

From 67e4df75dd361b2af34d3abbb0f174dada692fac Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Jul 2014 15:48:14 -0500
Subject: [PATCH 153/167] Revert "mutt: update to 1.5.23"

This reverts commit 6a7d60c01a22e83d625506b7cc9243b8da41656a.
---
 .../networking/mailreaders/mutt/default.nix   | 74 ++++++++++---------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 1cb7f298e206..dbd5a41afd34 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -1,57 +1,63 @@
-{ stdenv, fetchhg, autoconf, automake, ncurses, which
-, perl, gdbm, openssl, cyrus_sasl, gpgme, libidn }:
+{ stdenv, fetchurl, ncurses, which, perl
+, sslSupport ? true
+, imapSupport ? true
+, headerCache ? true
+, saslSupport ? true
+, gpgmeSupport ? true
+, gdbm ? null
+, openssl ? null
+, cyrus_sasl ? null
+, gpgme ? null
+}:
+
+assert headerCache -> gdbm != null;
+assert sslSupport -> openssl != null;
+assert saslSupport -> cyrus_sasl != null;
 
 let
-  version = "1.5.23-rel";
+  version = "1.5.23";
 in
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
   
-  src = fetchhg {
-    url = "http://dev.mutt.org/hg/mutt/";
-    rev = "mutt-${version}";
-    sha256 =  "1m0aif066lsc0936ha9s1kfx63wsl1l1wiib7ax6xgzijawd80pp";
+  src = fetchurl {
+    url = "mirror://sourceforge/mutt/${name}.tar.gz";
+    sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s";
   };
 
-  enableParallelBuilding = true;
-
   buildInputs = [
-    autoconf automake ncurses which perl
-    gdbm openssl cyrus_sasl gpgme libidn
+    ncurses which perl
+    (if headerCache then gdbm else null)
+    (if sslSupport then openssl else null)
+    (if saslSupport then cyrus_sasl else null)
+    (if gpgmeSupport then gpgme else null)
   ];
-
-  # This patch is necessary, because during the configure phase mutt
-  # searches for some paths to store mail in that do not exist on
-  # NixOS, like /var/mail, /usr/mail and similiar. This patch adds
-  # /tmp to the list.
-  patches = [
-    ./mailpath.patch
-  ];
-
-  preConfigure = ''./prepare'';
-
+  
   configureFlags = [
-    "--prefix=$out"
+    "--with-mailpath=" "--enable-smtp"
 
+    # This allows calls with "-d N", that output debug info into ~/.muttdebug*
     "--enable-debug"
-    "--enable-gpgme"
-    "--enable-hcache"
-    "--enable-imap"
-    "--enable-pop"
-    "--enable-smtp"
 
-    "--with-idn"
-    "--with-regex"
-    "--with-ssl"
-    "--with-sasl"
+    "--enable-pop" "--enable-imap"
+
+    # The next allows building mutt without having anything setgid
+    # set by the installer, and removing the need for the group 'mail'
+    # I set the value 'mailbox' because it is a default in the configure script
+    "--with-homespool=mailbox"
+    (if headerCache then "--enable-hcache" else "--disable-hcache")
+    (if sslSupport then "--with-ssl" else "--without-ssl")
+    (if imapSupport then "--enable-imap" else "--disable-imap")
+    (if saslSupport then "--with-sasl" else "--without-sasl")
+    (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
   ];
-   
+
   meta = with stdenv.lib; {
     description = "A small but very powerful text-based mail client";
     homepage = http://www.mutt.org;
     license = "GPLv2+";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ the-kenny _1126 ];
+    maintainers = with maintainers; [ the-kenny ];
   };
 }
 

From 925613663513f3306e47e25130a1d2e02945e305 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Sat, 5 Jul 2014 08:50:47 +0200
Subject: [PATCH 154/167] Adds yojson.

Yojson is an optimized parsing and printing OCaml library for the JSON
format, contributed by Martin Jambon.

Webpage: http://mjambon.com/yojson.html
---
 .../ocaml-modules/yojson/default.nix          | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/yojson/default.nix

diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix
new file mode 100644
index 000000000000..9237db080d67
--- /dev/null
+++ b/pkgs/development/ocaml-modules/yojson/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, ocaml, findlib, cppo, easy-format, biniou}:
+let
+  pname = "yojson";
+  version = "1.1.8";
+  webpage = "http://mjambon.com/${pname}.html";
+in
+stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
+    sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv";
+  };
+
+  buildInputs = [ ocaml findlib cppo easy-format biniou ];
+
+  createFindlibDestdir = true;
+
+  makeFlags = "PREFIX=$(out)";
+
+  preBuild = ''
+    mkdir $out/bin
+  '';
+
+  meta = {
+    description = "An optimized parsing and printing library for the JSON format";
+    homepage = "${webpage}";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0a27fa1ab84..a043912dc8b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3279,6 +3279,8 @@ let
     opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
     opam = opam_1_1;
 
+    yojson = callPackage ../development/ocaml-modules/yojson { };
+
     zarith = callPackage ../development/ocaml-modules/zarith { };
   };
 

From fac41b58cacdaafa36f0bece680386271b323f7e Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 5 Jul 2014 09:18:42 +0100
Subject: [PATCH 155/167] couchdb: update to 1.6.0

---
 pkgs/servers/http/couchdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 36d932c1acea..35d4ebbf89f3 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "couchdb-${version}";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
-    sha256 = "0isddp29zh72idgwjaswqy887c1fwx5g1lwlbzscwcv6q70xrmfr";
+    sha256 = "0m4k7i3gibzzcabssysv42rmdr89myppc6765xr0jggwkwdxgxmx";
   };
 
   buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which

From ac711a705eb921460eb598480caca13b4ba68464 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 5 Jul 2014 11:42:41 +0200
Subject: [PATCH 156/167] dfeet: fix icons

---
 pkgs/development/tools/misc/d-feet/default.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index d4847afc786b..852c1b742195 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -1,7 +1,6 @@
 { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
-, pango, gdk_pixbuf, atk, pep8, python, makeWrapper
-, pygobject3, gobjectIntrospection, libwnck3
-, gnome_icon_theme }:
+, pango, gdk_pixbuf, atk, pep8, python, makeWrapper, gnome3
+, pygobject3, gobjectIntrospection, libwnck3 }:
 
 let
   version = "${major}.8";
@@ -18,16 +17,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libxml2 itstool intltool glib gtk3 pep8 python
+    gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
     makeWrapper pygobject3 libwnck3
   ];
 
-  postInstall =
+  preFixup =
     ''
       wrapProgram $out/bin/d-feet \
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
         --prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \
-        --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$out/share"
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
+
+      rm $out/share/icons/hicolor/icon-theme.cache
     '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a043912dc8b7..40640320276a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3869,7 +3869,6 @@ let
 
   dfeet = callPackage ../development/tools/misc/d-feet {
     inherit (pythonPackages) pep8;
-    inherit (gnome3) gnome_icon_theme;
   };
 
   dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };

From 5dc9730a63f2dc1c18e56a3a81060684bd848cf0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 5 Jul 2014 13:52:19 +0200
Subject: [PATCH 157/167] gnome-music 3.12: add totem-pl-parser to dependencies

---
 pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
index c6a98bb3ef0d..d784544a183d 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg python3
                   gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
-                  python3Packages.pycairo python3Packages.dbus
+                  python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     let
       libPath = stdenv.lib.makeLibraryPath
         [ glib gtk3 libnotify tracker gnome3.grilo cairo
-          gst_all_1.gstreamer gst_all_1.gst-plugins-base
+          gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.totem-pl-parser
           gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ];
     in
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40640320276a..09d7fdedeec2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8106,6 +8106,8 @@ let
   };
   awesome = awesome-3-5;
 
+  banshee = callPackage ../applications/audio/banshee { };
+
   inherit (gnome3) baobab;
 
   baresip = callPackage ../applications/networking/instant-messengers/baresip {

From 28322c8d58d22672b3f38b9d209d761909667ba1 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sat, 5 Jul 2014 13:54:01 +0200
Subject: [PATCH 158/167] Packaging plasma-nm and its dependencies

---
 lib/maintainers.nix                           |  1 +
 .../libraries/libmm-qt/default.nix            | 32 +++++++++++++++++++
 .../libraries/libnm-qt/default.nix            | 32 +++++++++++++++++++
 pkgs/tools/networking/plasma-nm/default.nix   | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 5 files changed, 103 insertions(+)
 create mode 100644 pkgs/development/libraries/libmm-qt/default.nix
 create mode 100644 pkgs/development/libraries/libnm-qt/default.nix
 create mode 100644 pkgs/tools/networking/plasma-nm/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f2fe38e8e56c..65e04703223f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -48,6 +48,7 @@
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
+  jgeerds = "Jascha Geerds <jg@ekby.de>";
   joamaki = "Jussi Maki <joamaki@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
diff --git a/pkgs/development/libraries/libmm-qt/default.nix b/pkgs/development/libraries/libmm-qt/default.nix
new file mode 100644
index 000000000000..f78604f86c53
--- /dev/null
+++ b/pkgs/development/libraries/libmm-qt/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, cmake, pkgconfig, qt4, doxygen, modemmanager }:
+
+let
+  pname = "libmm-qt";
+  version = "1.0.1";
+  name = "${pname}-${version}";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  buildInputs = [
+    cmake
+    pkgconfig
+    qt4
+    doxygen
+  ];
+
+  propagatedBuildInputs = [ modemmanager ];
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/modemmanager-qt/${version}/src/${name}-1.tar.xz";
+    sha256 = "0ad57815a904ddb2660a7327c0bda5da47a2a60ce57b2b12f4aaff99b174f74a";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://projects.kde.org/projects/extragear/libs/libmm-qt";
+    description = "Qt wrapper for ModemManager DBus API";
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jgeerds ];
+  };
+}
diff --git a/pkgs/development/libraries/libnm-qt/default.nix b/pkgs/development/libraries/libnm-qt/default.nix
new file mode 100644
index 000000000000..31afcae8e01a
--- /dev/null
+++ b/pkgs/development/libraries/libnm-qt/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, cmake, pkgconfig, qt4, networkmanager, libmm-qt }:
+
+let
+  pname = "libnm-qt";
+  version = "0.9.8.1";
+  name = "${pname}-${version}";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  buildInputs = [
+    cmake
+    pkgconfig
+    qt4
+    networkmanager
+  ];
+
+  propagatedBuildInputs = [ libmm-qt ];
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/networkmanager-qt/${version}/src/${name}.tar.xz";
+    sha256 = "cde8bed2beb57015cb5f6772c1fe0843aab299b9529578c5406ba7fe614af23d";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://projects.kde.org/projects/extragear/libs/libnm-qt";
+    description = "Qt wrapper for NetworkManager DBus API";
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainer = [ maintainers.jgeerds ];
+  };
+}
diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix
new file mode 100644
index 000000000000..42c5ab3973a5
--- /dev/null
+++ b/pkgs/tools/networking/plasma-nm/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, cmake, gettext, kdelibs, networkmanager, libnm-qt }:
+
+let
+  pname = "plasma-nm";
+  version = "0.9.3.3";
+  name = "${pname}-${version}";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/${pname}/${name}.tar.xz";
+    sha256 = "099cbe86eb989c4fda8cdcc0f8721dc3350cc6735c3f50bcdd94661e5930e326";
+  };
+
+  buildInputs = [
+    cmake
+    pkgconfig
+    gettext
+    kdelibs
+    networkmanager
+    libnm-qt
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm";
+    description = "Plasma applet written in QML for managing network connections";
+    license = licenses.lgpl21;
+    inherit (kdelibs.meta) platforms;
+    maintainers = [ maintainers.jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40640320276a..b6535fea8162 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10565,10 +10565,16 @@ let
 
       liblikeback = callPackage ../development/libraries/liblikeback { };
 
+      libmm-qt = callPackage ../development/libraries/libmm-qt { };
+
+      libnm-qt = callPackage ../development/libraries/libnm-qt { };
+
       networkmanagement = callPackage ../tools/networking/networkmanagement { };
 
       partitionManager = callPackage ../tools/misc/partition-manager { };
 
+      plasma-nm = callPackage ../tools/networking/plasma-nm { };
+
       polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
 
       psi = callPackage ../applications/networking/instant-messengers/psi { };

From 3950f2582d349739dd9999a9b7fc6e1624c91971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 5 Jul 2014 14:46:15 +0200
Subject: [PATCH 159/167] openocd: fix symlink to udev rules file

I made an error last time I touched this line. Fix it (.udev => .rules).
---
 pkgs/development/tools/misc/openocd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index ea9278c2b3d0..7334fa8754f4 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mkdir -p "$out/etc/udev/rules.d"
-    ln -s "$out/share/openocd/contrib/99-openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules"
+    ln -s "$out/share/openocd/contrib/99-openocd.rules" "$out/etc/udev/rules.d/99-openocd.rules"
   '';
 
   meta = with stdenv.lib; {

From ae5501f44e9ee9dc6cd04eb4d3984f82567cfb9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 5 Jul 2014 15:00:01 +0200
Subject: [PATCH 160/167] Fix nixpkgs evaluation

'banshee' doesn't exist (yet) in nixpkgs. I think it was accidentally
added in commit 5dc9730a63f2dc1c18e56a3a81060684bd848cf0 (gnome-music
3.12: add totem-pl-parser to dependencies).
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09d7fdedeec2..40640320276a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8106,8 +8106,6 @@ let
   };
   awesome = awesome-3-5;
 
-  banshee = callPackage ../applications/audio/banshee { };
-
   inherit (gnome3) baobab;
 
   baresip = callPackage ../applications/networking/instant-messengers/baresip {

From f3439fcfd41b7fc941f39de184bf12be05c0fd2d Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 5 Jul 2014 14:29:49 +0100
Subject: [PATCH 161/167] Revert "nodePackages.couchapp: added & and node
 packages updated"

This reverts commit 8cf2cd5d1163c20c74c0d0a7e535f3d0a7717093.
---
 pkgs/top-level/node-packages-generated.nix | 9365 ++++++--------------
 pkgs/top-level/node-packages.json          |    1 -
 2 files changed, 2899 insertions(+), 6467 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 1815212e8758..e250085f7307 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.7"
+      self.by-version."CSSwhat"."0.4.5"
       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.7"
+      self.by-version."CSSwhat"."0.4.5"
       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.7";
-  by-version."CSSwhat"."0.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-CSSwhat-0.4.7";
+    self.by-version."CSSwhat"."0.4.5";
+  by-version."CSSwhat"."0.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-CSSwhat-0.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
-        name = "CSSwhat-0.4.7.tgz";
-        sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
+        url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.5.tgz";
+        name = "CSSwhat-0.4.5.tgz";
+        sha1 = "85d7b2799ff3d98055353c802949e39913e16a62";
       })
     ];
     buildInputs =
@@ -105,35 +105,14 @@
     passthru.names = [ "JSONStream" ];
   };
   by-spec."JSONStream"."~0.7.1" =
-    self.by-version."JSONStream"."0.7.4";
-  by-version."JSONStream"."0.7.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-JSONStream-0.7.4";
+    self.by-version."JSONStream"."0.7.2";
+  by-version."JSONStream"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-JSONStream-0.7.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz";
-        name = "JSONStream-0.7.4.tgz";
-        sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."JSONStream" or []);
-    deps = [
-      self.by-version."jsonparse"."0.0.5"
-      self.by-version."through"."2.3.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "JSONStream" ];
-  };
-  by-spec."JSONStream"."~0.8.3" =
-    self.by-version."JSONStream"."0.8.4";
-  by-version."JSONStream"."0.8.4" = lib.makeOverridable self.buildNodePackage {
-    name = "JSONStream-0.8.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
-        name = "JSONStream-0.8.4.tgz";
-        sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.2.tgz";
+        name = "JSONStream-0.7.2.tgz";
+        sha1 = "27f4d7fe1918dc08ee72aed9c794e32ce80618f7";
       })
     ];
     buildInputs =
@@ -188,8 +167,6 @@
     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 {
@@ -211,31 +188,6 @@
     ];
     passthru.names = [ "accepts" ];
   };
-  by-spec."accepts"."~1.0.0" =
-    self.by-version."accepts"."1.0.6";
-  by-version."accepts"."1.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-accepts-1.0.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/accepts/-/accepts-1.0.6.tgz";
-        name = "accepts-1.0.6.tgz";
-        sha1 = "8cbbf84772d70211110d9b00b1208aae01f15724";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."accepts" or []);
-    deps = [
-      self.by-version."mime-types"."1.0.1"
-      self.by-version."negotiator"."0.4.7"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "accepts" ];
-  };
-  by-spec."accepts"."~1.0.4" =
-    self.by-version."accepts"."1.0.6";
-  by-spec."accepts"."~1.0.5" =
-    self.by-version."accepts"."1.0.6";
   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 {
@@ -256,7 +208,7 @@
     ];
     passthru.names = [ "active-x-obfuscator" ];
   };
-  by-spec."addressparser"."~0.2.1" =
+  by-spec."addressparser"."~0.2.0" =
     self.by-version."addressparser"."0.2.1";
   by-version."addressparser"."0.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-addressparser-0.2.1";
@@ -357,15 +309,15 @@
   "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";
+  by-spec."ansi"."~0.2.1" =
+    self.by-version."ansi"."0.2.1";
+  by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "ansi-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
-        name = "ansi-0.3.0.tgz";
-        sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0";
+        url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz";
+        name = "ansi-0.2.1.tgz";
+        sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017";
       })
     ];
     buildInputs =
@@ -376,25 +328,6 @@
     ];
     passthru.names = [ "ansi" ];
   };
-  by-spec."ansi-regex"."^0.1.0" =
-    self.by-version."ansi-regex"."0.1.0";
-  by-version."ansi-regex"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ansi-regex-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz";
-        name = "ansi-regex-0.1.0.tgz";
-        sha1 = "55ca60db6900857c423ae9297980026f941ed903";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ansi-regex" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ansi-regex" ];
-  };
   by-spec."ansi-remover"."*" =
     self.by-version."ansi-remover"."0.0.2";
   by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -549,26 +482,24 @@
     ];
     passthru.names = [ "apparatus" ];
   };
-  by-spec."archiver"."~0.10.0" =
-    self.by-version."archiver"."0.10.1";
-  by-version."archiver"."0.10.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-archiver-0.10.1";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/archiver/-/archiver-0.10.1.tgz";
-        name = "archiver-0.10.1.tgz";
-        sha1 = "c88a50fe114f744d059a07dfc4690f3a204146e4";
+        url = "http://registry.npmjs.org/archiver/-/archiver-0.5.2.tgz";
+        name = "archiver-0.5.2.tgz";
+        sha1 = "4e021b1fea5d902201f4886fca6a19fcc760083b";
       })
     ];
     buildInputs =
       (self.nativeDeps."archiver" or []);
     deps = [
-      self.by-version."buffer-crc32"."0.2.3"
       self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."tar-stream"."0.4.4"
-      self.by-version."zip-stream"."0.3.6"
+      self.by-version."zip-stream"."0.1.4"
       self.by-version."lazystream"."0.1.0"
-      self.by-version."file-utils"."0.2.0"
+      self.by-version."file-utils"."0.1.5"
       self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
@@ -596,8 +527,6 @@
   };
   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 {
@@ -716,6 +645,27 @@
     ];
     passthru.names = [ "ascii-json" ];
   };
+  by-spec."ascli"."*" =
+    self.by-version."ascli"."0.3.0";
+  by-version."ascli"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ascli-0.3.0";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
+        name = "ascli-0.3.0.tgz";
+        sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ascli" or []);
+    deps = [
+      self.by-version."colour"."0.7.1"
+      self.by-version."optjs"."3.2.1-boom"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ascli" ];
+  };
   by-spec."asn1"."0.1.11" =
     self.by-version."asn1"."0.1.11";
   by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
@@ -796,30 +746,6 @@
     ];
     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 {
@@ -841,14 +767,14 @@
     passthru.names = [ "astw" ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."0.9.0";
-  by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.9.0";
+    self.by-version."async"."0.7.0";
+  by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
-        name = "async-0.9.0.tgz";
-        sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
+        url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz";
+        name = "async-0.7.0.tgz";
+        sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5";
       })
     ];
     buildInputs =
@@ -859,7 +785,7 @@
     ];
     passthru.names = [ "async" ];
   };
-  "async" = self.by-version."async"."0.9.0";
+  "async" = self.by-version."async"."0.7.0";
   by-spec."async"."0.1.15" =
     self.by-version."async"."0.1.15";
   by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
@@ -938,14 +864,12 @@
     ];
     passthru.names = [ "async" ];
   };
-  by-spec."async"."0.9.x" =
-    self.by-version."async"."0.9.0";
   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" =
@@ -954,15 +878,15 @@
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.9" =
     self.by-version."async"."0.2.10";
-  by-spec."async"."~0.8" =
-    self.by-version."async"."0.8.0";
-  by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.8.0";
+  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.8.0.tgz";
-        name = "async-0.8.0.tgz";
-        sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112";
+        url = "http://registry.npmjs.org/async/-/async-0.4.1.tgz";
+        name = "async-0.4.1.tgz";
+        sha1 = "1985abade017df906bfaa8d77d424b25366b3a5b";
       })
     ];
     buildInputs =
@@ -973,53 +897,47 @@
     ];
     passthru.names = [ "async" ];
   };
-  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."async-some"."~1.0.0" =
-    self.by-version."async-some"."1.0.1";
-  by-version."async-some"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-some-1.0.1";
+  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-some/-/async-some-1.0.1.tgz";
-        name = "async-some-1.0.1.tgz";
-        sha1 = "8b54f08d46f0f9babc72ea9d646c245d23a4d9e5";
+        url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz";
+        name = "async-0.6.2.tgz";
+        sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef";
       })
     ];
     buildInputs =
-      (self.nativeDeps."async-some" or []);
+      (self.nativeDeps."async" or []);
     deps = [
-      self.by-version."dezalgo"."1.0.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "async-some" ];
+    passthru.names = [ "async" ];
   };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.0.4";
-  by-version."aws-sdk"."2.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-aws-sdk-2.0.4";
+    self.by-version."aws-sdk"."2.0.0-rc9";
+  by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-aws-sdk-2.0.0-rc9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.4.tgz";
-        name = "aws-sdk-2.0.4.tgz";
-        sha1 = "4700ae607375921aa09884ef4fb7f1c7476440f1";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.0-rc9.tgz";
+        name = "aws-sdk-2.0.0-rc9.tgz";
+        sha1 = "caa7653837f7886e7f9e4da5df3b3c8324d7d0ab";
       })
     ];
     buildInputs =
       (self.nativeDeps."aws-sdk" or []);
     deps = [
-      self.by-version."aws-sdk-apis"."3.0.6"
-      self.by-version."xml2js"."0.2.6"
+      self.by-version."xml2js"."0.2.4"
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "aws-sdk" ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.0.4";
+  "aws-sdk" = self.by-version."aws-sdk"."2.0.0-rc9";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage {
@@ -1041,25 +959,6 @@
     ];
     passthru.names = [ "aws-sdk" ];
   };
-  by-spec."aws-sdk-apis"."3.x" =
-    self.by-version."aws-sdk-apis"."3.0.6";
-  by-version."aws-sdk-apis"."3.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-aws-sdk-apis-3.0.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.0.6.tgz";
-        name = "aws-sdk-apis-3.0.6.tgz";
-        sha1 = "9f717527cc71306e23bd6a88ad0255357c2bd521";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."aws-sdk-apis" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "aws-sdk-apis" ];
-  };
   by-spec."aws-sign"."~0.2.0" =
     self.by-version."aws-sign"."0.2.0";
   by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -1177,14 +1076,14 @@
     passthru.names = [ "base62" ];
   };
   by-spec."base64-js"."~0.0.4" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz";
-        name = "base64-js-0.0.7.tgz";
-        sha1 = "54400dc91d696cec32a8a47902f971522fee8f48";
+        url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
+        name = "base64-js-0.0.6.tgz";
+        sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
       })
     ];
     buildInputs =
@@ -1195,25 +1094,6 @@
     ];
     passthru.names = [ "base64-js" ];
   };
-  by-spec."base64-url"."1" =
-    self.by-version."base64-url"."1.0.0";
-  by-version."base64-url"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-base64-url-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/base64-url/-/base64-url-1.0.0.tgz";
-        name = "base64-url-1.0.0.tgz";
-        sha1 = "ab694376f2801af6c9260899ffef02f86b40ee2c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."base64-url" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "base64-url" ];
-  };
   by-spec."base64id"."0.1.0" =
     self.by-version."base64id"."0.1.0";
   by-version."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1271,34 +1151,15 @@
     ];
     passthru.names = [ "batch" ];
   };
-  by-spec."batch"."0.5.1" =
-    self.by-version."batch"."0.5.1";
-  by-version."batch"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-batch-0.5.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/batch/-/batch-0.5.1.tgz";
-        name = "batch-0.5.1.tgz";
-        sha1 = "36a4bab594c050fd7b507bca0db30c2d92af4ff2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."batch" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "batch" ];
-  };
   by-spec."bcrypt"."*" =
-    self.by-version."bcrypt"."0.7.8";
-  by-version."bcrypt"."0.7.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bcrypt-0.7.8";
+    self.by-version."bcrypt"."0.7.7";
+  by-version."bcrypt"."0.7.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bcrypt-0.7.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.8.tgz";
-        name = "bcrypt-0.7.8.tgz";
-        sha1 = "42c99aac202918e947b5bd086110184f62745e3e";
+        url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz";
+        name = "bcrypt-0.7.7.tgz";
+        sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868";
       })
     ];
     buildInputs =
@@ -1310,7 +1171,7 @@
     ];
     passthru.names = [ "bcrypt" ];
   };
-  "bcrypt" = self.by-version."bcrypt"."0.7.8";
+  "bcrypt" = self.by-version."bcrypt"."0.7.7";
   by-spec."binary"."~0.3.0" =
     self.by-version."binary"."0.3.0";
   by-version."binary"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -1333,14 +1194,14 @@
     passthru.names = [ "binary" ];
   };
   by-spec."bindings"."*" =
-    self.by-version."bindings"."1.2.1";
-  by-version."bindings"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bindings-1.2.1";
+    self.by-version."bindings"."1.2.0";
+  by-version."bindings"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bindings-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-        name = "bindings-1.2.1.tgz";
-        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz";
+        name = "bindings-1.2.0.tgz";
+        sha1 = "c224fc5b349a84043779f97a6271d9d70da7636f";
       })
     ];
     buildInputs =
@@ -1370,47 +1231,6 @@
     ];
     passthru.names = [ "bindings" ];
   };
-  by-spec."bindings"."1.1.1" =
-    self.by-version."bindings"."1.1.1";
-  by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bindings-1.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
-        name = "bindings-1.1.1.tgz";
-        sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bindings" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bindings" ];
-  };
-  by-spec."bindings".">=1.2.0" =
-    self.by-version."bindings"."1.2.1";
-  by-spec."bl"."~0.8.1" =
-    self.by-version."bl"."0.8.2";
-  by-version."bl"."0.8.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bl-0.8.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
-        name = "bl-0.8.2.tgz";
-        sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bl" or []);
-    deps = [
-      self.by-version."readable-stream"."1.0.27-1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bl" ];
-  };
   by-spec."block-stream"."*" =
     self.by-version."block-stream"."0.0.7";
   by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
@@ -1433,25 +1253,6 @@
   };
   by-spec."block-stream"."0.0.7" =
     self.by-version."block-stream"."0.0.7";
-  by-spec."bluebird".">= 1.2.1" =
-    self.by-version."bluebird"."2.1.3";
-  by-version."bluebird"."2.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bluebird-2.1.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bluebird/-/bluebird-2.1.3.tgz";
-        name = "bluebird-2.1.3.tgz";
-        sha1 = "f2cf7bbccadbe5b031086dbf343535922cb3b99f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bluebird" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bluebird" ];
-  };
   by-spec."blueimp-md5"."~1.1.0" =
     self.by-version."blueimp-md5"."1.1.0";
   by-version."blueimp-md5"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -1471,34 +1272,28 @@
     ];
     passthru.names = [ "blueimp-md5" ];
   };
-  by-spec."body-parser"."1.4.3" =
-    self.by-version."body-parser"."1.4.3";
-  by-version."body-parser"."1.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-body-parser-1.4.3";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.4.3.tgz";
-        name = "body-parser-1.4.3.tgz";
-        sha1 = "4727952cff4af0773eefa4b226c2f4122f5e234d";
+        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.0.2.tgz";
+        name = "body-parser-1.0.2.tgz";
+        sha1 = "3461479a3278fe00fcaebec3314bb54fc4f7b47c";
       })
     ];
     buildInputs =
       (self.nativeDeps."body-parser" or []);
     deps = [
-      self.by-version."bytes"."1.0.0"
-      self.by-version."depd"."0.3.0"
-      self.by-version."iconv-lite"."0.4.3"
-      self.by-version."media-typer"."0.2.0"
+      self.by-version."type-is"."1.1.0"
+      self.by-version."raw-body"."1.1.4"
       self.by-version."qs"."0.6.6"
-      self.by-version."raw-body"."1.2.2"
-      self.by-version."type-is"."1.3.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "body-parser" ];
   };
-  by-spec."body-parser"."~1.4.3" =
-    self.by-version."body-parser"."1.4.3";
   by-spec."boolbase"."~1.0.0" =
     self.by-version."boolbase"."1.0.0";
   by-version."boolbase"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -1559,14 +1354,14 @@
     passthru.names = [ "boom" ];
   };
   by-spec."bower"."*" =
-    self.by-version."bower"."1.3.6";
-  by-version."bower"."1.3.6" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.3.6";
+    self.by-version."bower"."1.3.2";
+  by-version."bower"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.3.6.tgz";
-        name = "bower-1.3.6.tgz";
-        sha1 = "db643fdaab0376c3c526939d709e9852a46ca2ed";
+        url = "http://registry.npmjs.org/bower/-/bower-1.3.2.tgz";
+        name = "bower-1.3.2.tgz";
+        sha1 = "ae1eeea5c3ba9300e10e55b193e9d2fd5407fb7b";
       })
     ];
     buildInputs =
@@ -1574,55 +1369,55 @@
     deps = [
       self.by-version."abbrev"."1.0.5"
       self.by-version."archy"."0.0.2"
-      self.by-version."bower-config"."0.5.2"
-      self.by-version."bower-endpoint-parser"."0.2.2"
+      self.by-version."bower-config"."0.5.0"
+      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.2.1"
+      self.by-version."bower-registry-client"."0.1.6"
       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.8"
-      self.by-version."fstream"."0.1.28"
-      self.by-version."fstream-ignore"."0.0.8"
-      self.by-version."glob"."4.0.3"
-      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."decompress-zip"."0.0.6"
+      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."graceful-fs"."2.0.3"
       self.by-version."handlebars"."1.3.0"
-      self.by-version."inquirer"."0.5.1"
-      self.by-version."insight"."0.3.1"
-      self.by-version."is-root"."0.1.0"
-      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.5.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"."3.0.1"
-      self.by-version."opn"."0.1.2"
-      self.by-version."osenv"."0.1.0"
-      self.by-version."p-throttler"."0.0.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.36.0"
+      self.by-version."request"."2.33.0"
       self.by-version."request-progress"."0.3.1"
-      self.by-version."retry"."0.6.1"
-      self.by-version."rimraf"."2.2.8"
-      self.by-version."semver"."2.3.1"
-      self.by-version."shell-quote"."1.4.1"
-      self.by-version."stringify-object"."0.2.1"
-      self.by-version."tar"."0.1.20"
+      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.10"
+      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."lockfile"."0.4.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "bower" ];
   };
-  "bower" = self.by-version."bower"."1.3.6";
-  by-spec."bower".">=1.0.0" =
-    self.by-version."bower"."1.3.6";
+  "bower" = self.by-version."bower"."1.3.2";
+  by-spec."bower".">=0.9.0" =
+    self.by-version."bower"."1.3.2";
   by-spec."bower".">=1.2.8 <2" =
-    self.by-version."bower"."1.3.6";
+    self.by-version."bower"."1.3.2";
   by-spec."bower"."~1.2.0" =
     self.by-version."bower"."1.2.8";
   by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage {
@@ -1639,18 +1434,18 @@
     deps = [
       self.by-version."abbrev"."1.0.5"
       self.by-version."archy"."0.0.2"
-      self.by-version."bower-config"."0.5.2"
-      self.by-version."bower-endpoint-parser"."0.2.2"
+      self.by-version."bower-config"."0.5.0"
+      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."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.8"
-      self.by-version."fstream"."0.1.28"
-      self.by-version."fstream-ignore"."0.0.8"
-      self.by-version."glob"."3.2.11"
+      self.by-version."decompress-zip"."0.0.6"
+      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."graceful-fs"."2.0.3"
       self.by-version."handlebars"."1.0.12"
       self.by-version."inquirer"."0.3.5"
@@ -1665,14 +1460,14 @@
       self.by-version."q"."0.9.7"
       self.by-version."request"."2.27.0"
       self.by-version."request-progress"."0.3.1"
-      self.by-version."retry"."0.6.1"
-      self.by-version."rimraf"."2.2.8"
+      self.by-version."retry"."0.6.0"
+      self.by-version."rimraf"."2.2.6"
       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.20"
+      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."update-notifier"."0.1.8"
       self.by-version."which"."1.0.5"
       self.by-version."p-throttler"."0.0.1"
     ];
@@ -1680,29 +1475,6 @@
     ];
     passthru.names = [ "bower" ];
   };
-  by-spec."bower-config"."^0.5.0" =
-    self.by-version."bower-config"."0.5.2";
-  by-version."bower-config"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-config-0.5.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz";
-        name = "bower-config-0.5.2.tgz";
-        sha1 = "1f7d2e899e99b70c29a613e70d4c64590414b22e";
-      })
-    ];
-    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 {
@@ -1727,9 +1499,28 @@
     passthru.names = [ "bower-config" ];
   };
   by-spec."bower-config"."~0.5.0" =
-    self.by-version."bower-config"."0.5.2";
-  by-spec."bower-config"."~0.5.2" =
-    self.by-version."bower-config"."0.5.2";
+    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" ];
+  };
   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 {
@@ -1750,26 +1541,7 @@
     passthru.names = [ "bower-endpoint-parser" ];
   };
   by-spec."bower-endpoint-parser"."~0.2.0" =
-    self.by-version."bower-endpoint-parser"."0.2.2";
-  by-version."bower-endpoint-parser"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bower-endpoint-parser-0.2.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz";
-        name = "bower-endpoint-parser-0.2.2.tgz";
-        sha1 = "00b565adbfab6f2d35addde977e97962acbcb3f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bower-endpoint-parser" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bower-endpoint-parser" ];
-  };
-  by-spec."bower-endpoint-parser"."~0.2.2" =
-    self.by-version."bower-endpoint-parser"."0.2.2";
+    self.by-version."bower-endpoint-parser"."0.2.1";
   by-spec."bower-json"."0.4.0" =
     self.by-version."bower-json"."0.4.0";
   by-version."bower-json"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -1784,7 +1556,7 @@
     buildInputs =
       (self.nativeDeps."bower-json" or []);
     deps = [
-      self.by-version."deep-extend"."0.2.10"
+      self.by-version."deep-extend"."0.2.8"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."intersect"."0.0.3"
     ];
@@ -1854,34 +1626,7 @@
       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 = [
-    ];
-    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.2"
-      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."rimraf"."2.2.6"
       self.by-version."mkdirp"."0.3.5"
     ];
     peerDependencies = [
@@ -1907,10 +1652,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.6"
+      self.by-version."bower"."1.3.2"
       self.by-version."argparse"."0.1.15"
       self.by-version."clone"."0.1.11"
-      self.by-version."semver"."2.3.1"
+      self.by-version."semver"."2.2.1"
       self.by-version."fetch-bower"."2.0.0"
     ];
     peerDependencies = [
@@ -1966,46 +1711,7 @@
     ];
     passthru.names = [ "browser-pack" ];
   };
-  by-spec."browser-request"."~0.3.0" =
-    self.by-version."browser-request"."0.3.1";
-  by-version."browser-request"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-browser-request-0.3.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.1.tgz";
-        name = "browser-request-0.3.1.tgz";
-        sha1 = "4c01f0bda68de746a59e49db917558c9a583646f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browser-request" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "browser-request" ];
-  };
-  by-spec."browser-resolve"."^1.3.0" =
-    self.by-version."browser-resolve"."1.3.0";
-  by-version."browser-resolve"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-browser-resolve-1.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.3.0.tgz";
-        name = "browser-resolve-1.3.0.tgz";
-        sha1 = "54e63dac01488446ace2ebb527598884fc0c3887";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."browser-resolve" or []);
-    deps = [
-      self.by-version."resolve"."0.7.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "browser-resolve" ];
-  };
-  by-spec."browser-resolve"."~1.2.4" =
+  by-spec."browser-resolve"."~1.2.1" =
     self.by-version."browser-resolve"."1.2.4";
   by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-browser-resolve-1.2.4";
@@ -2025,99 +1731,162 @@
     ];
     passthru.names = [ "browser-resolve" ];
   };
+  by-spec."browser-resolve"."~1.2.2" =
+    self.by-version."browser-resolve"."1.2.4";
   by-spec."browserchannel"."*" =
-    self.by-version."browserchannel"."2.0.0";
-  by-version."browserchannel"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-browserchannel-2.0.0";
+    self.by-version."browserchannel"."1.2.0";
+  by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browserchannel-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
-        name = "browserchannel-2.0.0.tgz";
-        sha1 = "0f211b3cad9995e8729b2bacd46b53c027c0ea63";
+        url = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.2.0.tgz";
+        name = "browserchannel-1.2.0.tgz";
+        sha1 = "207ce6eb844e00febfdf32084f10d4757cbcf97c";
       })
     ];
     buildInputs =
       (self.nativeDeps."browserchannel" or []);
     deps = [
       self.by-version."hat"."0.0.3"
-      self.by-version."connect"."2.21.1"
-      self.by-version."request"."2.36.0"
+      self.by-version."connect"."2.14.4"
+      self.by-version."request"."2.34.0"
       self.by-version."ascii-json"."0.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserchannel" ];
   };
-  "browserchannel" = self.by-version."browserchannel"."2.0.0";
+  "browserchannel" = self.by-version."browserchannel"."1.2.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."4.2.0";
-  by-version."browserify"."4.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-4.2.0";
+    self.by-version."browserify"."3.44.2";
+  by-version."browserify"."3.44.2" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-3.44.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-4.2.0.tgz";
-        name = "browserify-4.2.0.tgz";
-        sha1 = "b23c9d630e941d89fff540f0c08a277168cc4eca";
+        url = "http://registry.npmjs.org/browserify/-/browserify-3.44.2.tgz";
+        name = "browserify-3.44.2.tgz";
+        sha1 = "ffa2788d06e8073ffd734d94c3ae272ca3dd630a";
       })
     ];
     buildInputs =
       (self.nativeDeps."browserify" or []);
     deps = [
-      self.by-version."JSONStream"."0.8.4"
+      self.by-version."JSONStream"."0.7.2"
       self.by-version."assert"."1.1.1"
       self.by-version."browser-pack"."2.0.1"
-      self.by-version."browser-resolve"."1.3.0"
+      self.by-version."browser-resolve"."1.2.4"
       self.by-version."browserify-zlib"."0.1.4"
-      self.by-version."buffer"."2.3.3"
-      self.by-version."builtins"."0.0.5"
+      self.by-version."buffer"."2.1.13"
+      self.by-version."builtins"."0.0.3"
       self.by-version."commondir"."0.0.1"
-      self.by-version."concat-stream"."1.4.6"
-      self.by-version."console-browserify"."1.1.0"
+      self.by-version."concat-stream"."1.4.5"
+      self.by-version."console-browserify"."1.0.3"
       self.by-version."constants-browserify"."0.0.1"
-      self.by-version."crypto-browserify"."2.1.8"
-      self.by-version."deep-equal"."0.2.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.2"
+      self.by-version."deps-sort"."0.1.1"
       self.by-version."derequire"."0.8.0"
-      self.by-version."domain-browser"."1.1.2"
+      self.by-version."domain-browser"."1.1.1"
       self.by-version."duplexer"."0.1.1"
-      self.by-version."events"."1.0.1"
-      self.by-version."glob"."3.2.11"
-      self.by-version."http-browserify"."1.4.1"
+      self.by-version."events"."1.0.0"
+      self.by-version."glob"."3.2.9"
+      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"."6.0.0"
-      self.by-version."module-deps"."2.1.3"
+      self.by-version."insert-module-globals"."5.0.1"
+      self.by-version."module-deps"."1.10.0"
       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.1-0"
-      self.by-version."readable-stream"."1.1.13-1"
-      self.by-version."resolve"."0.7.1"
+      self.by-version."querystring-es3"."0.2.0"
+      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"."1.0.0"
+      self.by-version."stream-browserify"."0.1.3"
       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.2"
-      self.by-version."timers-browserify"."1.0.3"
+      self.by-version."through2"."0.4.1"
+      self.by-version."timers-browserify"."1.0.1"
       self.by-version."tty-browserify"."0.0.0"
-      self.by-version."umd"."2.1.0"
+      self.by-version."umd"."2.0.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"."4.2.0";
-  by-spec."browserify-zlib"."^0.1.4" =
+  "browserify" = self.by-version."browserify"."3.44.2";
+  by-spec."browserify"."~3.38.0" =
+    self.by-version."browserify"."3.38.1";
+  by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-3.38.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/browserify/-/browserify-3.38.1.tgz";
+        name = "browserify-3.38.1.tgz";
+        sha1 = "4790937ec5b01f1c340e83521e36c4e3aaf3d7ba";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browserify" or []);
+    deps = [
+      self.by-version."JSONStream"."0.7.2"
+      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."commondir"."0.0.1"
+      self.by-version."concat-stream"."1.4.5"
+      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."derequire"."0.8.0"
+      self.by-version."domain-browser"."1.1.1"
+      self.by-version."duplexer"."0.1.1"
+      self.by-version."events"."1.0.0"
+      self.by-version."glob"."3.2.9"
+      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.8.1"
+      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."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-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."timers-browserify"."1.0.1"
+      self.by-version."tty-browserify"."0.0.0"
+      self.by-version."umd"."2.0.0"
+      self.by-version."url"."0.7.9"
+      self.by-version."util"."0.10.3"
+      self.by-version."vm-browserify"."0.0.4"
+      self.by-version."zlib-browserify"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "browserify" ];
+  };
+  by-spec."browserify-zlib"."~0.1.2" =
     self.by-version."browserify-zlib"."0.1.4";
   by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-browserify-zlib-0.1.4";
@@ -2131,14 +1900,12 @@
     buildInputs =
       (self.nativeDeps."browserify-zlib" or []);
     deps = [
-      self.by-version."pako"."0.2.3"
+      self.by-version."pako"."0.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browserify-zlib" ];
   };
-  by-spec."browserify-zlib"."~0.1.2" =
-    self.by-version."browserify-zlib"."0.1.4";
   by-spec."bson"."0.1.8" =
     self.by-version."bson"."0.1.8";
   by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -2196,61 +1963,41 @@
     ];
     passthru.names = [ "bson" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bson/-/bson-0.2.8.tgz";
-        name = "bson-0.2.8.tgz";
-        sha1 = "7ad6ddc15aafa63808942bd53c61387f825d64a1";
+        url = "http://registry.npmjs.org/bson/-/bson-0.2.7.tgz";
+        name = "bson-0.2.7.tgz";
+        sha1 = "6793161c40e5a9757091d7ee7d52a4717950236b";
       })
     ];
     buildInputs =
       (self.nativeDeps."bson" or []);
     deps = [
-      self.by-version."nan"."1.0.0"
+      self.by-version."nan"."0.8.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "bson" ];
   };
-  by-spec."bson"."0.2.9" =
-    self.by-version."bson"."0.2.9";
-  by-version."bson"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bson-0.2.9";
+  by-spec."buffer"."~2.1.4" =
+    self.by-version."buffer"."2.1.13";
+  by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-2.1.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bson/-/bson-0.2.9.tgz";
-        name = "bson-0.2.9.tgz";
-        sha1 = "ee3716a52c985ff3074b6ece3257c75ee12f3a05";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bson" or []);
-    deps = [
-      self.by-version."nan"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "bson" ];
-  };
-  by-spec."buffer"."^2.3.0" =
-    self.by-version."buffer"."2.3.3";
-  by-version."buffer"."2.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffer-2.3.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer/-/buffer-2.3.3.tgz";
-        name = "buffer-2.3.3.tgz";
-        sha1 = "eabd37c725a67ecab17a29dc3ae2b50cbd181181";
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.13.tgz";
+        name = "buffer-2.1.13.tgz";
+        sha1 = "c88838ebf79f30b8b4a707788470bea8a62c2355";
       })
     ];
     buildInputs =
       (self.nativeDeps."buffer" or []);
     deps = [
-      self.by-version."base64-js"."0.0.7"
+      self.by-version."base64-js"."0.0.6"
       self.by-version."ieee754"."1.1.3"
     ];
     peerDependencies = [
@@ -2295,27 +2042,8 @@
     ];
     passthru.names = [ "buffer-crc32" ];
   };
-  by-spec."buffer-crc32"."0.2.3" =
-    self.by-version."buffer-crc32"."0.2.3";
-  by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffer-crc32-0.2.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
-        name = "buffer-crc32-0.2.3.tgz";
-        sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffer-crc32" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffer-crc32" ];
-  };
   by-spec."buffer-crc32"."~0.2.1" =
-    self.by-version."buffer-crc32"."0.2.3";
+    self.by-version."buffer-crc32"."0.2.1";
   by-spec."buffers"."~0.1.1" =
     self.by-version."buffers"."0.1.1";
   by-version."buffers"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -2375,14 +2103,14 @@
     passthru.names = [ "buffertools" ];
   };
   by-spec."builtins"."~0.0.3" =
-    self.by-version."builtins"."0.0.5";
-  by-version."builtins"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-builtins-0.0.5";
+    self.by-version."builtins"."0.0.3";
+  by-version."builtins"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-builtins-0.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.5.tgz";
-        name = "builtins-0.0.5.tgz";
-        sha1 = "86dd881f9862856e62fd7ed7767b438c4d79b7ab";
+        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.3.tgz";
+        name = "builtins-0.0.3.tgz";
+        sha1 = "5d006166da71610bc2bcf73019f0f0cc43309755";
       })
     ];
     buildInputs =
@@ -2414,6 +2142,26 @@
     ];
     passthru.names = [ "bunyan" ];
   };
+  by-spec."bytebuffer".">=2.2 <3" =
+    self.by-version."bytebuffer"."2.3.1";
+  by-version."bytebuffer"."2.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bytebuffer-2.3.1";
+    src = [
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-2.3.1.tgz";
+        name = "bytebuffer-2.3.1.tgz";
+        sha1 = "17c2c290bfed534b06aadd6513aa5a0096ca2639";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bytebuffer" or []);
+    deps = [
+      self.by-version."long"."1.1.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bytebuffer" ];
+  };
   by-spec."bytes"."0.1.0" =
     self.by-version."bytes"."0.1.0";
   by-version."bytes"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -2471,15 +2219,15 @@
     ];
     passthru.names = [ "bytes" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
-        name = "bytes-1.0.0.tgz";
-        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+        url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
+        name = "bytes-0.3.0.tgz";
+        sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935";
       })
     ];
     buildInputs =
@@ -2490,10 +2238,12 @@
     ];
     passthru.names = [ "bytes" ];
   };
-  by-spec."bytes"."1.0.0" =
-    self.by-version."bytes"."1.0.0";
+  by-spec."bytes"."~0.2.0" =
+    self.by-version."bytes"."0.2.1";
   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 {
@@ -2663,25 +2413,6 @@
   };
   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 {
@@ -2701,30 +2432,6 @@
     ];
     passthru.names = [ "character-parser" ];
   };
-  by-spec."cheerio"."^0.17.0" =
-    self.by-version."cheerio"."0.17.0";
-  by-version."cheerio"."0.17.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cheerio-0.17.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz";
-        name = "cheerio-0.17.0.tgz";
-        sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea";
-      })
-    ];
-    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."dom-serializer"."0.0.1"
-      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 {
@@ -2869,7 +2576,27 @@
     ];
     passthru.names = [ "chownr" ];
   };
-  by-spec."class-extend"."^0.1.0" =
+  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" =
     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";
@@ -2889,10 +2616,6 @@
     ];
     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 {
@@ -2913,71 +2636,29 @@
     ];
     passthru.names = [ "clean-css" ];
   };
-  by-spec."clean-css"."~2.2.0" =
-    self.by-version."clean-css"."2.2.5";
-  by-version."clean-css"."2.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "clean-css-2.2.5";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.5.tgz";
-        name = "clean-css-2.2.5.tgz";
-        sha1 = "d0ad26eba9ec072e406984200782a250daa86cf1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clean-css" or []);
-    deps = [
-      self.by-version."commander"."2.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "clean-css" ];
-  };
-  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.6.3.tgz";
-        name = "cli-0.6.3.tgz";
-        sha1 = "31418ed08d60a1b02cf180c6d6fee3204bfe65cd";
+        url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
+        name = "cli-0.4.5.tgz";
+        sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
       })
     ];
     buildInputs =
       (self.nativeDeps."cli" or []);
     deps = [
-      self.by-version."glob"."3.2.11"
-      self.by-version."exit"."0.1.2"
+      self.by-version."glob"."3.2.9"
     ];
     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.4"
-      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";
@@ -2998,10 +2679,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 {
@@ -3016,7 +2697,7 @@
     buildInputs =
       (self.nativeDeps."cli-log" or []);
     deps = [
-      self.by-version."cli-color"."0.3.2"
+      self.by-version."cli-color"."0.2.3"
     ];
     peerDependencies = [
     ];
@@ -3101,25 +2782,6 @@
     ];
     passthru.names = [ "clone" ];
   };
-  by-spec."clone-stats"."~0.0.1" =
-    self.by-version."clone-stats"."0.0.1";
-  by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-clone-stats-0.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
-        name = "clone-stats-0.0.1.tgz";
-        sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."clone-stats" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "clone-stats" ];
-  };
   by-spec."cmd-shim"."~1.1.1" =
     self.by-version."cmd-shim"."1.1.1";
   by-version."cmd-shim"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -3141,25 +2803,6 @@
     ];
     passthru.names = [ "cmd-shim" ];
   };
-  by-spec."co"."~3.0.2" =
-    self.by-version."co"."3.0.6";
-  by-version."co"."3.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-co-3.0.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/co/-/co-3.0.6.tgz";
-        name = "co-3.0.6.tgz";
-        sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."co" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "co" ];
-  };
   by-spec."coffee-script"."*" =
     self.by-version."coffee-script"."1.7.1";
   by-version."coffee-script"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -3248,7 +2891,7 @@
     ];
     passthru.names = [ "coffee-script-redux" ];
   };
-  by-spec."collections".">=2.0.1 <3.0.0" =
+  by-spec."collections"."^2.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";
@@ -3262,21 +2905,21 @@
     buildInputs =
       (self.nativeDeps."collections" or []);
     deps = [
-      self.by-version."weak-map"."1.0.5"
+      self.by-version."weak-map"."1.0.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "collections" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/color/-/color-0.6.0.tgz";
-        name = "color-0.6.0.tgz";
-        sha1 = "53f4b27698e1fe42a19423dc092dd8ee529b4267";
+        url = "http://registry.npmjs.org/color/-/color-0.5.0.tgz";
+        name = "color-0.5.0.tgz";
+        sha1 = "4d283d8bfe4cbc7006de6b6d25a3c26f00e3ee6d";
       })
     ];
     buildInputs =
@@ -3372,22 +3015,39 @@
     self.by-version."colors"."0.6.2";
   by-spec."colors"."~0.6.2" =
     self.by-version."colors"."0.6.2";
-  by-spec."columnify"."~1.1.0" =
-    self.by-version."columnify"."1.1.0";
-  by-version."columnify"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-columnify-1.1.0";
+  by-spec."colour"."*" =
+    self.by-version."colour"."0.7.1";
+  by-version."colour"."0.7.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-colour-0.7.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/columnify/-/columnify-1.1.0.tgz";
-        name = "columnify-1.1.0.tgz";
-        sha1 = "0b908e6d4f1c80194358a1933aaf9dc49271c679";
+        url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
+        name = "colour-0.7.1.tgz";
+        sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."colour" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "colour" ];
+  };
+  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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz";
+        name = "columnify-0.1.2.tgz";
+        sha1 = "ab1a1f1e37b26ba4b87c6920fb717fe51c827042";
       })
     ];
     buildInputs =
       (self.nativeDeps."columnify" or []);
     deps = [
-      self.by-version."strip-ansi"."0.2.2"
-      self.by-version."wcwidth.js"."0.0.4"
     ];
     peerDependencies = [
     ];
@@ -3408,22 +3068,22 @@
       (self.nativeDeps."combine-source-map" or []);
     deps = [
       self.by-version."inline-source-map"."0.3.0"
-      self.by-version."convert-source-map"."0.3.4"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."convert-source-map"."0.3.3"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "combine-source-map" ];
   };
   by-spec."combined-stream"."~0.0.4" =
-    self.by-version."combined-stream"."0.0.5";
-  by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-combined-stream-0.0.5";
+    self.by-version."combined-stream"."0.0.4";
+  by-version."combined-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-combined-stream-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz";
-        name = "combined-stream-0.0.5.tgz";
-        sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2";
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz";
+        name = "combined-stream-0.0.4.tgz";
+        sha1 = "2d1a43347dbe9515a4a2796732e5b88473840b22";
       })
     ];
     buildInputs =
@@ -3454,6 +3114,26 @@
     ];
     passthru.names = [ "commander" ];
   };
+  by-spec."commander"."1.2.x" =
+    self.by-version."commander"."1.2.0";
+  by-version."commander"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commander-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz";
+        name = "commander-1.2.0.tgz";
+        sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander" or []);
+    deps = [
+      self.by-version."keypress"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
   by-spec."commander"."1.3.1" =
     self.by-version."commander"."1.3.1";
   by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -3534,29 +3214,8 @@
   };
   by-spec."commander"."2.1.x" =
     self.by-version."commander"."2.1.0";
-  by-spec."commander"."2.2.x" =
-    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.0.0" =
-    self.by-version."commander"."2.0.0";
   by-spec."commander"."~2.1.0" =
     self.by-version."commander"."2.1.0";
   by-spec."commondir"."0.0.1" =
@@ -3578,34 +3237,15 @@
     ];
     passthru.names = [ "commondir" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        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.1.0" =
-    self.by-version."compressible"."1.1.0";
-  by-version."compressible"."1.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-compressible-1.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/compressible/-/compressible-1.1.0.tgz";
-        name = "compressible-1.1.0.tgz";
-        sha1 = "124d8a7bba18a05a410a2f25bad413b1b94aff67";
+        url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
+        name = "compressible-1.0.0.tgz";
+        sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
       })
     ];
     buildInputs =
@@ -3616,46 +3256,44 @@
     ];
     passthru.names = [ "compressible" ];
   };
-  by-spec."compression"."~1.0.8" =
-    self.by-version."compression"."1.0.8";
-  by-version."compression"."1.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-compression-1.0.8";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/compression/-/compression-1.0.8.tgz";
-        name = "compression-1.0.8.tgz";
-        sha1 = "803ecc67183e71e42b1efcc6a29f6144fdd9afad";
+        url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
+        name = "compression-1.0.0.tgz";
+        sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020";
       })
     ];
     buildInputs =
       (self.nativeDeps."compression" or []);
     deps = [
-      self.by-version."accepts"."1.0.6"
-      self.by-version."bytes"."1.0.0"
-      self.by-version."compressible"."1.1.0"
-      self.by-version."on-headers"."0.0.0"
-      self.by-version."vary"."0.1.0"
+      self.by-version."bytes"."0.2.1"
+      self.by-version."negotiator"."0.3.0"
+      self.by-version."compressible"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "compression" ];
   };
   by-spec."concat-stream"."^1.4.1" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.6.tgz";
-        name = "concat-stream-1.4.6.tgz";
-        sha1 = "8cb736a556a32f020f1ddc82fa3448381c5e5cce";
+        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.5.tgz";
+        name = "concat-stream-1.4.5.tgz";
+        sha1 = "cbf6ffd17c15d58f0baeacbb47d927cf566446a6";
       })
     ];
     buildInputs =
       (self.nativeDeps."concat-stream" or []);
     deps = [
       self.by-version."inherits"."2.0.1"
-      self.by-version."typedarray"."0.0.6"
+      self.by-version."typedarray"."0.0.5"
       self.by-version."readable-stream"."1.1.13-1"
     ];
     peerDependencies = [
@@ -3663,9 +3301,7 @@
     passthru.names = [ "concat-stream" ];
   };
   by-spec."concat-stream"."~1.4.1" =
-    self.by-version."concat-stream"."1.4.6";
-  by-spec."concat-stream"."~1.4.5" =
-    self.by-version."concat-stream"."1.4.6";
+    self.by-version."concat-stream"."1.4.5";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
@@ -3702,8 +3338,8 @@
     buildInputs =
       (self.nativeDeps."config-chain" or []);
     deps = [
-      self.by-version."proto-list"."1.2.3"
-      self.by-version."ini"."1.2.1"
+      self.by-version."proto-list"."1.2.2"
+      self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
@@ -3711,31 +3347,6 @@
   };
   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.1";
-  by-version."configstore"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-configstore-0.3.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/configstore/-/configstore-0.3.1.tgz";
-        name = "configstore-0.3.1.tgz";
-        sha1 = "e1b4715994fe5f8e22e69b21d54c7a448339314d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."configstore" or []);
-    deps = [
-      self.by-version."graceful-fs"."3.0.2"
-      self.by-version."js-yaml"."3.0.2"
-      self.by-version."mkdirp"."0.5.0"
-      self.by-version."object-assign"."0.3.1"
-      self.by-version."osenv"."0.1.0"
-      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 {
@@ -3761,29 +3372,8 @@
     ];
     passthru.names = [ "configstore" ];
   };
-  by-spec."connect"."*" =
-    self.by-version."connect"."3.0.1";
-  by-version."connect"."3.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-3.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-3.0.1.tgz";
-        name = "connect-3.0.1.tgz";
-        sha1 = "030e2cdf0372b12892a6857c465a298bb944ef50";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
-    deps = [
-      self.by-version."debug"."1.0.2"
-      self.by-version."finalhandler"."0.0.2"
-      self.by-version."parseurl"."1.0.1"
-      self.by-version."utils-merge"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
-  };
+  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 {
@@ -3800,7 +3390,7 @@
     deps = [
       self.by-version."qs"."0.6.6"
       self.by-version."mime"."1.2.11"
-      self.by-version."formidable"."1.0.15"
+      self.by-version."formidable"."1.0.14"
     ];
     peerDependencies = [
     ];
@@ -3829,7 +3419,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"."1.0.2"
+      self.by-version."debug"."0.8.1"
       self.by-version."methods"."0.0.1"
       self.by-version."raw-body"."0.0.3"
       self.by-version."negotiator"."0.3.0"
@@ -3839,49 +3429,42 @@
     ];
     passthru.names = [ "connect" ];
   };
-  by-spec."connect"."2.21.1" =
-    self.by-version."connect"."2.21.1";
-  by-version."connect"."2.21.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-2.21.1";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.21.1.tgz";
-        name = "connect-2.21.1.tgz";
-        sha1 = "a948ee661674881e5615c06db982d5d47cd0aa12";
+        url = "http://registry.npmjs.org/connect/-/connect-2.14.1.tgz";
+        name = "connect-2.14.1.tgz";
+        sha1 = "e6fd676a5735ca703a89eb970f3d283fadecc2c7";
       })
     ];
     buildInputs =
       (self.nativeDeps."connect" or []);
     deps = [
       self.by-version."basic-auth-connect"."1.0.0"
-      self.by-version."body-parser"."1.4.3"
-      self.by-version."bytes"."1.0.0"
-      self.by-version."cookie"."0.1.2"
-      self.by-version."cookie-parser"."1.3.2"
-      self.by-version."cookie-signature"."1.0.4"
-      self.by-version."compression"."1.0.8"
-      self.by-version."connect-timeout"."1.1.1"
-      self.by-version."csurf"."1.2.2"
-      self.by-version."debug"."1.0.2"
-      self.by-version."depd"."0.3.0"
-      self.by-version."errorhandler"."1.1.1"
-      self.by-version."express-session"."1.5.2"
-      self.by-version."finalhandler"."0.0.2"
+      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.0.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."media-typer"."0.2.0"
-      self.by-version."method-override"."2.0.2"
-      self.by-version."morgan"."1.1.1"
-      self.by-version."multiparty"."3.2.9"
-      self.by-version."on-headers"."0.0.0"
-      self.by-version."parseurl"."1.0.1"
+      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"."2.0.0"
-      self.by-version."serve-favicon"."2.0.1"
-      self.by-version."serve-index"."1.1.4"
-      self.by-version."serve-static"."1.2.3"
-      self.by-version."type-is"."1.3.2"
-      self.by-version."vhost"."2.0.0"
+      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."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 = [
     ];
@@ -3908,7 +3491,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"."1.0.2"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -3937,7 +3520,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"."1.0.2"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -3966,14 +3549,54 @@
       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"."1.0.2"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "connect" ];
   };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.21.1";
+    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" ];
+  };
   by-spec."connect"."~2.12.0" =
     self.by-version."connect"."2.12.0";
   by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage {
@@ -4069,14 +3692,14 @@
   };
   "connect-jade-static" = self.by-version."connect-jade-static"."0.1.3";
   by-spec."connect-mongo"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz";
-        name = "connect-mongo-0.4.1.tgz";
-        sha1 = "01ed3e71558fb3f0fdc97b784ef974f9909ddd11";
+        url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.0.tgz";
+        name = "connect-mongo-0.4.0.tgz";
+        sha1 = "4cb33728334a8f10f2d9e43d31369dbc2f856336";
       })
     ];
     buildInputs =
@@ -4088,23 +3711,22 @@
     ];
     passthru.names = [ "connect-mongo" ];
   };
-  "connect-mongo" = self.by-version."connect-mongo"."0.4.1";
-  by-spec."connect-timeout"."1.1.1" =
-    self.by-version."connect-timeout"."1.1.1";
-  by-version."connect-timeout"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-timeout-1.1.1";
+  "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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.1.1.tgz";
-        name = "connect-timeout-1.1.1.tgz";
-        sha1 = "6c7e31c98f0ac68eb6d1305f67f21f5a6e90fd04";
+        url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
+        name = "connect-timeout-1.0.0.tgz";
+        sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
       })
     ];
     buildInputs =
       (self.nativeDeps."connect-timeout" or []);
     deps = [
-      self.by-version."debug"."1.0.2"
-      self.by-version."on-headers"."0.0.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -4129,28 +3751,44 @@
     ];
     passthru.names = [ "connection-parse" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        name = "console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz";
+        name = "console-browserify-0.1.6.tgz";
+        sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."console-browserify" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "console-browserify" ];
+  };
+  by-spec."console-browserify"."~1.0.1" =
+    self.by-version."console-browserify"."1.0.3";
+  by-version."console-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-console-browserify-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz";
+        name = "console-browserify-1.0.3.tgz";
+        sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e";
       })
     ];
     buildInputs =
       (self.nativeDeps."console-browserify" or []);
     deps = [
-      self.by-version."date-now"."0.1.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "console-browserify" ];
   };
-  by-spec."console-browserify"."^1.1.0" =
-    self.by-version."console-browserify"."1.1.0";
   by-spec."constantinople"."~1.0.1" =
     self.by-version."constantinople"."1.0.2";
   by-version."constantinople"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -4165,7 +3803,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.14"
+      self.by-version."uglify-js"."2.4.13"
     ];
     peerDependencies = [
     ];
@@ -4187,7 +3825,7 @@
     buildInputs =
       (self.nativeDeps."constantinople" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.14"
+      self.by-version."uglify-js"."2.4.13"
     ];
     peerDependencies = [
     ];
@@ -4213,14 +3851,14 @@
     passthru.names = [ "constants-browserify" ];
   };
   by-spec."convert-source-map"."~0.3.0" =
-    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";
+    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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
@@ -4288,6 +3926,25 @@
     ];
     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 {
@@ -4345,29 +4002,29 @@
     ];
     passthru.names = [ "cookie-jar" ];
   };
-  by-spec."cookie-parser"."1.3.2" =
-    self.by-version."cookie-parser"."1.3.2";
-  by-version."cookie-parser"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookie-parser-1.3.2";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.2.tgz";
-        name = "cookie-parser-1.3.2.tgz";
-        sha1 = "52211cc82c955d79ff0c088954407724e19cf562";
+        url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
+        name = "cookie-parser-1.0.1.tgz";
+        sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0";
       })
     ];
     buildInputs =
       (self.nativeDeps."cookie-parser" or []);
     deps = [
-      self.by-version."cookie"."0.1.2"
-      self.by-version."cookie-signature"."1.0.4"
+      self.by-version."cookie"."0.1.0"
+      self.by-version."cookie-signature"."1.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cookie-parser" ];
   };
-  by-spec."cookie-parser"."~1.3.2" =
-    self.by-version."cookie-parser"."1.3.2";
+  by-spec."cookie-parser"."~1.0.1" =
+    self.by-version."cookie-parser"."1.0.1";
   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 {
@@ -4425,25 +4082,6 @@
     ];
     passthru.names = [ "cookie-signature" ];
   };
-  by-spec."cookie-signature"."1.0.4" =
-    self.by-version."cookie-signature"."1.0.4";
-  by-version."cookie-signature"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-cookie-signature-1.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
-        name = "cookie-signature-1.0.4.tgz";
-        sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cookie-signature" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "cookie-signature" ];
-  };
   by-spec."cookiejar"."1.3.0" =
     self.by-version."cookiejar"."1.3.0";
   by-version."cookiejar"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -4463,56 +4101,35 @@
     ];
     passthru.names = [ "cookiejar" ];
   };
-  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/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";
+    self.by-version."cookies"."0.4.0";
+  by-version."cookies"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookies-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/cookies/-/cookies-0.4.1.tgz";
-        name = "cookies-0.4.1.tgz";
-        sha1 = "7d43bd00583c985acc032258b97988b7d03b629e";
+        url = "http://registry.npmjs.org/cookies/-/cookies-0.4.0.tgz";
+        name = "cookies-0.4.0.tgz";
+        sha1 = "c5d1f8b76217ed653135afe32bdad747c2fa9190";
       })
     ];
     buildInputs =
       (self.nativeDeps."cookies" or []);
     deps = [
-      self.by-version."keygrip"."1.0.1"
+      self.by-version."keygrip"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "cookies" ];
   };
-  by-spec."cookies"."~0.4.0" =
-    self.by-version."cookies"."0.4.1";
   by-spec."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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.2.tgz";
-        name = "copy-paste-0.2.2.tgz";
-        sha1 = "036942c5ab735eec9a8e0a2308759e7feadb2625";
+        url = "http://registry.npmjs.org/copy-paste/-/copy-paste-0.2.0.tgz";
+        name = "copy-paste-0.2.0.tgz";
+        sha1 = "6a83a3a073fc144adfa83cd03adb8db35953c424";
       })
     ];
     buildInputs =
@@ -4557,48 +4174,21 @@
     buildInputs =
       (self.nativeDeps."couch-login" or []);
     deps = [
-      self.by-version."request"."2.36.0"
+      self.by-version."request"."2.34.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "couch-login" ];
   };
-  by-spec."couchapp"."*" =
-    self.by-version."couchapp"."0.11.0";
-  by-version."couchapp"."0.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "couchapp-0.11.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/couchapp/-/couchapp-0.11.0.tgz";
-        name = "couchapp-0.11.0.tgz";
-        sha1 = "f09dc315d610f6f6e79fd0caf5e5d624b0cc783e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."couchapp" or []);
-    deps = [
-      self.by-version."watch"."0.8.0"
-      self.by-version."request"."2.36.0"
-      self.by-version."http-proxy"."0.8.7"
-      self.by-version."connect"."3.0.1"
-      self.by-version."nano"."5.10.0"
-      self.by-version."url"."0.10.1"
-      self.by-version."coffee-script"."1.7.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "couchapp" ];
-  };
-  "couchapp" = self.by-version."couchapp"."0.11.0";
   by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.11.0";
-  by-version."coveralls"."2.11.0" = lib.makeOverridable self.buildNodePackage {
-    name = "coveralls-2.11.0";
+    self.by-version."coveralls"."2.10.0";
+  by-version."coveralls"."2.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "coveralls-2.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.0.tgz";
-        name = "coveralls-2.11.0.tgz";
-        sha1 = "0516da3bb40672061f27d60d9504e457a57201ec";
+        url = "http://registry.npmjs.org/coveralls/-/coveralls-2.10.0.tgz";
+        name = "coveralls-2.10.0.tgz";
+        sha1 = "03f0c54070f30e0d336c79ef2b16a5c53728a7e5";
       })
     ];
     buildInputs =
@@ -4607,13 +4197,13 @@
       self.by-version."js-yaml"."3.0.1"
       self.by-version."request"."2.16.2"
       self.by-version."lcov-parse"."0.0.6"
-      self.by-version."log-driver"."1.2.4"
+      self.by-version."log-driver"."1.2.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "coveralls" ];
   };
-  "coveralls" = self.by-version."coveralls"."2.11.0";
+  "coveralls" = self.by-version."coveralls"."2.10.0";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -4633,27 +4223,6 @@
     ];
     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.3"
-    ];
-    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 {
@@ -4733,22 +4302,20 @@
     ];
     passthru.names = [ "crypto" ];
   };
-  by-spec."crypto-browserify"."^2.1.8" =
-    self.by-version."crypto-browserify"."2.1.8";
-  by-version."crypto-browserify"."2.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-crypto-browserify-2.1.8";
+  by-spec."crypto-browserify"."~1.0.9" =
+    self.by-version."crypto-browserify"."1.0.9";
+  by-version."crypto-browserify"."1.0.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-crypto-browserify-1.0.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-2.1.8.tgz";
-        name = "crypto-browserify-2.1.8.tgz";
-        sha1 = "3ef8ccd7da5a4debdd379e7d64a2ae128b9d977a";
+        url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
+        name = "crypto-browserify-1.0.9.tgz";
+        sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
       })
     ];
     buildInputs =
       (self.nativeDeps."crypto-browserify" or []);
     deps = [
-      self.by-version."ripemd160"."0.2.0"
-      self.by-version."sha.js"."2.1.3"
     ];
     peerDependencies = [
     ];
@@ -4773,29 +4340,6 @@
     ];
     passthru.names = [ "cscodegen" ];
   };
-  by-spec."csrf-tokens"."~2.0.0" =
-    self.by-version."csrf-tokens"."2.0.0";
-  by-version."csrf-tokens"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-csrf-tokens-2.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/csrf-tokens/-/csrf-tokens-2.0.0.tgz";
-        name = "csrf-tokens-2.0.0.tgz";
-        sha1 = "c821003fb8b6ad17bc977d6fd1a84bedc3ed619b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."csrf-tokens" or []);
-    deps = [
-      self.by-version."rndm"."1.0.0"
-      self.by-version."scmp"."0.0.3"
-      self.by-version."uid-safe"."1.0.1"
-      self.by-version."base64-url"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "csrf-tokens" ];
-  };
   by-spec."css"."~1.0.8" =
     self.by-version."css"."1.0.8";
   by-version."css"."1.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -4874,21 +4418,42 @@
     ];
     passthru.names = [ "css-stringify" ];
   };
-  by-spec."csurf"."1.2.2" =
-    self.by-version."csurf"."1.2.2";
-  by-version."csurf"."1.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-csurf-1.2.2";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/csurf/-/csurf-1.2.2.tgz";
-        name = "csurf-1.2.2.tgz";
-        sha1 = "2ea9f2d3f2d67b1e2253290e676b62195dcb7756";
+        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."csrf-tokens"."2.0.0"
+      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";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."csurf" or []);
+    deps = [
+      self.by-version."uid2"."0.0.3"
+      self.by-version."scmp"."0.0.3"
     ];
     peerDependencies = [
     ];
@@ -4951,27 +4516,7 @@
     ];
     passthru.names = [ "cycle" ];
   };
-  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" =
+  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";
@@ -4990,27 +4535,6 @@
     ];
     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 {
@@ -5031,14 +4555,14 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."dateformat"."~1.0.6" =
-    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";
+    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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
@@ -5050,20 +4574,19 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."1.0.2";
-  by-version."debug"."1.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-debug-1.0.2";
+    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-1.0.2.tgz";
-        name = "debug-1.0.2.tgz";
-        sha1 = "3849591c10cce648476c3c7c2e2e3416db5963c4";
+        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 = [
-      self.by-version."ms"."0.6.2"
     ];
     peerDependencies = [
     ];
@@ -5107,46 +4630,23 @@
     ];
     passthru.names = [ "debug" ];
   };
-  by-spec."debug"."1.0.2" =
-    self.by-version."debug"."1.0.2";
   by-spec."debug".">= 0.7.3 < 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.1" =
-    self.by-version."debug"."1.0.2";
-  by-spec."debug"."^1.0.2" =
-    self.by-version."debug"."1.0.2";
+  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"."~1.0.2" =
-    self.by-version."debug"."1.0.2";
   by-spec."decompress"."^0.2.0" =
-    self.by-version."decompress"."0.2.4";
-  by-version."decompress"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-0.2.4";
+    self.by-version."decompress"."0.2.3";
+  by-version."decompress"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "decompress-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.4.tgz";
-        name = "decompress-0.2.4.tgz";
-        sha1 = "33d08cc3678d3f84cb0c7606242b4ff1faf8d45a";
+        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.3.tgz";
+        name = "decompress-0.2.3.tgz";
+        sha1 = "ad471a0fc51b7193b72f60c9e040ce1a7a4b9fcc";
       })
     ];
     buildInputs =
@@ -5155,12 +4655,12 @@
       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.4"
+      self.by-version."map-key"."0.1.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.1"
-      self.by-version."rimraf"."2.2.8"
+      self.by-version."nopt"."2.2.0"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."stream-combiner"."0.0.4"
-      self.by-version."tar"."0.1.20"
+      self.by-version."tar"."0.1.19"
       self.by-version."tempfile"."0.1.3"
     ];
     peerDependencies = [
@@ -5168,14 +4668,14 @@
     passthru.names = [ "decompress" ];
   };
   by-spec."decompress-zip"."~0.0.3" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz";
-        name = "decompress-zip-0.0.8.tgz";
-        sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3";
+        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.6.tgz";
+        name = "decompress-zip-0.0.6.tgz";
+        sha1 = "263ef05b304cdcd1172858af453561c53ae017bb";
       })
     ];
     buildInputs =
@@ -5186,15 +4686,12 @@
       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.1"
-      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."nopt"."2.2.0"
     ];
     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 {
@@ -5255,17 +4752,34 @@
   };
   by-spec."deep-equal"."~0.0.0" =
     self.by-version."deep-equal"."0.0.0";
-  by-spec."deep-equal"."~0.2.1" =
-    self.by-version."deep-equal"."0.2.1";
-  by-spec."deep-extend"."~0.2.10" =
-    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";
+  by-spec."deep-equal"."~0.1.0" =
+    self.by-version."deep-equal"."0.1.2";
+  by-version."deep-equal"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-deep-equal-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz";
-        name = "deep-extend-0.2.10.tgz";
-        sha1 = "8dd87f56835e91a7da57d07f3c5472165cf5d467";
+        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
+        name = "deep-equal-0.1.2.tgz";
+        sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."deep-equal" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.8.tgz";
+        name = "deep-extend-0.2.8.tgz";
+        sha1 = "6d2893a805286e46d8243137c32fb991b50f4299";
       })
     ];
     buildInputs =
@@ -5276,8 +4790,8 @@
     ];
     passthru.names = [ "deep-extend" ];
   };
-  by-spec."deep-extend"."~0.2.5" =
-    self.by-version."deep-extend"."0.2.10";
+  by-spec."deep-extend"."~0.2.8" =
+    self.by-version."deep-extend"."0.2.8";
   by-spec."deepmerge"."*" =
     self.by-version."deepmerge"."0.2.7";
   by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage {
@@ -5317,26 +4831,6 @@
     ];
     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.3"
-    ];
-    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 {
@@ -5356,53 +4850,15 @@
     ];
     passthru.names = [ "delayed-stream" ];
   };
-  by-spec."delegates"."0.0.3" =
-    self.by-version."delegates"."0.0.3";
-  by-version."delegates"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-delegates-0.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/delegates/-/delegates-0.0.3.tgz";
-        name = "delegates-0.0.3.tgz";
-        sha1 = "4f25cbf8e1c061967f834e003f3bd18ded4baeea";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."delegates" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "delegates" ];
-  };
-  by-spec."depd"."0.3.0" =
-    self.by-version."depd"."0.3.0";
-  by-version."depd"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-depd-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/depd/-/depd-0.3.0.tgz";
-        name = "depd-0.3.0.tgz";
-        sha1 = "11c9bc28e425325fbd8b38940beff69fa5326883";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."depd" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "depd" ];
-  };
   by-spec."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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz";
-        name = "deps-sort-0.1.2.tgz";
-        sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a";
+        url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.1.tgz";
+        name = "deps-sort-0.1.1.tgz";
+        sha1 = "940d9da1f84a3891c7218ad240ec5ed6084bc8d6";
       })
     ];
     buildInputs =
@@ -5410,7 +4866,7 @@
     deps = [
       self.by-version."through"."2.3.4"
       self.by-version."JSONStream"."0.6.4"
-      self.by-version."minimist"."0.0.10"
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
@@ -5459,45 +4915,6 @@
     ];
     passthru.names = [ "detective" ];
   };
-  by-spec."dethroy"."~1.0.0" =
-    self.by-version."dethroy"."1.0.1";
-  by-version."dethroy"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-dethroy-1.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dethroy/-/dethroy-1.0.1.tgz";
-        name = "dethroy-1.0.1.tgz";
-        sha1 = "fd9e5025d9a030ae4695bf46c9feb93ded6b233b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dethroy" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "dethroy" ];
-  };
-  by-spec."dezalgo"."^1.0.0" =
-    self.by-version."dezalgo"."1.0.0";
-  by-version."dezalgo"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-dezalgo-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.0.tgz";
-        name = "dezalgo-1.0.0.tgz";
-        sha1 = "050bb723f18b5617b309f26c2dc8fe6f2573b6fc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dezalgo" or []);
-    deps = [
-      self.by-version."asap"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "dezalgo" ];
-  };
   by-spec."di"."~0.0.1" =
     self.by-version."di"."0.0.1";
   by-version."di"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -5536,7 +4953,7 @@
     ];
     passthru.names = [ "diff" ];
   };
-  by-spec."diff"."^1.0.4" =
+  by-spec."diff"."~1.0.3" =
     self.by-version."diff"."1.0.8";
   by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage {
     name = "node-diff-1.0.8";
@@ -5555,8 +4972,6 @@
     ];
     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" =
@@ -5580,57 +4995,36 @@
     ];
     passthru.names = [ "director" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
-        name = "dkim-signer-0.1.2.tgz";
-        sha1 = "2ff5d61c87d8fbff5a8b131cffc5ec3ba1c25553";
+        url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz";
+        name = "dkim-signer-0.1.0.tgz";
+        sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b";
       })
     ];
     buildInputs =
       (self.nativeDeps."dkim-signer" or []);
     deps = [
       self.by-version."punycode"."1.2.4"
-      self.by-version."mimelib"."0.2.16"
+      self.by-version."mimelib"."0.2.14"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "dkim-signer" ];
   };
-  by-spec."dom-serializer"."~0.0.0" =
-    self.by-version."dom-serializer"."0.0.1";
-  by-version."dom-serializer"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-dom-serializer-0.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
-        name = "dom-serializer-0.0.1.tgz";
-        sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."dom-serializer" or []);
-    deps = [
-      self.by-version."domelementtype"."1.1.1"
-      self.by-version."entities"."1.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "dom-serializer" ];
-  };
   by-spec."domain-browser"."~1.1.0" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz";
-        name = "domain-browser-1.1.2.tgz";
-        sha1 = "5a21f30a29a9891533915061426974dc2f14e56b";
+        url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.1.tgz";
+        name = "domain-browser-1.1.1.tgz";
+        sha1 = "0123c1b9afe3bb7c8a9e856177b2059440957de0";
       })
     ];
     buildInputs =
@@ -5660,8 +5054,6 @@
     ];
     passthru.names = [ "domelementtype" ];
   };
-  by-spec."domelementtype"."~1.1.1" =
-    self.by-version."domelementtype"."1.1.1";
   by-spec."domhandler"."2.0" =
     self.by-version."domhandler"."2.0.3";
   by-version."domhandler"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -5682,6 +5074,26 @@
     ];
     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 {
@@ -5762,55 +5174,33 @@
     ];
     passthru.names = [ "domutils" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        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.18";
-  by-version."download"."0.1.18" = lib.makeOverridable self.buildNodePackage {
-    name = "download-0.1.18";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/download/-/download-0.1.18.tgz";
-        name = "download-0.1.18.tgz";
-        sha1 = "f1b0aaa42c2d0e2145ffcf6648ef8ea6f80b6a0b";
+        url = "http://registry.npmjs.org/download/-/download-0.1.16.tgz";
+        name = "download-0.1.16.tgz";
+        sha1 = "46783e7f590d1c0d49eb1915ab8941c74cb45e99";
       })
     ];
     buildInputs =
       (self.nativeDeps."download" or []);
     deps = [
-      self.by-version."decompress"."0.2.4"
-      self.by-version."each-async"."0.1.3"
+      self.by-version."decompress"."0.2.3"
+      self.by-version."each-async"."0.1.2"
       self.by-version."get-stdin"."0.1.0"
-      self.by-version."get-urls"."0.1.2"
+      self.by-version."get-urls"."0.1.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."nopt"."2.2.1"
-      self.by-version."request"."2.36.0"
-      self.by-version."through2"."0.4.2"
+      self.by-version."nopt"."2.2.0"
+      self.by-version."request"."2.34.0"
+      self.by-version."through2"."0.4.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "download" ];
   };
-  by-spec."download"."~0.1.6" =
-    self.by-version."download"."0.1.18";
   by-spec."dox"."~0.4.4" =
     self.by-version."dox"."0.4.4";
   by-version."dox"."0.4.4" = lib.makeOverridable self.buildNodePackage {
@@ -5870,35 +5260,15 @@
     ];
     passthru.names = [ "duplexer" ];
   };
-  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/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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.3.tgz";
-        name = "each-async-0.1.3.tgz";
-        sha1 = "b436025b08da2f86608025519e3096763dedfca3";
+        url = "http://registry.npmjs.org/each-async/-/each-async-0.1.2.tgz";
+        name = "each-async-0.1.2.tgz";
+        sha1 = "d5b900bd92705ed5b8cad3307a6536adb0f134c6";
       })
     ];
     buildInputs =
@@ -5909,15 +5279,15 @@
     ];
     passthru.names = [ "each-async" ];
   };
-  by-spec."editor"."~0.1.0" =
-    self.by-version."editor"."0.1.0";
-  by-version."editor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-editor-0.1.0";
+  by-spec."editor"."0.0.5" =
+    self.by-version."editor"."0.0.5";
+  by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-editor-0.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz";
-        name = "editor-0.1.0.tgz";
-        sha1 = "542f4662c6a8c88e862fc11945e204e51981b9a1";
+        url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz";
+        name = "editor-0.0.5.tgz";
+        sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a";
       })
     ];
     buildInputs =
@@ -5928,25 +5298,6 @@
     ];
     passthru.names = [ "editor" ];
   };
-  by-spec."ee-first"."1.0.3" =
-    self.by-version."ee-first"."1.0.3";
-  by-version."ee-first"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ee-first-1.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz";
-        name = "ee-first-1.0.3.tgz";
-        sha1 = "6c98c4089abecb5a7b85c1ac449aa603d3b3dabe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ee-first" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ee-first" ];
-  };
   by-spec."ejs"."0.8.3" =
     self.by-version."ejs"."0.8.3";
   by-version."ejs"."0.8.3" = lib.makeOverridable self.buildNodePackage {
@@ -5985,46 +5336,45 @@
     ];
     passthru.names = [ "emitter-component" ];
   };
-  by-spec."encoding"."~0.1.7" =
-    self.by-version."encoding"."0.1.8";
-  by-version."encoding"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-encoding-0.1.8";
+  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/encoding/-/encoding-0.1.8.tgz";
-        name = "encoding-0.1.8.tgz";
-        sha1 = "3c48d355f6f4da0545de88c6f2673ccf70df11e7";
+        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" =
+    self.by-version."encoding"."0.1.7";
+  by-version."encoding"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-encoding-0.1.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/encoding/-/encoding-0.1.7.tgz";
+        name = "encoding-0.1.7.tgz";
+        sha1 = "25cc19b34e9225d120c2ea769f9136c91cecc908";
       })
     ];
     buildInputs =
       (self.nativeDeps."encoding" or []);
     deps = [
-      self.by-version."iconv-lite"."0.4.3"
+      self.by-version."iconv-lite"."0.2.11"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "encoding" ];
   };
-  by-spec."end-of-stream"."~0.1.3" =
-    self.by-version."end-of-stream"."0.1.5";
-  by-version."end-of-stream"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-end-of-stream-0.1.5";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
-        name = "end-of-stream-0.1.5.tgz";
-        sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
-      })
-    ];
-    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 {
@@ -6044,44 +5394,6 @@
     ];
     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 {
@@ -6105,88 +5417,25 @@
     ];
     passthru.names = [ "envify" ];
   };
-  by-spec."error-inject"."~1.0.0" =
-    self.by-version."error-inject"."1.0.0";
-  by-version."error-inject"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-error-inject-1.0.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz";
-        name = "error-inject-1.0.0.tgz";
-        sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."error-inject" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "error-inject" ];
-  };
-  by-spec."errorhandler"."1.1.1" =
-    self.by-version."errorhandler"."1.1.1";
-  by-version."errorhandler"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-errorhandler-1.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz";
-        name = "errorhandler-1.1.1.tgz";
-        sha1 = "18defd436d8ca2efe0a2d886c5c4d6ee6d76d691";
+        url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
+        name = "errorhandler-1.0.0.tgz";
+        sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a";
       })
     ];
     buildInputs =
       (self.nativeDeps."errorhandler" or []);
     deps = [
-      self.by-version."accepts"."1.0.6"
-      self.by-version."escape-html"."1.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "errorhandler" ];
   };
-  by-spec."errs"."~0.2.4" =
-    self.by-version."errs"."0.2.4";
-  by-version."errs"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-errs-0.2.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/errs/-/errs-0.2.4.tgz";
-        name = "errs-0.2.4.tgz";
-        sha1 = "48ccefec94fd3e613d6469840dd1c038937983f6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."errs" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "errs" ];
-  };
-  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 {
@@ -6206,49 +5455,6 @@
     ];
     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 {
@@ -6271,17 +5477,15 @@
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
-  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.3";
-  by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.3.3";
+    self.by-version."escodegen"."1.3.2";
+  by-version."escodegen"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
-        name = "escodegen-1.3.3.tgz";
-        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.2.tgz";
+        name = "escodegen-1.3.2.tgz";
+        sha1 = "bb0f434dbd594f2060639a79b4b06259dd5372de";
       })
     ];
     buildInputs =
@@ -6290,7 +5494,7 @@
       self.by-version."esutils"."1.0.0"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esprima"."1.1.1"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
@@ -6312,7 +5516,7 @@
     deps = [
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.3.2"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
@@ -6337,14 +5541,12 @@
       self.by-version."esprima"."1.0.4"
       self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     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 {
@@ -6403,7 +5605,7 @@
       self.by-version."escope"."1.0.1"
       self.by-version."escodegen"."0.0.28"
       self.by-version."estraverse"."1.3.2"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
       self.by-version."esshorten"."0.0.2"
       self.by-version."optimist"."0.6.1"
     ];
@@ -6411,15 +5613,15 @@
     ];
     passthru.names = [ "esmangle" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz";
-        name = "esprima-1.2.2.tgz";
-        sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b";
+        url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+        name = "esprima-1.1.1.tgz";
+        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
       })
     ];
     buildInputs =
@@ -6455,23 +5657,6 @@
     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 {
@@ -6657,27 +5842,6 @@
     ];
     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 {
@@ -6718,14 +5882,14 @@
     passthru.names = [ "eventemitter2" ];
   };
   by-spec."eventemitter2"."~0.4.11" =
-    self.by-version."eventemitter2"."0.4.14";
-  by-version."eventemitter2"."0.4.14" = lib.makeOverridable self.buildNodePackage {
-    name = "node-eventemitter2-0.4.14";
+    self.by-version."eventemitter2"."0.4.13";
+  by-version."eventemitter2"."0.4.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-eventemitter2-0.4.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
-        name = "eventemitter2-0.4.14.tgz";
-        sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
+        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.13.tgz";
+        name = "eventemitter2-0.4.13.tgz";
+        sha1 = "0a8ab97f9c1b563361b8927f9e80606277509153";
       })
     ];
     buildInputs =
@@ -6737,35 +5901,16 @@
     passthru.names = [ "eventemitter2" ];
   };
   by-spec."eventemitter2"."~0.4.13" =
-    self.by-version."eventemitter2"."0.4.14";
-  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/eventemitter3/-/eventemitter3-0.1.2.tgz";
-        name = "eventemitter3-0.1.2.tgz";
-        sha1 = "4ede96d72b971a217987df4f1d4ca54dd8d20b79";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."eventemitter3" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "eventemitter3" ];
-  };
+    self.by-version."eventemitter2"."0.4.13";
   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";
+    self.by-version."events"."1.0.0";
+  by-version."events"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-events-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/events/-/events-1.0.1.tgz";
-        name = "events-1.0.1.tgz";
-        sha1 = "386f6471cbb609e7925e7bfe7468634b9e069ac2";
+        url = "http://registry.npmjs.org/events/-/events-1.0.0.tgz";
+        name = "events-1.0.0.tgz";
+        sha1 = "63c0f80c74d1435e8eb03b54306a9d8e8f6f9da0";
       })
     ];
     buildInputs =
@@ -6812,12 +5957,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.9"
-      self.by-version."xml2js"."0.4.4"
+      self.by-version."openid"."0.5.8"
+      self.by-version."xml2js"."0.4.2"
       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.12.1"
+      self.by-version."express"."3.5.1"
     ];
     peerDependencies = [
     ];
@@ -6843,7 +5988,7 @@
     ];
     passthru.names = [ "execSync" ];
   };
-  by-spec."exit"."0.1.2" =
+  by-spec."exit"."0.1.x" =
     self.by-version."exit"."0.1.2";
   by-version."exit"."0.1.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-exit-0.1.2";
@@ -6862,49 +6007,45 @@
     ];
     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.4.5";
-  by-version."express"."4.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-4.4.5";
+    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.4.5.tgz";
-        name = "express-4.4.5.tgz";
-        sha1 = "5f2f302f277187abd721c3a36e44d86c5e3f03eb";
+        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."accepts"."1.0.6"
-      self.by-version."buffer-crc32"."0.2.3"
-      self.by-version."debug"."1.0.2"
-      self.by-version."escape-html"."1.0.1"
-      self.by-version."methods"."1.0.1"
       self.by-version."parseurl"."1.0.1"
-      self.by-version."proxy-addr"."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."send"."0.4.3"
-      self.by-version."serve-static"."1.2.3"
-      self.by-version."type-is"."1.2.1"
-      self.by-version."vary"."0.1.0"
-      self.by-version."cookie"."0.1.2"
+      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."cookie-signature"."1.0.4"
+      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" ];
   };
-  "express" = self.by-version."express"."4.4.5";
+  "express" = self.by-version."express"."4.0.0";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -6947,12 +6088,12 @@
       self.by-version."range-parser"."0.0.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."cookie"."0.0.5"
-      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."buffer-crc32"."0.2.1"
       self.by-version."fresh"."0.1.0"
       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"."1.0.2"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -6982,51 +6123,45 @@
       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"."1.0.2"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.12.1";
-  by-version."express"."3.12.1" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.12.1";
+    self.by-version."express"."3.5.1";
+  by-version."express"."3.5.1" = lib.makeOverridable self.buildNodePackage {
+    name = "express-3.5.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.12.1.tgz";
-        name = "express-3.12.1.tgz";
-        sha1 = "f13d260d1ac6ebc4913a42dfee913cdc65dd96d4";
+        url = "http://registry.npmjs.org/express/-/express-3.5.1.tgz";
+        name = "express-3.5.1.tgz";
+        sha1 = "4b333e1117faca336a538f4c724140b9ce1a87e7";
       })
     ];
     buildInputs =
       (self.nativeDeps."express" or []);
     deps = [
-      self.by-version."buffer-crc32"."0.2.3"
-      self.by-version."connect"."2.21.1"
+      self.by-version."connect"."2.14.1"
       self.by-version."commander"."1.3.2"
-      self.by-version."debug"."1.0.2"
-      self.by-version."depd"."0.3.0"
-      self.by-version."escape-html"."1.0.1"
-      self.by-version."media-typer"."0.2.0"
-      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.3"
-      self.by-version."vary"."0.1.0"
-      self.by-version."cookie"."0.1.2"
+      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."fresh"."0.2.2"
-      self.by-version."cookie-signature"."1.0.4"
+      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.4.5";
+    self.by-version."express"."4.0.0";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -7046,55 +6181,21 @@
       self.by-version."range-parser"."0.0.4"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."cookie"."0.0.5"
-      self.by-version."buffer-crc32"."0.2.3"
+      self.by-version."buffer-crc32"."0.2.1"
       self.by-version."fresh"."0.1.0"
       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.2"
-    ];
-    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.4.5" =
-    self.by-version."express"."4.4.5";
+  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 {
@@ -7114,7 +6215,7 @@
       self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
-      self.by-version."express"."4.4.5"
+      self.by-version."express"."4.0.0"
     ];
     passthru.names = [ "express-form" ];
   };
@@ -7138,55 +6239,51 @@
     ];
     passthru.names = [ "express-partials" ];
   };
-  by-spec."express-session"."~1.5.2" =
-    self.by-version."express-session"."1.5.2";
-  by-version."express-session"."1.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-session-1.5.2";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.5.2.tgz";
-        name = "express-session-1.5.2.tgz";
-        sha1 = "e7a4ebef8a1bffc13232dd09fe6ab5f0331e330f";
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
+        name = "express-session-1.0.2.tgz";
+        sha1 = "004478c742561774411ceb79733155a56b6d49eb";
       })
     ];
     buildInputs =
       (self.nativeDeps."express-session" or []);
     deps = [
-      self.by-version."buffer-crc32"."0.2.3"
-      self.by-version."cookie"."0.1.2"
-      self.by-version."cookie-signature"."1.0.4"
-      self.by-version."debug"."1.0.2"
-      self.by-version."depd"."0.3.0"
-      self.by-version."on-headers"."0.0.0"
-      self.by-version."uid-safe"."1.0.1"
       self.by-version."utils-merge"."1.0.0"
+      self.by-version."cookie"."0.1.0"
+      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"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express-session" ];
   };
-  by-spec."express-session"."~1.6.1" =
-    self.by-version."express-session"."1.6.1";
-  by-version."express-session"."1.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-session-1.6.1";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-session/-/express-session-1.6.1.tgz";
-        name = "express-session-1.6.1.tgz";
-        sha1 = "b2614a9e6dd64442b2fafac9646e6b559f6bcc8e";
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.3.tgz";
+        name = "express-session-1.0.3.tgz";
+        sha1 = "a45ec65dda263f74f3b5b9c6da0ac74c36ac0639";
       })
     ];
     buildInputs =
       (self.nativeDeps."express-session" or []);
     deps = [
-      self.by-version."buffer-crc32"."0.2.3"
-      self.by-version."cookie"."0.1.2"
-      self.by-version."cookie-signature"."1.0.4"
-      self.by-version."debug"."1.0.2"
-      self.by-version."depd"."0.3.0"
-      self.by-version."on-headers"."0.0.0"
-      self.by-version."uid-safe"."1.0.1"
       self.by-version."utils-merge"."1.0.0"
+      self.by-version."cookie"."0.1.2"
+      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"
     ];
     peerDependencies = [
     ];
@@ -7212,26 +6309,6 @@
     passthru.names = [ "ext-list" ];
   };
   by-spec."extend"."*" =
-    self.by-version."extend"."1.3.0";
-  by-version."extend"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-extend-1.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
-        name = "extend-1.3.0.tgz";
-        sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."extend" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "extend" ];
-  };
-  "extend" = self.by-version."extend"."1.3.0";
-  by-spec."extend"."~1.2.1" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-extend-1.2.1";
@@ -7250,6 +6327,9 @@
     ];
     passthru.names = [ "extend" ];
   };
+  "extend" = self.by-version."extend"."1.2.1";
+  by-spec."extend"."~1.2.1" =
+    self.by-version."extend"."1.2.1";
   by-spec."extname"."^0.1.1" =
     self.by-version."extname"."0.1.2";
   by-version."extname"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -7265,7 +6345,7 @@
       (self.nativeDeps."extname" or []);
     deps = [
       self.by-version."ext-list"."0.1.0"
-      self.by-version."map-key"."0.1.4"
+      self.by-version."map-key"."0.1.1"
       self.by-version."underscore.string"."2.3.3"
     ];
     peerDependencies = [
@@ -7365,15 +6445,33 @@
     buildInputs =
       (self.nativeDeps."faye-websocket" or []);
     deps = [
-      self.by-version."websocket-driver"."0.3.4"
+      self.by-version."websocket-driver"."0.3.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "faye-websocket" ];
   };
   "faye-websocket" = self.by-version."faye-websocket"."0.7.2";
-  by-spec."faye-websocket"."0.7.2" =
-    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."fetch-bower"."*" =
     self.by-version."fetch-bower"."2.0.0";
   by-version."fetch-bower"."2.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -7390,8 +6488,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.6"
-      self.by-version."glob"."3.2.11"
+      self.by-version."bower"."1.3.2"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
@@ -7422,32 +6520,6 @@
     ];
     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 {
@@ -7464,8 +6536,8 @@
     deps = [
       self.by-version."lodash"."2.1.0"
       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."rimraf"."2.2.6"
+      self.by-version."glob"."3.2.9"
       self.by-version."minimatch"."0.2.14"
       self.by-version."findup-sync"."0.1.3"
       self.by-version."isbinaryfile"."0.1.9"
@@ -7474,8 +6546,8 @@
     ];
     passthru.names = [ "file-utils" ];
   };
-  by-spec."file-utils"."~0.2.0" =
-    self.by-version."file-utils"."0.2.0";
+  by-spec."file-utils"."~0.1.5" =
+    self.by-version."file-utils"."0.1.5";
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage {
@@ -7490,43 +6562,22 @@
     buildInputs =
       (self.nativeDeps."fileset" or []);
     deps = [
-      self.by-version."minimatch"."0.3.0"
-      self.by-version."glob"."3.2.11"
+      self.by-version."minimatch"."0.2.14"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fileset" ];
   };
-  by-spec."finalhandler"."0.0.2" =
-    self.by-version."finalhandler"."0.0.2";
-  by-version."finalhandler"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-finalhandler-0.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.2.tgz";
-        name = "finalhandler-0.0.2.tgz";
-        sha1 = "0603d875ee87d567a266692815cc8ad44fcceeda";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."finalhandler" or []);
-    deps = [
-      self.by-version."debug"."1.0.2"
-      self.by-version."escape-html"."1.0.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "finalhandler" ];
-  };
   by-spec."findit".">=1.1.0 <2.0.0" =
-    self.by-version."findit"."1.2.0";
-  by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-findit-1.2.0";
+    self.by-version."findit"."1.1.1";
+  by-version."findit"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-findit-1.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
-        name = "findit-1.2.0.tgz";
-        sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
+        url = "http://registry.npmjs.org/findit/-/findit-1.1.1.tgz";
+        name = "findit-1.1.1.tgz";
+        sha1 = "b460e2f7633d78ed2c217c77c4209ecacaf8262a";
       })
     ];
     buildInputs =
@@ -7537,7 +6588,7 @@
     ];
     passthru.names = [ "findit" ];
   };
-  by-spec."findup"."^0.1.3" =
+  by-spec."findup"."~0.1.3" =
     self.by-version."findup"."0.1.5";
   by-version."findup"."0.1.5" = lib.makeOverridable self.buildNodePackage {
     name = "findup-0.1.5";
@@ -7558,7 +6609,7 @@
     ];
     passthru.names = [ "findup" ];
   };
-  by-spec."findup-sync"."^0.1.2" =
+  by-spec."findup-sync"."~0.1.0" =
     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";
@@ -7572,58 +6623,15 @@
     buildInputs =
       (self.nativeDeps."findup-sync" or []);
     deps = [
-      self.by-version."glob"."3.2.11"
+      self.by-version."glob"."3.2.9"
       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.2.2" =
-    self.by-version."finished"."1.2.2";
-  by-version."finished"."1.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-finished-1.2.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/finished/-/finished-1.2.2.tgz";
-        name = "finished-1.2.2.tgz";
-        sha1 = "41608eafadfd65683b46a1220bc4b1ec3daedcd8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."finished" or []);
-    deps = [
-      self.by-version."ee-first"."1.0.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "finished" ];
-  };
-  by-spec."finished"."~1.2.0" =
-    self.by-version."finished"."1.2.2";
-  by-spec."first-chunk-stream"."^0.1.0" =
-    self.by-version."first-chunk-stream"."0.1.0";
-  by-version."first-chunk-stream"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-first-chunk-stream-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-0.1.0.tgz";
-        name = "first-chunk-stream-0.1.0.tgz";
-        sha1 = "755d3ec14d49a86e3d2fcc08beead5c0ca2b9c0a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."first-chunk-stream" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "first-chunk-stream" ];
-  };
   by-spec."flatiron"."*" =
     self.by-version."flatiron"."0.3.11";
   by-version."flatiron"."0.3.11" = lib.makeOverridable self.buildNodePackage {
@@ -7650,28 +6658,6 @@
   "flatiron" = self.by-version."flatiron"."0.3.11";
   by-spec."flatiron"."~0.3.11" =
     self.by-version."flatiron"."0.3.11";
-  by-spec."follow"."~0.11.2" =
-    self.by-version."follow"."0.11.2";
-  by-version."follow"."0.11.2" = lib.makeOverridable self.buildNodePackage {
-    name = "follow-0.11.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/follow/-/follow-0.11.2.tgz";
-        name = "follow-0.11.2.tgz";
-        sha1 = "7a3ed97593d3b23980aaa2039c9bb26233871d98";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."follow" or []);
-    deps = [
-      self.by-version."request"."2.34.0"
-      self.by-version."browser-request"."0.3.1"
-      self.by-version."debug"."0.7.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "follow" ];
-  };
   by-spec."follow-redirects"."0.0.3" =
     self.by-version."follow-redirects"."0.0.3";
   by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -7712,34 +6698,15 @@
     ];
     passthru.names = [ "forEachAsync" ];
   };
-  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/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";
+    self.by-version."forever"."0.11.0";
+  by-version."forever"."0.11.0" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forever/-/forever-0.11.1.tgz";
-        name = "forever-0.11.1.tgz";
-        sha1 = "50ac8744c0a6e0c266524c4746397f74d6b09c5b";
+        url = "http://registry.npmjs.org/forever/-/forever-0.11.0.tgz";
+        name = "forever-0.11.0.tgz";
+        sha1 = "97de678915c64dacce2ccbfb94620723b308d44f";
       })
     ];
     buildInputs =
@@ -7762,7 +6729,7 @@
     ];
     passthru.names = [ "forever" ];
   };
-  "forever" = self.by-version."forever"."0.11.1";
+  "forever" = self.by-version."forever"."0.11.0";
   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 {
@@ -7854,28 +6821,6 @@
   };
   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.5"
-      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 {
@@ -7890,7 +6835,7 @@
     buildInputs =
       (self.nativeDeps."form-data" or []);
     deps = [
-      self.by-version."combined-stream"."0.0.5"
+      self.by-version."combined-stream"."0.0.4"
       self.by-version."mime"."1.2.11"
       self.by-version."async"."0.2.10"
     ];
@@ -7899,22 +6844,22 @@
     passthru.names = [ "form-data" ];
   };
   by-spec."form-data"."~0.1.0" =
-    self.by-version."form-data"."0.1.4";
-  by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-form-data-0.1.4";
+    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.4.tgz";
-        name = "form-data-0.1.4.tgz";
-        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+        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.5"
+      self.by-version."combined-stream"."0.0.4"
       self.by-version."mime"."1.2.11"
-      self.by-version."async"."0.9.0"
+      self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
     ];
@@ -8017,24 +6962,7 @@
     passthru.names = [ "formidable" ];
   };
   by-spec."formidable"."1.0.x" =
-    self.by-version."formidable"."1.0.15";
-  by-version."formidable"."1.0.15" = lib.makeOverridable self.buildNodePackage {
-    name = "node-formidable-1.0.15";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz";
-        name = "formidable-1.0.15.tgz";
-        sha1 = "91363d59cc51ddca2be84ca0336ec0135606c155";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."formidable" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "formidable" ];
-  };
+    self.by-version."formidable"."1.0.14";
   by-spec."fresh"."0.1.0" =
     self.by-version."fresh"."0.1.0";
   by-version."fresh"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -8111,33 +7039,12 @@
       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.8"
+      self.by-version."rimraf"."2.2.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fs-extra" ];
   };
-  by-spec."fs-vacuum"."~1.2.1" =
-    self.by-version."fs-vacuum"."1.2.1";
-  by-version."fs-vacuum"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fs-vacuum-1.2.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.1.tgz";
-        name = "fs-vacuum-1.2.1.tgz";
-        sha1 = "1bc3c62da30d6272569b8b9089c9811abb0a600b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fs-vacuum" or []);
-    deps = [
-      self.by-version."graceful-fs"."3.0.2"
-      self.by-version."rimraf"."2.2.8"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "fs-vacuum" ];
-  };
   by-spec."fs-walk"."*" =
     self.by-version."fs-walk"."0.0.1";
   by-version."fs-walk"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -8152,7 +7059,7 @@
     buildInputs =
       (self.nativeDeps."fs-walk" or []);
     deps = [
-      self.by-version."async"."0.9.0"
+      self.by-version."async"."0.7.0"
     ];
     peerDependencies = [
     ];
@@ -8204,186 +7111,124 @@
     passthru.names = [ "fsevents" ];
   };
   by-spec."fstream"."0" =
-    self.by-version."fstream"."0.1.28";
-  by-version."fstream"."0.1.28" = lib.makeOverridable self.buildNodePackage {
-    name = "node-fstream-0.1.28";
+    self.by-version."fstream"."0.1.25";
+  by-version."fstream"."0.1.25" = lib.makeOverridable self.buildNodePackage {
+    name = "node-fstream-0.1.25";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.28.tgz";
-        name = "fstream-0.1.28.tgz";
-        sha1 = "2b9286f3a646e30075efd0354729361c4b762a29";
+        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz";
+        name = "fstream-0.1.25.tgz";
+        sha1 = "deef2db7c7898357c2b37202212a9e5b36abc732";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream" or []);
     deps = [
-      self.by-version."graceful-fs"."3.0.2"
-      self.by-version."inherits"."2.0.1"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."rimraf"."2.2.8"
+      self.by-version."graceful-fs"."2.0.3"
+      self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fstream" ];
   };
   by-spec."fstream"."~0.1.17" =
-    self.by-version."fstream"."0.1.28";
+    self.by-version."fstream"."0.1.25";
   by-spec."fstream"."~0.1.22" =
-    self.by-version."fstream"."0.1.28";
-  by-spec."fstream"."~0.1.28" =
-    self.by-version."fstream"."0.1.28";
+    self.by-version."fstream"."0.1.25";
+  by-spec."fstream"."~0.1.25" =
+    self.by-version."fstream"."0.1.25";
   by-spec."fstream"."~0.1.8" =
-    self.by-version."fstream"."0.1.28";
-  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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.8.tgz";
-        name = "fstream-ignore-0.0.8.tgz";
-        sha1 = "cc4830fb9963178be5d9eb37569a4a0785cf9e53";
+        url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
+        name = "fstream-ignore-0.0.7.tgz";
+        sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream-ignore" or []);
     deps = [
-      self.by-version."fstream"."0.1.28"
+      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.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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.7.tgz";
-        name = "fstream-npm-0.1.7.tgz";
-        sha1 = "423dc5d1d1fcb7d878501f43c7e11a33292bd55f";
+        url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.6.tgz";
+        name = "fstream-npm-0.1.6.tgz";
+        sha1 = "1369323075d9bd85cfcc9409f33f0d6fe5be104d";
       })
     ];
     buildInputs =
       (self.nativeDeps."fstream-npm" or []);
     deps = [
-      self.by-version."fstream-ignore"."0.0.8"
+      self.by-version."fstream-ignore"."0.0.7"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "fstream-npm" ];
   };
-  by-spec."fullname"."^0.1.0" =
-    self.by-version."fullname"."0.1.0";
-  by-version."fullname"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "fullname-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fullname/-/fullname-0.1.0.tgz";
-        name = "fullname-0.1.0.tgz";
-        sha1 = "51740585ffb772ea7c6033f829d83dd1c1e09427";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fullname" or []);
-    deps = [
-      self.by-version."fullname-native"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "fullname" ];
-  };
-  by-spec."fullname-native"."^0.1.0" =
-    self.by-version."fullname-native"."0.1.1";
-  by-version."fullname-native"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "fullname-native-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fullname-native/-/fullname-native-0.1.1.tgz";
-        name = "fullname-native-0.1.1.tgz";
-        sha1 = "a48e8343bc7213031fa85394c60eb39049a1e4ff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fullname-native" or []);
-    deps = [
-      self.by-version."nan"."0.8.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "fullname-native" ];
-  };
-  by-spec."gaze"."^0.5.1" =
-    self.by-version."gaze"."0.5.1";
-  by-version."gaze"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-gaze-0.5.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz";
-        name = "gaze-0.5.1.tgz";
-        sha1 = "22e731078ef3e49d1c4ab1115ac091192051824c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gaze" or []);
-    deps = [
-      self.by-version."globule"."0.1.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "gaze" ];
-  };
   by-spec."generator-angular"."*" =
-    self.by-version."generator-angular"."0.9.2";
-  by-version."generator-angular"."0.9.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-angular-0.9.2";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.9.2.tgz";
-        name = "generator-angular-0.9.2.tgz";
-        sha1 = "0d69ca85a7f10a4465c6d5d7374ecfff9736cc67";
+        url = "http://registry.npmjs.org/generator-angular/-/generator-angular-0.8.0.tgz";
+        name = "generator-angular-0.8.0.tgz";
+        sha1 = "c2115b1a7a304b884b7f8857cade77dc36b63d13";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-angular" or []);
     deps = [
-      self.by-version."wiredep"."1.8.1"
-      self.by-version."yeoman-generator"."0.16.0"
-      self.by-version."yosay"."0.2.1"
       self.by-version."chalk"."0.4.0"
+      self.by-version."wiredep"."1.0.0"
+      self.by-version."yeoman-generator"."0.16.0"
     ];
     peerDependencies = [
-      self.by-version."generator-karma"."0.8.3"
-      self.by-version."yo"."1.2.0"
+      self.by-version."generator-karma"."0.7.0"
+      self.by-version."yo"."1.1.2"
     ];
     passthru.names = [ "generator-angular" ];
   };
-  "generator-angular" = self.by-version."generator-angular"."0.9.2";
-  by-spec."generator-karma".">=0.8.2" =
-    self.by-version."generator-karma"."0.8.3";
-  by-version."generator-karma"."0.8.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-karma-0.8.3";
+  "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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.8.3.tgz";
-        name = "generator-karma-0.8.3.tgz";
-        sha1 = "6399fda9fc6cbab73568707e83fab73a915acbc8";
+        url = "http://registry.npmjs.org/generator-karma/-/generator-karma-0.7.0.tgz";
+        name = "generator-karma-0.7.0.tgz";
+        sha1 = "aaa2b6d8905b687343fe6a10b15279afd984048d";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-karma" or []);
     deps = [
-      self.by-version."underscore"."1.6.0"
-      self.by-version."yeoman-generator"."0.17.1"
+      self.by-version."yeoman-generator"."0.16.0"
     ];
     peerDependencies = [
-      self.by-version."yo"."1.2.0"
+      self.by-version."yo"."1.1.2"
     ];
     passthru.names = [ "generator-karma" ];
   };
@@ -8404,36 +7249,35 @@
       self.by-version."yeoman-generator"."0.14.2"
     ];
     peerDependencies = [
-      self.by-version."yo"."1.2.0"
+      self.by-version."yo"."1.1.2"
     ];
     passthru.names = [ "generator-mocha" ];
   };
   by-spec."generator-webapp"."*" =
-    self.by-version."generator-webapp"."0.5.0-rc.1";
-  by-version."generator-webapp"."0.5.0-rc.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-webapp-0.5.0-rc.1";
+    self.by-version."generator-webapp"."0.4.9";
+  by-version."generator-webapp"."0.4.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-webapp-0.4.9";
     src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.5.0-rc.1.tgz";
-        name = "generator-webapp-0.5.0-rc.1.tgz";
-        sha1 = "1f126a6d876d65c8b464f56cfb37386ab110565d";
+      (fetchurl {
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.9.tgz";
+        name = "generator-webapp-0.4.9.tgz";
+        sha1 = "df8aa10af9bac7fd59f4072b9cdf0f120e8bb611";
       })
     ];
     buildInputs =
       (self.nativeDeps."generator-webapp" or []);
     deps = [
+      self.by-version."yeoman-generator"."0.16.0"
+      self.by-version."cheerio"."0.13.1"
       self.by-version."chalk"."0.4.0"
-      self.by-version."cheerio"."0.17.0"
-      self.by-version."yeoman-generator"."0.17.0"
-      self.by-version."yosay"."0.2.1"
     ];
     peerDependencies = [
-      self.by-version."yo"."1.2.0"
+      self.by-version."yo"."1.1.2"
       self.by-version."generator-mocha"."0.1.3"
     ];
     passthru.names = [ "generator-webapp" ];
   };
-  "generator-webapp" = self.by-version."generator-webapp"."0.5.0-rc.1";
+  "generator-webapp" = self.by-version."generator-webapp"."0.4.9";
   by-spec."get-stdin"."^0.1.0" =
     self.by-version."get-stdin"."0.1.0";
   by-version."get-stdin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -8454,14 +7298,14 @@
     passthru.names = [ "get-stdin" ];
   };
   by-spec."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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.2.tgz";
-        name = "get-urls-0.1.2.tgz";
-        sha1 = "92a3e5ce2b9af2d2764ff5198681db373227b844";
+        url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.1.tgz";
+        name = "get-urls-0.1.1.tgz";
+        sha1 = "f94aa79c9e5d99cb843e44c5f67e24954e08fb59";
       })
     ];
     buildInputs =
@@ -8529,14 +7373,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.2"
+      self.by-version."copy-paste"."0.2.0"
       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.1"
+      self.by-version."nopt"."2.2.0"
       self.by-version."open"."0.0.5"
       self.by-version."truncate"."1.0.2"
-      self.by-version."update-notifier"."0.1.10"
+      self.by-version."update-notifier"."0.1.8"
       self.by-version."userhome"."0.1.0"
       self.by-version."which"."1.0.5"
       self.by-version."wordwrap"."0.0.2"
@@ -8605,15 +7449,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.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";
+  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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
@@ -8624,44 +7468,22 @@
     ];
     passthru.names = [ "github-url-from-username-repo" ];
   };
-  by-spec."github-url-from-username-repo"."~0.2.0" =
-    self.by-version."github-url-from-username-repo"."0.2.0";
-  by-spec."github-username"."~0.1.1" =
-    self.by-version."github-username"."0.1.1";
-  by-version."github-username"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "github-username-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/github-username/-/github-username-0.1.1.tgz";
-        name = "github-username-0.1.1.tgz";
-        sha1 = "cb9f026d5b8c50c79be096233d2a8b512bb057d9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."github-username" or []);
-    deps = [
-      self.by-version."request"."2.36.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "github-username" ];
-  };
   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";
+    self.by-version."glob"."3.2.9";
+  by-version."glob"."3.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-glob-3.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-        name = "glob-3.2.11.tgz";
-        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+        url = "http://registry.npmjs.org/glob/-/glob-3.2.9.tgz";
+        name = "glob-3.2.9.tgz";
+        sha1 = "56af2289aa43d07d7702666480373eb814d91d40";
       })
     ];
     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 = [
     ];
@@ -8690,38 +7512,13 @@
     passthru.names = [ "glob" ];
   };
   by-spec."glob"."3.2.x" =
-    self.by-version."glob"."3.2.11";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."3.x" =
-    self.by-version."glob"."3.2.11";
+    self.by-version."glob"."3.2.9";
+  by-spec."glob".">= 3.1.4" =
+    self.by-version."glob"."3.2.9";
   by-spec."glob".">=3.2.7 <4" =
-    self.by-version."glob"."3.2.11";
-  by-spec."glob"."^4.0.0" =
-    self.by-version."glob"."4.0.3";
-  by-version."glob"."4.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-glob-4.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-4.0.3.tgz";
-        name = "glob-4.0.3.tgz";
-        sha1 = "cb30c860359801cb7d56436976888fc4a09a35db";
-      })
-    ];
-    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"
-      self.by-version."graceful-fs"."3.0.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
-  };
-  by-spec."glob"."^4.0.2" =
-    self.by-version."glob"."4.0.3";
-  by-spec."glob"."~ 3.2.1" =
-    self.by-version."glob"."3.2.11";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.1.21" =
     self.by-version."glob"."3.1.21";
   by-version."glob"."3.1.21" = lib.makeOverridable self.buildNodePackage {
@@ -8745,108 +7542,17 @@
     passthru.names = [ "glob" ];
   };
   by-spec."glob"."~3.2.0" =
-    self.by-version."glob"."3.2.11";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.1" =
-    self.by-version."glob"."3.2.11";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.6" =
-    self.by-version."glob"."3.2.11";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.7" =
-    self.by-version."glob"."3.2.11";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.8" =
-    self.by-version."glob"."3.2.11";
+    self.by-version."glob"."3.2.9";
   by-spec."glob"."~3.2.9" =
-    self.by-version."glob"."3.2.11";
-  by-spec."glob"."~4.0.2" =
-    self.by-version."glob"."4.0.3";
-  by-spec."glob"."~4.0.3" =
-    self.by-version."glob"."4.0.3";
-  by-spec."glob-stream"."^3.1.5" =
-    self.by-version."glob-stream"."3.1.13";
-  by-version."glob-stream"."3.1.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-glob-stream-3.1.13";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.13.tgz";
-        name = "glob-stream-3.1.13.tgz";
-        sha1 = "1411fd2749a4420378aa8d21a6033edc7698a003";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob-stream" or []);
-    deps = [
-      self.by-version."glob"."4.0.3"
-      self.by-version."minimatch"."0.3.0"
-      self.by-version."ordered-read-streams"."0.0.7"
-      self.by-version."glob2base"."0.0.9"
-      self.by-version."unique-stream"."1.0.0"
-      self.by-version."through2"."0.5.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob-stream" ];
-  };
-  by-spec."glob-watcher"."^0.0.6" =
-    self.by-version."glob-watcher"."0.0.6";
-  by-version."glob-watcher"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-glob-watcher-0.0.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
-        name = "glob-watcher-0.0.6.tgz";
-        sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob-watcher" or []);
-    deps = [
-      self.by-version."gaze"."0.5.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob-watcher" ];
-  };
-  by-spec."glob2base"."^0.0.9" =
-    self.by-version."glob2base"."0.0.9";
-  by-version."glob2base"."0.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-glob2base-0.0.9";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.9.tgz";
-        name = "glob2base-0.0.9.tgz";
-        sha1 = "50a7bb1fc1260e1eb5ba1b136003569a1fe57f98";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob2base" or []);
-    deps = [
-      self.by-version."lodash.findindex"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob2base" ];
-  };
-  by-spec."globule"."~0.1.0" =
-    self.by-version."globule"."0.1.0";
-  by-version."globule"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-globule-0.1.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
-        name = "globule-0.1.0.tgz";
-        sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."globule" or []);
-    deps = [
-      self.by-version."lodash"."1.0.1"
-      self.by-version."glob"."3.1.21"
-      self.by-version."minimatch"."0.2.14"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "globule" ];
-  };
+    self.by-version."glob"."3.2.9";
   by-spec."graceful-fs"."2" =
     self.by-version."graceful-fs"."2.0.3";
   by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -8866,29 +7572,6 @@
     ];
     passthru.names = [ "graceful-fs" ];
   };
-  by-spec."graceful-fs"."2 || 3" =
-    self.by-version."graceful-fs"."3.0.2";
-  by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-graceful-fs-3.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz";
-        name = "graceful-fs-3.0.2.tgz";
-        sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."graceful-fs" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "graceful-fs" ];
-  };
-  by-spec."graceful-fs"."^3.0.0" =
-    self.by-version."graceful-fs"."3.0.2";
-  by-spec."graceful-fs"."^3.0.2" =
-    self.by-version."graceful-fs"."3.0.2";
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -8929,27 +7612,23 @@
   };
   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.3" =
+  by-spec."graceful-fs"."~2.0.2" =
     self.by-version."graceful-fs"."2.0.3";
-  by-spec."graceful-fs"."~3.0.0" =
-    self.by-version."graceful-fs"."3.0.2";
-  by-spec."graceful-fs"."~3.0.1" =
-    self.by-version."graceful-fs"."3.0.2";
-  by-spec."graceful-fs"."~3.0.2" =
-    self.by-version."graceful-fs"."3.0.2";
   by-spec."gridfs-stream"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.5.1.tgz";
-        name = "gridfs-stream-0.5.1.tgz";
-        sha1 = "5fd94b0da4df1a602f7b0a02fb2365460d91b90c";
+        url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.1.tgz";
+        name = "gridfs-stream-0.4.1.tgz";
+        sha1 = "1bcccb1b05b57946363b5e53fbe2bc95dd8877bb";
       })
     ];
     buildInputs =
@@ -8960,28 +7639,7 @@
     ];
     passthru.names = [ "gridfs-stream" ];
   };
-  "gridfs-stream" = self.by-version."gridfs-stream"."0.5.1";
-  by-spec."grouped-queue"."^0.3.0" =
-    self.by-version."grouped-queue"."0.3.0";
-  by-version."grouped-queue"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grouped-queue-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.0.tgz";
-        name = "grouped-queue-0.3.0.tgz";
-        sha1 = "4f5e1a768bba722862993285820f980e227fc4a6";
-      })
-    ];
-    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" ];
-  };
+  "gridfs-stream" = self.by-version."gridfs-stream"."0.4.1";
   by-spec."growl"."1.7.x" =
     self.by-version."growl"."1.7.0";
   by-version."growl"."1.7.0" = lib.makeOverridable self.buildNodePackage {
@@ -9002,14 +7660,14 @@
     passthru.names = [ "growl" ];
   };
   by-spec."grunt"."0.4.x" =
-    self.by-version."grunt"."0.4.5";
-  by-version."grunt"."0.4.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-0.4.5";
+    self.by-version."grunt"."0.4.4";
+  by-version."grunt"."0.4.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-0.4.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz";
-        name = "grunt-0.4.5.tgz";
-        sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
+        url = "http://registry.npmjs.org/grunt/-/grunt-0.4.4.tgz";
+        name = "grunt-0.4.4.tgz";
+        sha1 = "f37fa46e2e52e37f9a0370542a74281c09c73f53";
       })
     ];
     buildInputs =
@@ -9019,35 +7677,34 @@
       self.by-version."coffee-script"."1.3.3"
       self.by-version."colors"."0.6.2"
       self.by-version."dateformat"."1.0.2-1.2.3"
-      self.by-version."eventemitter2"."0.4.14"
+      self.by-version."eventemitter2"."0.4.13"
       self.by-version."findup-sync"."0.1.3"
       self.by-version."glob"."3.1.21"
       self.by-version."hooker"."0.2.3"
       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.8"
+      self.by-version."rimraf"."2.2.6"
       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.2.0"
-      self.by-version."grunt-legacy-log"."0.1.1"
+      self.by-version."grunt-legacy-util"."0.1.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "grunt" ];
   };
   by-spec."grunt"."^0.4.0" =
-    self.by-version."grunt"."0.4.5";
+    self.by-version."grunt"."0.4.4";
   by-spec."grunt"."~0.4" =
-    self.by-version."grunt"."0.4.5";
+    self.by-version."grunt"."0.4.4";
   by-spec."grunt"."~0.4.0" =
-    self.by-version."grunt"."0.4.5";
+    self.by-version."grunt"."0.4.4";
   by-spec."grunt"."~0.4.1" =
-    self.by-version."grunt"."0.4.5";
+    self.by-version."grunt"."0.4.4";
   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 {
@@ -9097,32 +7754,32 @@
     passthru.names = [ "grunt-cli" ];
   };
   "grunt-cli" = self.by-version."grunt-cli"."0.1.13";
-  by-spec."grunt-cli".">=0.1.7" =
+  by-spec."grunt-cli"."~0.1.7" =
     self.by-version."grunt-cli"."0.1.13";
   by-spec."grunt-contrib-cssmin"."*" =
-    self.by-version."grunt-contrib-cssmin"."0.10.0";
-  by-version."grunt-contrib-cssmin"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-cssmin-0.10.0";
+    self.by-version."grunt-contrib-cssmin"."0.9.0";
+  by-version."grunt-contrib-cssmin"."0.9.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-cssmin-0.9.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.10.0.tgz";
-        name = "grunt-contrib-cssmin-0.10.0.tgz";
-        sha1 = "e05f341e753a9674b2b1070220fdcbac22079418";
+        url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.9.0.tgz";
+        name = "grunt-contrib-cssmin-0.9.0.tgz";
+        sha1 = "27241f0160a8866659dab40dc8c2776c01ec7ce2";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-cssmin" or []);
     deps = [
       self.by-version."chalk"."0.4.0"
-      self.by-version."clean-css"."2.2.5"
-      self.by-version."maxmin"."0.2.0"
+      self.by-version."clean-css"."2.1.8"
+      self.by-version."maxmin"."0.1.0"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-cssmin" ];
   };
-  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.10.0";
+  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0";
   by-spec."grunt-contrib-jshint"."*" =
     self.by-version."grunt-contrib-jshint"."0.10.0";
   by-version."grunt-contrib-jshint"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -9137,97 +7794,96 @@
     buildInputs =
       (self.nativeDeps."grunt-contrib-jshint" or []);
     deps = [
-      self.by-version."jshint"."2.5.1"
+      self.by-version."jshint"."2.5.0"
       self.by-version."hooker"."0.2.3"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
+      self.by-version."grunt"."0.4.4"
     ];
     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.3";
-  by-version."grunt-contrib-less"."0.11.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-less-0.11.3";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-0.11.3.tgz";
-        name = "grunt-contrib-less-0.11.3.tgz";
-        sha1 = "ec66618a5f0ed0ff13bdb3633169ef60f26b3c20";
+        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";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-less" or []);
     deps = [
-      self.by-version."less"."1.7.3"
+      self.by-version."less"."1.7.0"
       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.5"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-less" ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.3";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."0.11.0";
   by-spec."grunt-contrib-requirejs"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-requirejs" or []);
     deps = [
-      self.by-version."requirejs"."2.1.14"
+      self.by-version."requirejs"."2.1.11"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-requirejs" ];
   };
-  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4";
+  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.3";
   by-spec."grunt-contrib-uglify"."*" =
-    self.by-version."grunt-contrib-uglify"."0.5.0";
-  by-version."grunt-contrib-uglify"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-uglify-0.5.0";
+    self.by-version."grunt-contrib-uglify"."0.4.0";
+  by-version."grunt-contrib-uglify"."0.4.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-uglify-0.4.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.5.0.tgz";
-        name = "grunt-contrib-uglify-0.5.0.tgz";
-        sha1 = "9e4c1962b4bbf877b02c0c50b3e8ae6651fe2595";
+        url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.4.0.tgz";
+        name = "grunt-contrib-uglify-0.4.0.tgz";
+        sha1 = "6a4df3e85ccf4bbae484b0328cc71c9f102e80be";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-uglify" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.14"
+      self.by-version."uglify-js"."2.4.13"
       self.by-version."chalk"."0.4.0"
       self.by-version."maxmin"."0.1.0"
-      self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
+      self.by-version."grunt"."0.4.4"
     ];
     passthru.names = [ "grunt-contrib-uglify" ];
   };
-  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.5.0";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.4.0";
   by-spec."grunt-karma"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.3.tgz";
-        name = "grunt-karma-0.8.3.tgz";
-        sha1 = "e9ecf718153af1914aa53602a37f85de04310e7f";
+        url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.8.2.tgz";
+        name = "grunt-karma-0.8.2.tgz";
+        sha1 = "0f422d357e4556fb96ab68c6d9a2be46908f1c84";
       })
     ];
     buildInputs =
@@ -9236,44 +7892,21 @@
       self.by-version."lodash"."2.4.1"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
-      self.by-version."karma"."0.12.16"
+      self.by-version."grunt"."0.4.4"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "grunt-karma" ];
   };
-  "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";
+  "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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
@@ -9308,34 +7941,11 @@
       self.by-version."replace"."0.2.9"
     ];
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
+      self.by-version."grunt"."0.4.4"
     ];
     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.1";
-  by-version."gruntfile-editor"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-gruntfile-editor-0.1.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gruntfile-editor/-/gruntfile-editor-0.1.1.tgz";
-        name = "gruntfile-editor-0.1.1.tgz";
-        sha1 = "b8db939fdc9831fcea46519b99eb507d9a51ed41";
-      })
-    ];
-    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."gruntfile-editor"."^0.1.1" =
-    self.by-version."gruntfile-editor"."0.1.1";
   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 {
@@ -9352,8 +7962,8 @@
     deps = [
       self.by-version."coffee-script"."1.7.1"
       self.by-version."jade"."1.3.1"
-      self.by-version."q"."2.0.2"
-      self.by-version."xml2js"."0.4.4"
+      self.by-version."q"."2.0.1"
+      self.by-version."xml2js"."0.4.2"
       self.by-version."msgpack"."0.2.3"
     ];
     peerDependencies = [
@@ -9375,34 +7985,13 @@
     buildInputs =
       (self.nativeDeps."gzip-size" or []);
     deps = [
-      self.by-version."concat-stream"."1.4.6"
+      self.by-version."concat-stream"."1.4.5"
       self.by-version."zlib-browserify"."0.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "gzip-size" ];
   };
-  by-spec."gzip-size"."^0.2.0" =
-    self.by-version."gzip-size"."0.2.0";
-  by-version."gzip-size"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "gzip-size-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.2.0.tgz";
-        name = "gzip-size-0.2.0.tgz";
-        sha1 = "e3a2a191205fe56ee326f5c271435dfaecfb3e1c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."gzip-size" or []);
-    deps = [
-      self.by-version."concat-stream"."1.4.6"
-      self.by-version."browserify-zlib"."0.1.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "gzip-size" ];
-  };
   by-spec."gzippo"."*" =
     self.by-version."gzippo"."0.2.0";
   by-version."gzippo"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -9417,7 +8006,7 @@
     buildInputs =
       (self.nativeDeps."gzippo" or []);
     deps = [
-      self.by-version."send"."0.5.0"
+      self.by-version."send"."0.2.0"
     ];
     peerDependencies = [
     ];
@@ -9617,45 +8206,44 @@
     passthru.names = [ "he" ];
   };
   by-spec."hipache"."*" =
-    self.by-version."hipache"."0.3.1";
-  by-version."hipache"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "hipache-0.3.1";
+    self.by-version."hipache"."0.2.9";
+  by-version."hipache"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "hipache-0.2.9";
     src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
-        name = "hipache-0.3.1.tgz";
-        sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5";
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/hipache/-/hipache-0.2.9.tgz";
+        name = "hipache-0.2.9.tgz";
+        sha1 = "48a7fa7170be328b264d6e413bfb76d130e03b2a";
       })
     ];
     buildInputs =
       (self.nativeDeps."hipache" or []);
     deps = [
-      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"
+      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"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "hipache" ];
   };
-  "hipache" = self.by-version."hipache"."0.3.1";
+  "hipache" = self.by-version."hipache"."0.2.9";
   by-spec."hiredis"."*" =
-    self.by-version."hiredis"."0.1.17";
-  by-version."hiredis"."0.1.17" = lib.makeOverridable self.buildNodePackage {
-    name = "node-hiredis-0.1.17";
+    self.by-version."hiredis"."0.1.16";
+  by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage {
+    name = "node-hiredis-0.1.16";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz";
-        name = "hiredis-0.1.17.tgz";
-        sha1 = "60a33a968efc9a974e7ebb832f33aa965d3d354e";
+        url = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.16.tgz";
+        name = "hiredis-0.1.16.tgz";
+        sha1 = "f6cee1add2589b8b71cef3c4d3936a9fcd638640";
       })
     ];
     buildInputs =
       (self.nativeDeps."hiredis" or []);
     deps = [
-      self.by-version."bindings"."1.2.1"
-      self.by-version."nan"."1.1.2"
+      self.by-version."bindings"."1.2.0"
     ];
     peerDependencies = [
     ];
@@ -9737,25 +8325,6 @@
     ];
     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 {
@@ -9779,25 +8348,24 @@
     ];
     passthru.names = [ "htmlparser2" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.2.tgz";
-        name = "htmlparser2-3.7.2.tgz";
-        sha1 = "5f959dbc97e84a8418a9877c20f5f6f02a6482b0";
+        url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz";
+        name = "htmlparser2-3.3.0.tgz";
+        sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe";
       })
     ];
     buildInputs =
       (self.nativeDeps."htmlparser2" or []);
     deps = [
-      self.by-version."domhandler"."2.2.0"
-      self.by-version."domutils"."1.5.0"
+      self.by-version."domhandler"."2.1.0"
+      self.by-version."domutils"."1.1.6"
       self.by-version."domelementtype"."1.1.1"
-      self.by-version."readable-stream"."1.1.13-1"
-      self.by-version."entities"."1.0.0"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -9826,8 +8394,6 @@
     ];
     passthru.names = [ "htmlparser2" ];
   };
-  by-spec."htmlparser2"."~3.7.2" =
-    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 {
@@ -9849,15 +8415,15 @@
     ];
     passthru.names = [ "http-auth" ];
   };
-  by-spec."http-browserify"."^1.4.0" =
-    self.by-version."http-browserify"."1.4.1";
-  by-version."http-browserify"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-http-browserify-1.4.1";
+  by-spec."http-browserify"."~1.3.1" =
+    self.by-version."http-browserify"."1.3.2";
+  by-version."http-browserify"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-http-browserify-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.4.1.tgz";
-        name = "http-browserify-1.4.1.tgz";
-        sha1 = "31d9938e32f3b392bad0c35ef3b80a847e923dc7";
+        url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.3.2.tgz";
+        name = "http-browserify-1.3.2.tgz";
+        sha1 = "b562c34479349a690d7a6597df495aefa8c604f5";
       })
     ];
     buildInputs =
@@ -9870,15 +8436,15 @@
     ];
     passthru.names = [ "http-browserify" ];
   };
-  by-spec."http-proxy"."0.8.7" =
-    self.by-version."http-proxy"."0.8.7";
-  by-version."http-proxy"."0.8.7" = lib.makeOverridable self.buildNodePackage {
-    name = "http-proxy-0.8.7";
+  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";
     src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.8.7.tgz";
-        name = "http-proxy-0.8.7.tgz";
-        sha1 = "a7bc538618092cd26ed191e4625933baef6de80e";
+      (fetchgit {
+        url = "https://github.com/samalba/node-http-proxy.git";
+        rev = "8e277989d2d05edaee65e524fb4fba9142c52aa5";
+        sha256 = "8ce0e05c73e517eefc6d9bf8b61349351aee119c2fb60763f23170607cc0e41f";
       })
     ];
     buildInputs =
@@ -9887,26 +8453,7 @@
       self.by-version."colors"."0.6.2"
       self.by-version."optimist"."0.3.7"
       self.by-version."pkginfo"."0.2.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-proxy" ];
-  };
-  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 = [
-      (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."eventemitter3"."0.1.2"
+      self.by-version."utile"."0.1.7"
     ];
     peerDependencies = [
     ];
@@ -10037,26 +8584,26 @@
     passthru.names = [ "i" ];
   };
   by-spec."i18next"."*" =
-    self.by-version."i18next"."1.7.4";
-  by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-i18next-1.7.4";
+    self.by-version."i18next"."1.7.3";
+  by-version."i18next"."1.7.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-i18next-1.7.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz";
-        name = "i18next-1.7.4.tgz";
-        sha1 = "b61629c9de95a5c076acb2f954f8a882ac0772af";
+        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.3.tgz";
+        name = "i18next-1.7.3.tgz";
+        sha1 = "8a064866c8e6e87b4664a32fe81b9be34b4a3894";
       })
     ];
     buildInputs =
       (self.nativeDeps."i18next" or []);
     deps = [
-      self.by-version."cookies"."0.4.1"
+      self.by-version."cookies"."0.4.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "i18next" ];
   };
-  "i18next" = self.by-version."i18next"."1.7.4";
+  "i18next" = self.by-version."i18next"."1.7.3";
   by-spec."ibrik"."~1.1.1" =
     self.by-version."ibrik"."1.1.1";
   by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -10073,7 +8620,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.14"
+      self.by-version."istanbul"."0.2.7"
       self.by-version."estraverse"."1.5.0"
       self.by-version."escodegen"."1.1.0"
       self.by-version."which"."1.0.5"
@@ -10084,26 +8631,7 @@
     ];
     passthru.names = [ "ibrik" ];
   };
-  by-spec."iconv-lite"."0.4.3" =
-    self.by-version."iconv-lite"."0.4.3";
-  by-version."iconv-lite"."0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-iconv-lite-0.4.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.3.tgz";
-        name = "iconv-lite-0.4.3.tgz";
-        sha1 = "9e7887793b769cc695eb22d2546a4fd2d79b7a1e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."iconv-lite" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "iconv-lite" ];
-  };
-  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";
@@ -10122,12 +8650,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."iconv-lite"."~0.4.3" =
-    self.by-version."iconv-lite"."0.4.3";
   by-spec."ieee754"."~1.1.1" =
     self.by-version."ieee754"."1.1.3";
   by-version."ieee754"."1.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -10166,26 +8690,6 @@
     ];
     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 {
@@ -10235,29 +8739,6 @@
   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";
@@ -10276,27 +8757,29 @@
     ];
     passthru.names = [ "ini" ];
   };
-  by-spec."ini"."~1.2.0" =
-    self.by-version."ini"."1.2.1";
-  by-spec."init-package-json"."~0.1.0" =
-    self.by-version."init-package-json"."0.1.0";
-  by-version."init-package-json"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-init-package-json-0.1.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.1.0.tgz";
-        name = "init-package-json-0.1.0.tgz";
-        sha1 = "249c982759a102556f294f2592c14a2dad855f52";
+        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";
       })
     ];
     buildInputs =
       (self.nativeDeps."init-package-json" or []);
     deps = [
-      self.by-version."glob"."4.0.3"
-      self.by-version."promzard"."0.2.2"
+      self.by-version."promzard"."0.2.1"
       self.by-version."read"."1.0.5"
-      self.by-version."read-package-json"."1.2.3"
-      self.by-version."semver"."2.3.1"
+      self.by-version."read-package-json"."1.1.8"
+      self.by-version."semver"."2.2.1"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
@@ -10316,38 +8799,12 @@
     buildInputs =
       (self.nativeDeps."inline-source-map" or []);
     deps = [
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     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 {
@@ -10400,34 +8857,31 @@
   };
   by-spec."inquirer"."~0.4.1" =
     self.by-version."inquirer"."0.4.1";
-  by-spec."inquirer"."~0.5.1" =
-    self.by-version."inquirer"."0.5.1";
-  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";
+  by-spec."insert-module-globals"."~5.0.1" =
+    self.by-version."insert-module-globals"."5.0.1";
+  by-version."insert-module-globals"."5.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "insert-module-globals-5.0.1";
     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";
+        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-5.0.1.tgz";
+        name = "insert-module-globals-5.0.1.tgz";
+        sha1 = "eec9c0dfad30380e8eda313a094165dc2f2350d2";
       })
     ];
     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."JSONStream"."0.7.2"
+      self.by-version."concat-stream"."1.4.5"
       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" =
+  by-spec."insight"."~0.3.0" =
     self.by-version."insight"."0.3.1";
   by-version."insight"."0.3.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-insight-0.3.1";
@@ -10453,8 +8907,6 @@
     ];
     passthru.names = [ "insight" ];
   };
-  by-spec."insight"."~0.3.0" =
-    self.by-version."insight"."0.3.1";
   by-spec."intersect"."~0.0.3" =
     self.by-version."intersect"."0.0.3";
   by-version."intersect"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -10474,25 +8926,6 @@
     ];
     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 {
@@ -10511,18 +8944,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.9.0"
-      self.by-version."express"."4.4.5"
+      self.by-version."async"."0.7.0"
+      self.by-version."express"."4.0.0"
       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.9.0"
-      self.by-version."gridfs-stream"."0.5.1"
-      self.by-version."temp"."0.8.0"
-      self.by-version."kue"."0.8.1"
-      self.by-version."redis"."0.10.3"
-      self.by-version."hiredis"."0.1.17"
+      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"
     ];
     peerDependencies = [
     ];
@@ -10530,14 +8963,14 @@
   };
   "ironhorse" = self.by-version."ironhorse"."0.0.9";
   by-spec."is-promise"."~1" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
-        name = "is-promise-1.0.1.tgz";
-        sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
+        url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz";
+        name = "is-promise-1.0.0.tgz";
+        sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f";
       })
     ];
     buildInputs =
@@ -10548,7 +8981,7 @@
     ];
     passthru.names = [ "is-promise" ];
   };
-  by-spec."is-root"."^0.1.0" =
+  by-spec."is-root"."~0.1.0" =
     self.by-version."is-root"."0.1.0";
   by-version."is-root"."0.1.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-is-root-0.1.0";
@@ -10567,27 +9000,6 @@
     ];
     passthru.names = [ "is-root" ];
   };
-  by-spec."is-root"."~0.1.0" =
-    self.by-version."is-root"."0.1.0";
-  by-spec."is-utf8"."^0.2.0" =
-    self.by-version."is-utf8"."0.2.0";
-  by-version."is-utf8"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-is-utf8-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz";
-        name = "is-utf8-0.2.0.tgz";
-        sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."is-utf8" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "is-utf8" ];
-  };
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -10607,25 +9019,6 @@
     ];
     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 {
@@ -10649,42 +9042,59 @@
     self.by-version."isbinaryfile"."0.1.9";
   by-spec."isbinaryfile"."~2.0.0" =
     self.by-version."isbinaryfile"."2.0.1";
-  by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.2.14";
-  by-version."istanbul"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "istanbul-0.2.14";
+  by-version."isbinaryfile"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-isbinaryfile-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.14.tgz";
-        name = "istanbul-0.2.14.tgz";
-        sha1 = "6667623254b33d33cf0ab6b5c70ca7e819ec582f";
+        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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.7.tgz";
+        name = "istanbul-0.2.7.tgz";
+        sha1 = "bb482e1d06a0fea00993a10b2ee266fc740642bc";
       })
     ];
     buildInputs =
       (self.nativeDeps."istanbul" or []);
     deps = [
-      self.by-version."esprima"."1.2.2"
-      self.by-version."escodegen"."1.3.3"
+      self.by-version."esprima"."1.1.1"
+      self.by-version."escodegen"."1.3.2"
       self.by-version."handlebars"."1.3.0"
-      self.by-version."mkdirp"."0.5.0"
-      self.by-version."nopt"."3.0.1"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."nopt"."2.2.0"
       self.by-version."fileset"."0.1.5"
       self.by-version."which"."1.0.5"
-      self.by-version."async"."0.9.0"
+      self.by-version."async"."0.2.10"
       self.by-version."abbrev"."1.0.5"
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."resolve"."0.7.1"
+      self.by-version."resolve"."0.6.3"
       self.by-version."js-yaml"."3.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "istanbul" ];
   };
-  "istanbul" = self.by-version."istanbul"."0.2.14";
-  by-spec."istanbul"."~0.2.10" =
-    self.by-version."istanbul"."0.2.14";
+  "istanbul" = self.by-version."istanbul"."0.2.7";
+  by-spec."istanbul"."~0.2.3" =
+    self.by-version."istanbul"."0.2.7";
   by-spec."istanbul"."~0.2.4" =
-    self.by-version."istanbul"."0.2.14";
+    self.by-version."istanbul"."0.2.7";
   by-spec."jade"."*" =
     self.by-version."jade"."1.3.1";
   by-version."jade"."1.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -10959,35 +9369,35 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.5.1";
-  by-version."jshint"."2.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "jshint-2.5.1";
+    self.by-version."jshint"."2.5.0";
+  by-version."jshint"."2.5.0" = lib.makeOverridable self.buildNodePackage {
+    name = "jshint-2.5.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.1.tgz";
-        name = "jshint-2.5.1.tgz";
-        sha1 = "8e96d27377806767d40f16676fbec113d33520ec";
+        url = "http://registry.npmjs.org/jshint/-/jshint-2.5.0.tgz";
+        name = "jshint-2.5.0.tgz";
+        sha1 = "82fd1a235ffce75fad1b40b2a38bef47beac8c54";
       })
     ];
     buildInputs =
       (self.nativeDeps."jshint" or []);
     deps = [
-      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."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."exit"."0.1.2"
-      self.by-version."strip-json-comments"."0.1.3"
+      self.by-version."strip-json-comments"."0.1.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "jshint" ];
   };
-  "jshint" = self.by-version."jshint"."2.5.1";
+  "jshint" = self.by-version."jshint"."2.5.0";
   by-spec."jshint"."~2.5.0" =
-    self.by-version."jshint"."2.5.1";
+    self.by-version."jshint"."2.5.0";
   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 {
@@ -11185,81 +9595,60 @@
     ];
     passthru.names = [ "junk" ];
   };
-  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/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";
+    self.by-version."karma"."0.12.9";
+  by-version."karma"."0.12.9" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.12.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.12.16.tgz";
-        name = "karma-0.12.16.tgz";
-        sha1 = "631bca7582b8b773162111708fcab69f8e2c5a37";
+        url = "http://registry.npmjs.org/karma/-/karma-0.12.9.tgz";
+        name = "karma-0.12.9.tgz";
+        sha1 = "9431735e50fcbd8ca04963a0e4da0b6550b41998";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma" or []);
     deps = [
       self.by-version."di"."0.0.1"
-      self.by-version."socket.io"."0.9.17"
+      self.by-version."socket.io"."0.9.16"
       self.by-version."chokidar"."0.8.2"
-      self.by-version."glob"."3.2.11"
+      self.by-version."glob"."3.2.9"
       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.8"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."q"."0.9.7"
       self.by-version."colors"."0.6.2"
       self.by-version."lodash"."2.4.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."log4js"."0.6.15"
+      self.by-version."log4js"."0.6.14"
       self.by-version."useragent"."2.0.8"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."connect"."2.12.0"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.12.16";
+  "karma" = self.by-version."karma"."0.12.9";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.12.16";
-  by-spec."karma".">=0.12.8" =
-    self.by-version."karma"."0.12.16";
+    self.by-version."karma"."0.12.9";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.12.16";
+    self.by-version."karma"."0.12.9";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.12.16";
+    self.by-version."karma"."0.12.9";
   by-spec."karma"."~0.12.0" =
-    self.by-version."karma"."0.12.16";
+    self.by-version."karma"."0.12.9";
   by-spec."karma-chrome-launcher"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
@@ -11267,36 +9656,35 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.16"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
-  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.4";
+  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.3";
   by-spec."karma-coverage"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.4.tgz";
-        name = "karma-coverage-0.2.4.tgz";
-        sha1 = "5d9c3da5ab1ad27f6aaaa11796e6235dd37a0757";
+        url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.1.tgz";
+        name = "karma-coverage-0.2.1.tgz";
+        sha1 = "3b1bce268711a631e008e108930906eceae0a623";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-coverage" or []);
     deps = [
-      self.by-version."istanbul"."0.2.14"
+      self.by-version."istanbul"."0.2.7"
       self.by-version."ibrik"."1.1.1"
-      self.by-version."dateformat"."1.0.8-1.2.3"
-      self.by-version."minimatch"."0.3.0"
+      self.by-version."dateformat"."1.0.7-1.2.3"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.16"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "karma-coverage" ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.2.4";
+  "karma-coverage" = self.by-version."karma-coverage"."0.2.1";
   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 {
@@ -11314,20 +9702,20 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.16"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
   "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2";
   by-spec."karma-mocha"."*" =
-    self.by-version."karma-mocha"."0.1.4";
-  by-version."karma-mocha"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-mocha-0.1.4";
+    self.by-version."karma-mocha"."0.1.3";
+  by-version."karma-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-mocha-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.4.tgz";
-        name = "karma-mocha-0.1.4.tgz";
-        sha1 = "66617dead3f52311ab3b042cc046b63731ef1697";
+        url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.3.tgz";
+        name = "karma-mocha-0.1.3.tgz";
+        sha1 = "396e44be8ddb4abf28bfca0387924c3aeddbce1a";
       })
     ];
     buildInputs =
@@ -11335,21 +9723,21 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.16"
-      self.by-version."mocha"."1.20.1"
+      self.by-version."karma"."0.12.9"
+      self.by-version."mocha"."1.18.2"
     ];
     passthru.names = [ "karma-mocha" ];
   };
-  "karma-mocha" = self.by-version."karma-mocha"."0.1.4";
+  "karma-mocha" = self.by-version."karma-mocha"."0.1.3";
   by-spec."karma-requirejs"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz";
-        name = "karma-requirejs-0.2.2.tgz";
-        sha1 = "e497ca0868e2e09a9b8e3f646745c31a935fe8b6";
+        url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.1.tgz";
+        name = "karma-requirejs-0.2.1.tgz";
+        sha1 = "7f3ac5df67bccd9d832a928ec658d733ec983c5d";
       })
     ];
     buildInputs =
@@ -11357,46 +9745,46 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.16"
-      self.by-version."requirejs"."2.1.14"
+      self.by-version."karma"."0.12.9"
+      self.by-version."requirejs"."2.1.11"
     ];
     passthru.names = [ "karma-requirejs" ];
   };
-  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2";
+  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1";
   by-spec."karma-sauce-launcher"."*" =
-    self.by-version."karma-sauce-launcher"."0.2.9";
-  by-version."karma-sauce-launcher"."0.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-sauce-launcher-0.2.9";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.9.tgz";
-        name = "karma-sauce-launcher-0.2.9.tgz";
-        sha1 = "20202c09844d9787723728344c98500719eb5404";
+        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";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.27"
+      self.by-version."wd"."0.2.19"
       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.16"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.9";
-  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";
+  "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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.2.tgz";
-        name = "keen.io-0.1.2.tgz";
-        sha1 = "a55b9d1d8b4354a8845f2a224eb3a6f7271378b2";
+        url = "http://registry.npmjs.org/keen.io/-/keen.io-0.0.4.tgz";
+        name = "keen.io-0.0.4.tgz";
+        sha1 = "041caa79371a6bec51288e222f3bb2e05c7e6b25";
       })
     ];
     buildInputs =
@@ -11467,14 +9855,14 @@
     passthru.names = [ "kew" ];
   };
   by-spec."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";
+    self.by-version."keygrip"."1.0.0";
+  by-version."keygrip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-keygrip-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
-        name = "keygrip-1.0.1.tgz";
-        sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
+        url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.0.tgz";
+        name = "keygrip-1.0.0.tgz";
+        sha1 = "b771120e8e697b8692b76866a84cdff3912fc379";
       })
     ];
     buildInputs =
@@ -11526,124 +9914,47 @@
     passthru.names = [ "knockout" ];
   };
   by-spec."knox"."*" =
-    self.by-version."knox"."0.9.0";
-  by-version."knox"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-knox-0.9.0";
+    self.by-version."knox"."0.8.9";
+  by-version."knox"."0.8.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-knox-0.8.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/knox/-/knox-0.9.0.tgz";
-        name = "knox-0.9.0.tgz";
-        sha1 = "8810e1dfe4332db505a796f5c9a11aee8b393e2c";
+        url = "http://registry.npmjs.org/knox/-/knox-0.8.9.tgz";
+        name = "knox-0.8.9.tgz";
+        sha1 = "b96ec0b4ec1be75d8006f80cb302bfa818d7001c";
       })
     ];
     buildInputs =
       (self.nativeDeps."knox" or []);
     deps = [
       self.by-version."mime"."1.2.11"
-      self.by-version."xml2js"."0.4.4"
-      self.by-version."debug"."1.0.2"
-      self.by-version."stream-counter"."1.0.0"
-      self.by-version."once"."1.3.0"
+      self.by-version."xml2js"."0.2.8"
+      self.by-version."debug"."0.7.4"
+      self.by-version."stream-counter"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "knox" ];
   };
-  "knox" = self.by-version."knox"."0.9.0";
-  by-spec."koa"."*" =
-    self.by-version."koa"."0.8.1";
-  by-version."koa"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-koa-0.8.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/koa/-/koa-0.8.1.tgz";
-        name = "koa-0.8.1.tgz";
-        sha1 = "bd8af6b6f8bd5afdbaa71a26238dfe5ed6e68f6e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."koa" or []);
-    deps = [
-      self.by-version."escape-html"."1.0.1"
-      self.by-version."statuses"."1.0.3"
-      self.by-version."accepts"."1.0.6"
-      self.by-version."type-is"."1.3.2"
-      self.by-version."mime-types"."1.0.1"
-      self.by-version."finished"."1.2.2"
-      self.by-version."co"."3.0.6"
-      self.by-version."debug"."1.0.2"
-      self.by-version."fresh"."0.2.2"
-      self.by-version."koa-compose"."2.3.0"
-      self.by-version."koa-is-json"."1.0.0"
-      self.by-version."cookies"."0.4.1"
-      self.by-version."delegates"."0.0.3"
-      self.by-version."dethroy"."1.0.1"
-      self.by-version."error-inject"."1.0.0"
-      self.by-version."vary"."0.1.0"
-      self.by-version."only"."0.0.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "koa" ];
-  };
-  by-spec."koa-compose"."~2.3.0" =
-    self.by-version."koa-compose"."2.3.0";
-  by-version."koa-compose"."2.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-koa-compose-2.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/koa-compose/-/koa-compose-2.3.0.tgz";
-        name = "koa-compose-2.3.0.tgz";
-        sha1 = "4617fa832a16412a56967334304efd797d6ed35c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."koa-compose" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "koa-compose" ];
-  };
-  by-spec."koa-is-json"."~1.0.0" =
-    self.by-version."koa-is-json"."1.0.0";
-  by-version."koa-is-json"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-koa-is-json-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz";
-        name = "koa-is-json-1.0.0.tgz";
-        sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."koa-is-json" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "koa-is-json" ];
-  };
+  "knox" = self.by-version."knox"."0.8.9";
   by-spec."kue"."*" =
-    self.by-version."kue"."0.8.1";
-  by-version."kue"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-kue-0.8.1";
+    self.by-version."kue"."0.7.5";
+  by-version."kue"."0.7.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-kue-0.7.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/kue/-/kue-0.8.1.tgz";
-        name = "kue-0.8.1.tgz";
-        sha1 = "ca3f3aa705b150e6527b7dd718433efc246611e4";
+        url = "http://registry.npmjs.org/kue/-/kue-0.7.5.tgz";
+        name = "kue-0.7.5.tgz";
+        sha1 = "d815a8a35b22dd28df3f54f0b874403a257dc807";
       })
     ];
     buildInputs =
       (self.nativeDeps."kue" or []);
     deps = [
-      self.by-version."redis"."0.10.3"
+      self.by-version."redis"."0.10.1"
       self.by-version."express"."3.1.2"
       self.by-version."jade"."1.1.5"
       self.by-version."stylus"."0.42.2"
-      self.by-version."lodash"."2.4.1"
-      self.by-version."lodash-deep"."1.2.1"
       self.by-version."nib"."0.5.0"
       self.by-version."reds"."0.2.4"
     ];
@@ -11651,7 +9962,7 @@
     ];
     passthru.names = [ "kue" ];
   };
-  "kue" = self.by-version."kue"."0.8.1";
+  "kue" = self.by-version."kue"."0.7.5";
   by-spec."lazy"."~1.0.11" =
     self.by-version."lazy"."1.0.11";
   by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage {
@@ -11711,56 +10022,55 @@
     passthru.names = [ "lcov-parse" ];
   };
   by-spec."lcov-result-merger"."*" =
-    self.by-version."lcov-result-merger"."1.0.0";
-  by-version."lcov-result-merger"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lcov-result-merger-1.0.0";
+    self.by-version."lcov-result-merger"."0.0.2";
+  by-version."lcov-result-merger"."0.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "lcov-result-merger-0.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.0.tgz";
-        name = "lcov-result-merger-1.0.0.tgz";
-        sha1 = "c0afba9711b1cd8ef6a43e71254a39a9882f6ff5";
+        url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-0.0.2.tgz";
+        name = "lcov-result-merger-0.0.2.tgz";
+        sha1 = "72a538c09f76e5c79b511bcd1053948d4aa98f10";
       })
     ];
     buildInputs =
       (self.nativeDeps."lcov-result-merger" or []);
     deps = [
-      self.by-version."through2"."0.5.1"
-      self.by-version."vinyl"."0.2.3"
-      self.by-version."vinyl-fs"."0.3.4"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "lcov-result-merger" ];
   };
-  "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.0";
+  "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
   by-spec."less"."*" =
-    self.by-version."less"."1.7.3";
-  by-version."less"."1.7.3" = lib.makeOverridable self.buildNodePackage {
-    name = "less-1.7.3";
+    self.by-version."less"."1.7.0";
+  by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "less-1.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/less/-/less-1.7.3.tgz";
-        name = "less-1.7.3.tgz";
-        sha1 = "89acc0e8adcdb1934aa21c7611d35b97b52652a6";
+        url = "http://registry.npmjs.org/less/-/less-1.7.0.tgz";
+        name = "less-1.7.0.tgz";
+        sha1 = "6f1293bac1f402c932c2ce21ba7337f7c635ba84";
       })
     ];
     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"
       self.by-version."clean-css"."2.1.8"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "less" ];
   };
-  "less" = self.by-version."less"."1.7.3";
-  by-spec."less"."~1.7.2" =
-    self.by-version."less"."1.7.3";
+  "less" = self.by-version."less"."1.7.0";
+  by-spec."less"."^1.7.0" =
+    self.by-version."less"."1.7.0";
+  by-spec."less"."~1.7.0" =
+    self.by-version."less"."1.7.0";
   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 {
@@ -11781,36 +10091,35 @@
     ];
     passthru.names = [ "lexical-scope" ];
   };
-  by-spec."libxmljs"."~0.10.0" =
-    self.by-version."libxmljs"."0.10.0";
-  by-version."libxmljs"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-libxmljs-0.10.0";
+  by-spec."libxmljs"."~0.8.1" =
+    self.by-version."libxmljs"."0.8.1";
+  by-version."libxmljs"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-libxmljs-0.8.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz";
-        name = "libxmljs-0.10.0.tgz";
-        sha1 = "847eb4b0545b02d1c235e1f8371818cf709d3256";
+        url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.8.1.tgz";
+        name = "libxmljs-0.8.1.tgz";
+        sha1 = "b8b1d3962a92dbc5be9dc798bac028e09db8d630";
       })
     ];
     buildInputs =
       (self.nativeDeps."libxmljs" or []);
     deps = [
-      self.by-version."bindings"."1.1.1"
-      self.by-version."nan"."1.1.2"
+      self.by-version."bindings"."1.0.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "libxmljs" ];
   };
   by-spec."libyaml"."*" =
-    self.by-version."libyaml"."0.2.4";
-  by-version."libyaml"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-libyaml-0.2.4";
+    self.by-version."libyaml"."0.2.3";
+  by-version."libyaml"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-libyaml-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.4.tgz";
-        name = "libyaml-0.2.4.tgz";
-        sha1 = "46b6abe00ef0bc0ac60ca599c0e7c80ff920e959";
+        url = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.3.tgz";
+        name = "libyaml-0.2.3.tgz";
+        sha1 = "c07e7fefcad6e09218ebf9ff814bbd520172add6";
       })
     ];
     buildInputs =
@@ -11821,7 +10130,7 @@
     ];
     passthru.names = [ "libyaml" ];
   };
-  "libyaml" = self.by-version."libyaml"."0.2.4";
+  "libyaml" = self.by-version."libyaml"."0.2.3";
   by-spec."lockfile"."~0.4.0" =
     self.by-version."lockfile"."0.4.2";
   by-version."lockfile"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -11843,7 +10152,7 @@
   };
   by-spec."lockfile"."~0.4.2" =
     self.by-version."lockfile"."0.4.2";
-  by-spec."lodash".">=2.4.1" =
+  by-spec."lodash"."^2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-lodash-2.4.1";
@@ -11862,8 +10171,6 @@
     ];
     passthru.names = [ "lodash" ];
   };
-  by-spec."lodash"."^2.4.1" =
-    self.by-version."lodash"."2.4.1";
   by-spec."lodash"."~0.10.0" =
     self.by-version."lodash"."0.10.0";
   by-version."lodash"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -11902,25 +10209,6 @@
     ];
     passthru.names = [ "lodash" ];
   };
-  by-spec."lodash"."~1.0.1" =
-    self.by-version."lodash"."1.0.1";
-  by-version."lodash"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-1.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
-        name = "lodash-1.0.1.tgz";
-        sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash" ];
-  };
   by-spec."lodash"."~1.2.1" =
     self.by-version."lodash"."1.2.1";
   by-version."lodash"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -12001,26 +10289,6 @@
   };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
-  by-spec."lodash-deep"."^1.1.0" =
-    self.by-version."lodash-deep"."1.2.1";
-  by-version."lodash-deep"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash-deep-1.2.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.2.1.tgz";
-        name = "lodash-deep-1.2.1.tgz";
-        sha1 = "04ea62f43112151388de983f7e07c3e6ded07225";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash-deep" or []);
-    deps = [
-      self.by-version."lodash"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash-deep" ];
-  };
   by-spec."lodash-node"."~2.4.1" =
     self.by-version."lodash-node"."2.4.1";
   by-version."lodash-node"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -12040,183 +10308,6 @@
     ];
     passthru.names = [ "lodash-node" ];
   };
-  by-spec."lodash._arraypool"."~2.4.1" =
-    self.by-version."lodash._arraypool"."2.4.1";
-  by-version."lodash._arraypool"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._arraypool-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._arraypool/-/lodash._arraypool-2.4.1.tgz";
-        name = "lodash._arraypool-2.4.1.tgz";
-        sha1 = "e88eecb92e2bb84c9065612fd958a0719cd47f94";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._arraypool" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._arraypool" ];
-  };
-  by-spec."lodash._basebind"."~2.4.1" =
-    self.by-version."lodash._basebind"."2.4.1";
-  by-version."lodash._basebind"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._basebind-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.4.1.tgz";
-        name = "lodash._basebind-2.4.1.tgz";
-        sha1 = "e940b9ebdd27c327e0a8dab1b55916c5341e9575";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._basebind" or []);
-    deps = [
-      self.by-version."lodash._basecreate"."2.4.1"
-      self.by-version."lodash.isobject"."2.4.1"
-      self.by-version."lodash._setbinddata"."2.4.1"
-      self.by-version."lodash._slice"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._basebind" ];
-  };
-  by-spec."lodash._basecreate"."~2.4.1" =
-    self.by-version."lodash._basecreate"."2.4.1";
-  by-version."lodash._basecreate"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._basecreate-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-2.4.1.tgz";
-        name = "lodash._basecreate-2.4.1.tgz";
-        sha1 = "f8e6f5b578a9e34e541179b56b8eeebf4a287e08";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._basecreate" or []);
-    deps = [
-      self.by-version."lodash._isnative"."2.4.1"
-      self.by-version."lodash.isobject"."2.4.1"
-      self.by-version."lodash.noop"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._basecreate" ];
-  };
-  by-spec."lodash._basecreatecallback"."~2.4.1" =
-    self.by-version."lodash._basecreatecallback"."2.4.1";
-  by-version."lodash._basecreatecallback"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._basecreatecallback-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._basecreatecallback/-/lodash._basecreatecallback-2.4.1.tgz";
-        name = "lodash._basecreatecallback-2.4.1.tgz";
-        sha1 = "7d0b267649cb29e7a139d0103b7c11fae84e4851";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._basecreatecallback" or []);
-    deps = [
-      self.by-version."lodash.bind"."2.4.1"
-      self.by-version."lodash.identity"."2.4.1"
-      self.by-version."lodash._setbinddata"."2.4.1"
-      self.by-version."lodash.support"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._basecreatecallback" ];
-  };
-  by-spec."lodash._basecreatewrapper"."~2.4.1" =
-    self.by-version."lodash._basecreatewrapper"."2.4.1";
-  by-version."lodash._basecreatewrapper"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._basecreatewrapper-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.4.1.tgz";
-        name = "lodash._basecreatewrapper-2.4.1.tgz";
-        sha1 = "4d31f2e7de7e134fbf2803762b8150b32519666f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._basecreatewrapper" or []);
-    deps = [
-      self.by-version."lodash._basecreate"."2.4.1"
-      self.by-version."lodash.isobject"."2.4.1"
-      self.by-version."lodash._setbinddata"."2.4.1"
-      self.by-version."lodash._slice"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._basecreatewrapper" ];
-  };
-  by-spec."lodash._baseisequal"."~2.4.1" =
-    self.by-version."lodash._baseisequal"."2.4.1";
-  by-version."lodash._baseisequal"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._baseisequal-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-2.4.1.tgz";
-        name = "lodash._baseisequal-2.4.1.tgz";
-        sha1 = "6b1e62e587c5523111f6f228553dab19e445fc03";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._baseisequal" or []);
-    deps = [
-      self.by-version."lodash.forin"."2.4.1"
-      self.by-version."lodash._getarray"."2.4.1"
-      self.by-version."lodash.isfunction"."2.4.1"
-      self.by-version."lodash._objecttypes"."2.4.1"
-      self.by-version."lodash._releasearray"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._baseisequal" ];
-  };
-  by-spec."lodash._createwrapper"."~2.4.1" =
-    self.by-version."lodash._createwrapper"."2.4.1";
-  by-version."lodash._createwrapper"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._createwrapper-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.4.1.tgz";
-        name = "lodash._createwrapper-2.4.1.tgz";
-        sha1 = "51d6957973da4ed556e37290d8c1a18c53de1607";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._createwrapper" or []);
-    deps = [
-      self.by-version."lodash._basebind"."2.4.1"
-      self.by-version."lodash._basecreatewrapper"."2.4.1"
-      self.by-version."lodash.isfunction"."2.4.1"
-      self.by-version."lodash._slice"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._createwrapper" ];
-  };
-  by-spec."lodash._getarray"."~2.4.1" =
-    self.by-version."lodash._getarray"."2.4.1";
-  by-version."lodash._getarray"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._getarray-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._getarray/-/lodash._getarray-2.4.1.tgz";
-        name = "lodash._getarray-2.4.1.tgz";
-        sha1 = "faf1f7f810fa985a251c2187404481094839e5ee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._getarray" or []);
-    deps = [
-      self.by-version."lodash._arraypool"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._getarray" ];
-  };
   by-spec."lodash._isnative"."~2.4.1" =
     self.by-version."lodash._isnative"."2.4.1";
   by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -12236,25 +10327,6 @@
     ];
     passthru.names = [ "lodash._isnative" ];
   };
-  by-spec."lodash._maxpoolsize"."~2.4.1" =
-    self.by-version."lodash._maxpoolsize"."2.4.1";
-  by-version."lodash._maxpoolsize"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._maxpoolsize-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._maxpoolsize/-/lodash._maxpoolsize-2.4.1.tgz";
-        name = "lodash._maxpoolsize-2.4.1.tgz";
-        sha1 = "9d482f463b8e66afbe59c2c14edb117060172334";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._maxpoolsize" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._maxpoolsize" ];
-  };
   by-spec."lodash._objecttypes"."~2.4.1" =
     self.by-version."lodash._objecttypes"."2.4.1";
   by-version."lodash._objecttypes"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -12274,48 +10346,6 @@
     ];
     passthru.names = [ "lodash._objecttypes" ];
   };
-  by-spec."lodash._releasearray"."~2.4.1" =
-    self.by-version."lodash._releasearray"."2.4.1";
-  by-version."lodash._releasearray"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._releasearray-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._releasearray/-/lodash._releasearray-2.4.1.tgz";
-        name = "lodash._releasearray-2.4.1.tgz";
-        sha1 = "a6139630d76d1536b07ddc80962889b082f6a641";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._releasearray" or []);
-    deps = [
-      self.by-version."lodash._arraypool"."2.4.1"
-      self.by-version."lodash._maxpoolsize"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._releasearray" ];
-  };
-  by-spec."lodash._setbinddata"."~2.4.1" =
-    self.by-version."lodash._setbinddata"."2.4.1";
-  by-version."lodash._setbinddata"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._setbinddata-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._setbinddata/-/lodash._setbinddata-2.4.1.tgz";
-        name = "lodash._setbinddata-2.4.1.tgz";
-        sha1 = "f7c200cd1b92ef236b399eecf73c648d17aa94d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._setbinddata" or []);
-    deps = [
-      self.by-version."lodash._isnative"."2.4.1"
-      self.by-version."lodash.noop"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._setbinddata" ];
-  };
   by-spec."lodash._shimkeys"."~2.4.1" =
     self.by-version."lodash._shimkeys"."2.4.1";
   by-version."lodash._shimkeys"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -12336,70 +10366,6 @@
     ];
     passthru.names = [ "lodash._shimkeys" ];
   };
-  by-spec."lodash._slice"."~2.4.1" =
-    self.by-version."lodash._slice"."2.4.1";
-  by-version."lodash._slice"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash._slice-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash._slice/-/lodash._slice-2.4.1.tgz";
-        name = "lodash._slice-2.4.1.tgz";
-        sha1 = "745cf41a53597b18f688898544405efa2b06d90f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash._slice" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash._slice" ];
-  };
-  by-spec."lodash.bind"."~2.4.1" =
-    self.by-version."lodash.bind"."2.4.1";
-  by-version."lodash.bind"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.bind-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.bind/-/lodash.bind-2.4.1.tgz";
-        name = "lodash.bind-2.4.1.tgz";
-        sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.bind" or []);
-    deps = [
-      self.by-version."lodash._createwrapper"."2.4.1"
-      self.by-version."lodash._slice"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.bind" ];
-  };
-  by-spec."lodash.createcallback"."~2.4.1" =
-    self.by-version."lodash.createcallback"."2.4.1";
-  by-version."lodash.createcallback"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.createcallback-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.createcallback/-/lodash.createcallback-2.4.1.tgz";
-        name = "lodash.createcallback-2.4.1.tgz";
-        sha1 = "c81645ac3a1d7f9dc6b36b8bc0d84c013c98ea95";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.createcallback" or []);
-    deps = [
-      self.by-version."lodash._basecreatecallback"."2.4.1"
-      self.by-version."lodash._baseisequal"."2.4.1"
-      self.by-version."lodash.isobject"."2.4.1"
-      self.by-version."lodash.keys"."2.4.1"
-      self.by-version."lodash.property"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.createcallback" ];
-  };
   by-spec."lodash.debounce"."~2.4.1" =
     self.by-version."lodash.debounce"."2.4.1";
   by-version."lodash.debounce"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -12422,7 +10388,7 @@
     ];
     passthru.names = [ "lodash.debounce" ];
   };
-  by-spec."lodash.defaults"."^2.4.1" =
+  by-spec."lodash.defaults"."~2.4.1" =
     self.by-version."lodash.defaults"."2.4.1";
   by-version."lodash.defaults"."2.4.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-lodash.defaults-2.4.1";
@@ -12443,66 +10409,6 @@
     ];
     passthru.names = [ "lodash.defaults" ];
   };
-  by-spec."lodash.findindex"."^2.4.1" =
-    self.by-version."lodash.findindex"."2.4.1";
-  by-version."lodash.findindex"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.findindex-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.findindex/-/lodash.findindex-2.4.1.tgz";
-        name = "lodash.findindex-2.4.1.tgz";
-        sha1 = "738d108641cf2ef087207f35f2c6a5eacf807caa";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.findindex" or []);
-    deps = [
-      self.by-version."lodash.createcallback"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.findindex" ];
-  };
-  by-spec."lodash.forin"."~2.4.1" =
-    self.by-version."lodash.forin"."2.4.1";
-  by-version."lodash.forin"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.forin-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.forin/-/lodash.forin-2.4.1.tgz";
-        name = "lodash.forin-2.4.1.tgz";
-        sha1 = "8089eaed7d25b08672b7c66fd07ac55d062320eb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.forin" or []);
-    deps = [
-      self.by-version."lodash._basecreatecallback"."2.4.1"
-      self.by-version."lodash._objecttypes"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.forin" ];
-  };
-  by-spec."lodash.identity"."~2.4.1" =
-    self.by-version."lodash.identity"."2.4.1";
-  by-version."lodash.identity"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.identity-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.identity/-/lodash.identity-2.4.1.tgz";
-        name = "lodash.identity-2.4.1.tgz";
-        sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.identity" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.identity" ];
-  };
   by-spec."lodash.isfunction"."~2.4.1" =
     self.by-version."lodash.isfunction"."2.4.1";
   by-version."lodash.isfunction"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -12564,25 +10470,6 @@
     ];
     passthru.names = [ "lodash.keys" ];
   };
-  by-spec."lodash.noop"."~2.4.1" =
-    self.by-version."lodash.noop"."2.4.1";
-  by-version."lodash.noop"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.noop-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz";
-        name = "lodash.noop-2.4.1.tgz";
-        sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.noop" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.noop" ];
-  };
   by-spec."lodash.now"."~2.4.1" =
     self.by-version."lodash.now"."2.4.1";
   by-version."lodash.now"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -12603,54 +10490,15 @@
     ];
     passthru.names = [ "lodash.now" ];
   };
-  by-spec."lodash.property"."~2.4.1" =
-    self.by-version."lodash.property"."2.4.1";
-  by-version."lodash.property"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.property-2.4.1";
+  by-spec."log-driver"."1.2.1" =
+    self.by-version."log-driver"."1.2.1";
+  by-version."log-driver"."1.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log-driver-1.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lodash.property/-/lodash.property-2.4.1.tgz";
-        name = "lodash.property-2.4.1.tgz";
-        sha1 = "4049c0549daf5a7102bc5e93eeaebb379deb132f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.property" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.property" ];
-  };
-  by-spec."lodash.support"."~2.4.1" =
-    self.by-version."lodash.support"."2.4.1";
-  by-version."lodash.support"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lodash.support-2.4.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lodash.support/-/lodash.support-2.4.1.tgz";
-        name = "lodash.support-2.4.1.tgz";
-        sha1 = "320e0b67031673c28d7a2bb5d9e0331a45240515";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lodash.support" or []);
-    deps = [
-      self.by-version."lodash._isnative"."2.4.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "lodash.support" ];
-  };
-  by-spec."log-driver"."1.2.4" =
-    self.by-version."log-driver"."1.2.4";
-  by-version."log-driver"."1.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log-driver-1.2.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
-        name = "log-driver-1.2.4.tgz";
-        sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3";
+        url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.1.tgz";
+        name = "log-driver-1.2.1.tgz";
+        sha1 = "ada8202a133e99764306652e195e28268b0bea5b";
       })
     ];
     buildInputs =
@@ -12662,14 +10510,14 @@
     passthru.names = [ "log-driver" ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.15";
-  by-version."log4js"."0.6.15" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log4js-0.6.15";
+    self.by-version."log4js"."0.6.14";
+  by-version."log4js"."0.6.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log4js-0.6.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.15.tgz";
-        name = "log4js-0.6.15.tgz";
-        sha1 = "f28815e44711fa6535bd072abf86f7d55a004df0";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.14.tgz";
+        name = "log4js-0.6.14.tgz";
+        sha1 = "7c26a0a25536b42bafa17fd937b87536fad3b229";
       })
     ];
     buildInputs =
@@ -12683,6 +10531,25 @@
     ];
     passthru.names = [ "log4js" ];
   };
+  by-spec."long"."*" =
+    self.by-version."long"."1.1.2";
+  by-version."long"."1.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-long-1.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/long/-/long-1.1.2.tgz";
+        name = "long-1.1.2.tgz";
+        sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."long" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "long" ];
+  };
   by-spec."longjohn"."~0.2.2" =
     self.by-version."longjohn"."0.2.4";
   by-version."longjohn"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -12778,8 +10645,6 @@
     ];
     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 {
@@ -12820,26 +10685,6 @@
   };
   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 {
@@ -12860,46 +10705,45 @@
     passthru.names = [ "lsmod" ];
   };
   by-spec."mailcomposer".">= 0.1.27" =
-    self.by-version."mailcomposer"."0.2.11";
-  by-version."mailcomposer"."0.2.11" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mailcomposer-0.2.11";
+    self.by-version."mailcomposer"."0.2.9";
+  by-version."mailcomposer"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mailcomposer-0.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.11.tgz";
-        name = "mailcomposer-0.2.11.tgz";
-        sha1 = "37ddfdb63aa2e37481c001ab5bb17aaa5c234c89";
+        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.9.tgz";
+        name = "mailcomposer-0.2.9.tgz";
+        sha1 = "2b6417a4fb5de8ffcaf1a27e1b024463903f908e";
       })
     ];
     buildInputs =
       (self.nativeDeps."mailcomposer" or []);
     deps = [
-      self.by-version."mimelib"."0.2.16"
+      self.by-version."mimelib"."0.2.14"
       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.2"
+      self.by-version."dkim-signer"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mailcomposer" ];
   };
   by-spec."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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/map-key/-/map-key-0.1.4.tgz";
-        name = "map-key-0.1.4.tgz";
-        sha1 = "4cfae88e90b663d2c588ca5a6852f89ae049ad6b";
+        url = "http://registry.npmjs.org/map-key/-/map-key-0.1.1.tgz";
+        name = "map-key-0.1.1.tgz";
+        sha1 = "cf0d6ad80ae145477d25904c9eb44b23ac471c8b";
       })
     ];
     buildInputs =
       (self.nativeDeps."map-key" or []);
     deps = [
-      self.by-version."lodash"."2.4.1"
-      self.by-version."underscore.string"."2.3.3"
+      self.by-version."mout"."0.9.1"
     ];
     peerDependencies = [
     ];
@@ -12940,35 +10784,15 @@
       (self.nativeDeps."maxmin" or []);
     deps = [
       self.by-version."gzip-size"."0.1.1"
-      self.by-version."pretty-bytes"."0.1.1"
+      self.by-version."pretty-bytes"."0.1.0"
       self.by-version."chalk"."0.4.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "maxmin" ];
   };
-  by-spec."maxmin"."~0.2.0" =
-    self.by-version."maxmin"."0.2.0";
-  by-version."maxmin"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-maxmin-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/maxmin/-/maxmin-0.2.0.tgz";
-        name = "maxmin-0.2.0.tgz";
-        sha1 = "a0ba0db0a5ee2069738553cd3163e1c730a8a4bc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."maxmin" or []);
-    deps = [
-      self.by-version."chalk"."0.4.0"
-      self.by-version."gzip-size"."0.2.0"
-      self.by-version."pretty-bytes"."0.1.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "maxmin" ];
-  };
+  by-spec."maxmin"."~0.1.0" =
+    self.by-version."maxmin"."0.1.0";
   by-spec."meat"."*" =
     self.by-version."meat"."0.2.5";
   by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -12995,50 +10819,6 @@
     passthru.names = [ "meat" ];
   };
   "meat" = self.by-version."meat"."0.2.5";
-  by-spec."media-typer"."0.2.0" =
-    self.by-version."media-typer"."0.2.0";
-  by-version."media-typer"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-media-typer-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
-        name = "media-typer-0.2.0.tgz";
-        sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."media-typer" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "media-typer" ];
-  };
-  by-spec."memoizee"."0.3.x" =
-    self.by-version."memoizee"."0.3.4";
-  by-version."memoizee"."0.3.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-memoizee-0.3.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.4.tgz";
-        name = "memoizee-0.3.4.tgz";
-        sha1 = "e6e675eeab30c3e21fb6104c26be0219de15186c";
-      })
-    ];
-    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 {
@@ -13080,28 +10860,45 @@
     ];
     passthru.names = [ "merge-descriptors" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/method-override/-/method-override-2.0.2.tgz";
-        name = "method-override-2.0.2.tgz";
-        sha1 = "00531278c79789640bf27e97e26a3a5a1f7cca73";
+        url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
+        name = "method-override-1.0.0.tgz";
+        sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61";
       })
     ];
     buildInputs =
       (self.nativeDeps."method-override" or []);
     deps = [
-      self.by-version."methods"."1.0.1"
-      self.by-version."parseurl"."1.0.1"
-      self.by-version."vary"."0.1.0"
+      self.by-version."methods"."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 {
@@ -13123,61 +10920,6 @@
   };
   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 {
@@ -13275,9 +11017,9 @@
     ];
     passthru.names = [ "mime" ];
   };
-  by-spec."mime".">= 0.0.1" =
+  by-spec."mime"."1.2.x" =
     self.by-version."mime"."1.2.11";
-  by-spec."mime"."^1.2.9" =
+  by-spec."mime".">= 0.0.1" =
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.11" =
     self.by-version."mime"."1.2.11";
@@ -13287,61 +11029,21 @@
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.9" =
     self.by-version."mime"."1.2.11";
-  by-spec."mime-types"."1.0.0" =
-    self.by-version."mime-types"."1.0.0";
-  by-version."mime-types"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mime-types-1.0.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.0.tgz";
-        name = "mime-types-1.0.0.tgz";
-        sha1 = "6a7b4a6af2e7d92f97afe03f047c7801e8f001d2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime-types" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime-types" ];
-  };
-  by-spec."mime-types"."~1.0.0" =
-    self.by-version."mime-types"."1.0.1";
-  by-version."mime-types"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mime-types-1.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.1.tgz";
-        name = "mime-types-1.0.1.tgz";
-        sha1 = "4d9ad71bcd4cdef6be892c21b5b81645607c0b8f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime-types" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime-types" ];
-  };
-  by-spec."mime-types"."~1.0.1" =
-    self.by-version."mime-types"."1.0.1";
-  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.16.tgz";
-        name = "mimelib-0.2.16.tgz";
-        sha1 = "2df4fc292c381b662d81d0b926f6795e6aa1c4f4";
+        url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz";
+        name = "mimelib-0.2.14.tgz";
+        sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831";
       })
     ];
     buildInputs =
       (self.nativeDeps."mimelib" or []);
     deps = [
-      self.by-version."encoding"."0.1.8"
+      self.by-version."encoding"."0.1.7"
       self.by-version."addressparser"."0.2.1"
     ];
     peerDependencies = [
@@ -13349,14 +11051,14 @@
     passthru.names = [ "mimelib" ];
   };
   by-spec."minimatch"."0" =
-    self.by-version."minimatch"."0.3.0";
-  by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-minimatch-0.3.0";
+    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.3.0.tgz";
-        name = "minimatch-0.3.0.tgz";
-        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+        name = "minimatch-0.2.14.tgz";
+        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
       })
     ];
     buildInputs =
@@ -13391,46 +11093,25 @@
   };
   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.3.0";
+    self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."0.x.x" =
-    self.by-version."minimatch"."0.3.0";
+    self.by-version."minimatch"."0.2.14";
   by-spec."minimatch".">=0.2.4" =
-    self.by-version."minimatch"."0.3.0";
-  by-spec."minimatch"."^0.3.0" =
-    self.by-version."minimatch"."0.3.0";
+    self.by-version."minimatch"."0.2.14";
   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."minimatch"."~0.3.0" =
-    self.by-version."minimatch"."0.3.0";
-  by-spec."minimist"."0.0.8" =
+  by-spec."minimist"."~0.0.1" =
     self.by-version."minimist"."0.0.8";
   by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
     name = "node-minimist-0.0.8";
@@ -13449,76 +11130,19 @@
     ];
     passthru.names = [ "minimist" ];
   };
-  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/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.8";
   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";
+    self.by-version."minimist"."0.0.8";
   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";
+    self.by-version."ministyle"."0.1.3";
+  by-version."ministyle"."0.1.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ministyle-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
-        name = "ministyle-0.1.4.tgz";
-        sha1 = "b10481eb16aa8f7b6cd983817393a44da0e5a0cd";
+        url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.3.tgz";
+        name = "ministyle-0.1.3.tgz";
+        sha1 = "d7a639f29e9450b9d5ebf2255d1fa8d1d9d89900";
       })
     ];
     buildInputs =
@@ -13550,29 +11174,6 @@
     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";
@@ -13591,6 +11192,11 @@
     ];
     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 {
@@ -13614,24 +11220,16 @@
     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.5.0";
+    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."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 {
@@ -13652,14 +11250,14 @@
     passthru.names = [ "mkpath" ];
   };
   by-spec."mocha"."*" =
-    self.by-version."mocha"."1.20.1";
-  by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-1.20.1";
+    self.by-version."mocha"."1.18.2";
+  by-version."mocha"."1.18.2" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.18.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz";
-        name = "mocha-1.20.1.tgz";
-        sha1 = "f343832d9fe0c7d97c64fc70448f5136df9fed5b";
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.18.2.tgz";
+        name = "mocha-1.18.2.tgz";
+        sha1 = "800848f8f7884c61eefcfa2a27304ba9e5446d0b";
       })
     ];
     buildInputs =
@@ -13669,7 +11267,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"."1.0.2"
+      self.by-version."debug"."0.8.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -13677,32 +11275,56 @@
     ];
     passthru.names = [ "mocha" ];
   };
-  "mocha" = self.by-version."mocha"."1.20.1";
-  by-spec."mocha"."~1.20.1" =
-    self.by-version."mocha"."1.20.1";
-  by-spec."mocha-phantomjs"."*" =
-    self.by-version."mocha-phantomjs"."3.5.0";
-  by-version."mocha-phantomjs"."3.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mocha-phantomjs-3.5.0";
+  "mocha" = self.by-version."mocha"."1.18.2";
+  by-spec."mocha"."1.13.x" =
+    self.by-version."mocha"."1.13.0";
+  by-version."mocha"."1.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.13.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.0.tgz";
-        name = "mocha-phantomjs-3.5.0.tgz";
-        sha1 = "56fb4072122b4061b21e9c3901e35f4a7c58a93e";
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.13.0.tgz";
+        name = "mocha-1.13.0.tgz";
+        sha1 = "8d8fa4e310b94cc6efeb3ed26aeca96dea93307c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mocha" or []);
+    deps = [
+      self.by-version."commander"."0.6.1"
+      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."mkdirp"."0.3.5"
+      self.by-version."glob"."3.2.3"
+    ];
+    peerDependencies = [
+    ];
+    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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.3.2.tgz";
+        name = "mocha-phantomjs-3.3.2.tgz";
+        sha1 = "2d7cc9926f0fbbeb341697d7f2a031151c601722";
       })
     ];
     buildInputs =
       (self.nativeDeps."mocha-phantomjs" or []);
     deps = [
-      self.by-version."mocha"."1.20.1"
-      self.by-version."commander"."2.0.0"
+      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-12"
     ];
     passthru.names = [ "mocha-phantomjs" ];
   };
-  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.0";
+  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.3.2";
   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 {
@@ -13720,59 +11342,62 @@
       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.4"
+      self.by-version."ministyle"."0.1.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "mocha-unfunk-reporter" ];
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
-  by-spec."modmod"."^0.1.1" =
-    self.by-version."modmod"."0.1.2";
-  by-version."modmod"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-modmod-0.1.2";
+  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/modmod/-/modmod-0.1.2.tgz";
-        name = "modmod-0.1.2.tgz";
-        sha1 = "86d5abdc5f6528acceb9f29225ace6089eb3af59";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."modmod" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "modmod" ];
-  };
-  by-spec."module-deps"."~2.1.1" =
-    self.by-version."module-deps"."2.1.3";
-  by-version."module-deps"."2.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "module-deps-2.1.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-2.1.3.tgz";
-        name = "module-deps-2.1.3.tgz";
-        sha1 = "05211cfd29bf60e64593b79b976c6d57410318e4";
+        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.4"
+      self.by-version."JSONStream"."0.7.2"
       self.by-version."browser-resolve"."1.2.4"
-      self.by-version."concat-stream"."1.4.6"
+      self.by-version."concat-stream"."1.4.5"
       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."minimist"."0.0.8"
       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"
+      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 {
+    name = "module-deps-1.8.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.8.1.tgz";
+        name = "module-deps-1.8.1.tgz";
+        sha1 = "9d603b286f87cf62aad9e3f7b65a2f8bfa21de5b";
+      })
+    ];
+    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 = [
     ];
@@ -13835,48 +11460,28 @@
     ];
     passthru.names = [ "moment" ];
   };
-  by-spec."moment"."~2.7.0" =
-    self.by-version."moment"."2.7.0";
-  by-version."moment"."2.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-moment-2.7.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz";
-        name = "moment-2.7.0.tgz";
-        sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."moment" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "moment" ];
-  };
-  by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.7";
-  by-version."mongodb"."1.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.7";
-    src = [
-      (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.7.tgz";
-        name = "mongodb-1.4.7.tgz";
-        sha1 = "f605b5d43c6c018c7d56d2fb53984dd60a7be128";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.2.tgz";
+        name = "mongodb-1.4.2.tgz";
+        sha1 = "68b5a5ac7ee146dcbdf17d01f60ffe88e61e76aa";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongodb" or []);
     deps = [
-      self.by-version."bson"."0.2.9"
+      self.by-version."bson"."0.2.7"
       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.7";
+  "mongodb" = self.by-version."mongodb"."1.4.2";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -13918,7 +11523,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  by-spec."mongodb"."1.3.x" =
+  by-spec."mongodb"."1.3.23" =
     self.by-version."mongodb"."1.3.23";
   by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage {
     name = "node-mongodb-1.3.23";
@@ -13939,51 +11544,31 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  by-spec."mongodb"."1.4.5" =
-    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.8"
-      self.by-version."kerberos"."0.0.3"
-      self.by-version."readable-stream"."1.1.13-1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mongodb" ];
-  };
+  by-spec."mongodb"."1.3.x" =
+    self.by-version."mongodb"."1.3.23";
   by-spec."mongoose"."*" =
-    self.by-version."mongoose"."3.9.0";
-  by-version."mongoose"."3.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongoose-3.9.0";
+    self.by-version."mongoose"."3.8.8";
+  by-version."mongoose"."3.8.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongoose-3.8.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.9.0.tgz";
-        name = "mongoose-3.9.0.tgz";
-        sha1 = "e888b414025ee1fd4ce1eeef48031ceed896fc30";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.8.tgz";
+        name = "mongoose-3.8.8.tgz";
+        sha1 = "ab046f1fa17b0bdf090a04b6d034d87d240a47c2";
       })
     ];
     buildInputs =
       (self.nativeDeps."mongoose" or []);
     deps = [
-      self.by-version."hooks"."0.3.2"
-      self.by-version."mongodb"."1.4.5"
+      self.by-version."hooks"."0.2.1"
+      self.by-version."mongodb"."1.3.23"
       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.5.0"
+      self.by-version."mpromise"."0.4.3"
       self.by-version."mpath"."0.1.1"
       self.by-version."regexp-clone"."0.0.1"
-      self.by-version."mquery"."0.7.0"
+      self.by-version."mquery"."0.5.3"
     ];
     peerDependencies = [
     ];
@@ -14123,26 +11708,45 @@
     ];
     passthru.names = [ "monocle" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/morgan/-/morgan-1.1.1.tgz";
-        name = "morgan-1.1.1.tgz";
-        sha1 = "cde45d2e807ebcc439745846ea80392e69098146";
+        url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
+        name = "morgan-1.0.0.tgz";
+        sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d";
       })
     ];
     buildInputs =
       (self.nativeDeps."morgan" or []);
     deps = [
-      self.by-version."bytes"."1.0.0"
+      self.by-version."bytes"."0.2.1"
     ];
     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 {
@@ -14183,25 +11787,6 @@
   };
   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 {
@@ -14241,15 +11826,15 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mpromise/-/mpromise-0.5.0.tgz";
-        name = "mpromise-0.5.0.tgz";
-        sha1 = "8ff8f6aba6534bffa6fff296e13348cd065091b5";
+        url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz";
+        name = "mpromise-0.4.3.tgz";
+        sha1 = "edc47a75a2a177b0e9382735db52dbec3808cc33";
       })
     ];
     buildInputs =
@@ -14260,15 +11845,15 @@
     ];
     passthru.names = [ "mpromise" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mquery/-/mquery-0.7.0.tgz";
-        name = "mquery-0.7.0.tgz";
-        sha1 = "2d205abe097aff0f898d3ad9e43bd031031cdb1e";
+        url = "http://registry.npmjs.org/mquery/-/mquery-0.5.3.tgz";
+        name = "mquery-0.5.3.tgz";
+        sha1 = "b8a04d096ecf90bf17a81cc39b80dd4e5abcecec";
       })
     ];
     buildInputs =
@@ -14301,25 +11886,6 @@
     ];
     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 {
@@ -14360,27 +11926,6 @@
     ];
     passthru.names = [ "multiparty" ];
   };
-  by-spec."multiparty"."3.2.9" =
-    self.by-version."multiparty"."3.2.9";
-  by-version."multiparty"."3.2.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-multiparty-3.2.9";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/multiparty/-/multiparty-3.2.9.tgz";
-        name = "multiparty-3.2.9.tgz";
-        sha1 = "c73373ea9c012e7776ce5bc40c936264b6ba2c1e";
-      })
-    ];
-    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 {
@@ -14459,82 +12004,6 @@
     ];
     passthru.names = [ "mv" ];
   };
-  by-spec."mz"."1" =
-    self.by-version."mz"."1.0.0";
-  by-version."mz"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mz-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mz/-/mz-1.0.0.tgz";
-        name = "mz-1.0.0.tgz";
-        sha1 = "f9d7e873b8bca8632cafad1ce649c198fe36e952";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mz" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "mz" ];
-  };
-  by-spec."nan"."1.1.2" =
-    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."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.8.0" =
-    self.by-version."nan"."0.8.0";
-  by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-nan-0.8.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-0.8.0.tgz";
-        name = "nan-0.8.0.tgz";
-        sha1 = "022a8fa5e9fe8420964ac1fb3dc94e17f449f5fd";
-      })
-    ];
-    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 {
@@ -14554,17 +12023,15 @@
     ];
     passthru.names = [ "nan" ];
   };
-  by-spec."nan"."~0.8.0" =
-    self.by-version."nan"."0.8.0";
-  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";
+  by-spec."nan"."~0.6.0" =
+    self.by-version."nan"."0.6.0";
+  by-version."nan"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-0.6.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
-        name = "nan-1.0.0.tgz";
-        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+        url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz";
+        name = "nan-0.6.0.tgz";
+        sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa";
       })
     ];
     buildInputs =
@@ -14575,53 +12042,24 @@
     ];
     passthru.names = [ "nan" ];
   };
-  by-spec."nan"."~1.1.0" =
-    self.by-version."nan"."1.1.2";
-  by-spec."nan"."~1.2.0" =
-    self.by-version."nan"."1.2.0";
-  by-spec."nano"."*" =
-    self.by-version."nano"."5.10.0";
-  by-version."nano"."5.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-nano-5.10.0";
+  by-spec."nan"."~0.8.0" =
+    self.by-version."nan"."0.8.0";
+  by-version."nan"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-nan-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nano/-/nano-5.10.0.tgz";
-        name = "nano-5.10.0.tgz";
-        sha1 = "c9b3e8c43162c4fd4603ac1b2df2a287bcce5cf5";
+        url = "http://registry.npmjs.org/nan/-/nan-0.8.0.tgz";
+        name = "nan-0.8.0.tgz";
+        sha1 = "022a8fa5e9fe8420964ac1fb3dc94e17f449f5fd";
       })
     ];
     buildInputs =
-      (self.nativeDeps."nano" or []);
+      (self.nativeDeps."nan" or []);
     deps = [
-      self.by-version."request"."2.33.0"
-      self.by-version."follow"."0.11.2"
-      self.by-version."errs"."0.2.4"
-      self.by-version."underscore"."1.5.2"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "nano" ];
-  };
-  by-spec."native-buffer-browserify"."~2.0.8" =
-    self.by-version."native-buffer-browserify"."2.0.17";
-  by-version."native-buffer-browserify"."2.0.17" = lib.makeOverridable self.buildNodePackage {
-    name = "node-native-buffer-browserify-2.0.17";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/native-buffer-browserify/-/native-buffer-browserify-2.0.17.tgz";
-        name = "native-buffer-browserify-2.0.17.tgz";
-        sha1 = "980577018c4884d169da40b47958ffac6c327d15";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."native-buffer-browserify" or []);
-    deps = [
-      self.by-version."base64-js"."0.0.7"
-      self.by-version."ieee754"."1.1.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "native-buffer-browserify" ];
+    passthru.names = [ "nan" ];
   };
   by-spec."natural"."0.1.17" =
     self.by-version."natural"."0.1.17";
@@ -14660,7 +12098,7 @@
       (self.nativeDeps."nconf" or []);
     deps = [
       self.by-version."async"."0.2.9"
-      self.by-version."ini"."1.2.1"
+      self.by-version."ini"."1.1.0"
       self.by-version."optimist"."0.6.0"
     ];
     peerDependencies = [
@@ -14752,15 +12190,15 @@
     ];
     passthru.names = [ "negotiator" ];
   };
-  by-spec."negotiator"."0.4.7" =
-    self.by-version."negotiator"."0.4.7";
-  by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-negotiator-0.4.7";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
-        name = "negotiator-0.4.7.tgz";
-        sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
+        url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
+        name = "negotiator-0.4.2.tgz";
+        sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37";
       })
     ];
     buildInputs =
@@ -14812,25 +12250,6 @@
     ];
     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 {
@@ -14907,113 +12326,111 @@
     passthru.names = [ "node-appc" ];
   };
   by-spec."node-expat"."*" =
-    self.by-version."node-expat"."2.3.0";
-  by-version."node-expat"."2.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-node-expat-2.3.0";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.0.tgz";
-        name = "node-expat-2.3.0.tgz";
-        sha1 = "4be94d52817996c96217be3439694336f84582b9";
+        url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz";
+        name = "node-expat-2.1.4.tgz";
+        sha1 = "e55a82249b71afbce09ffa880705ec37553c5121";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-expat" or []);
     deps = [
-      self.by-version."nan"."1.2.0"
+      self.by-version."nan"."0.6.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-expat" ];
   };
-  "node-expat" = self.by-version."node-expat"."2.3.0";
+  "node-expat" = self.by-version."node-expat"."2.1.4";
   by-spec."node-gyp"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.1.tgz";
-        name = "node-gyp-0.13.1.tgz";
-        sha1 = "5a484dd2dc13d5b894a8fe781a250c07eae7bffa";
+        url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.13.0.tgz";
+        name = "node-gyp-0.13.0.tgz";
+        sha1 = "84e216991a64ce5f03d50c95518bd72ca9e10f1e";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-gyp" or []);
     deps = [
-      self.by-version."glob"."3.2.11"
+      self.by-version."glob"."3.2.9"
       self.by-version."graceful-fs"."2.0.3"
-      self.by-version."fstream"."0.1.28"
-      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.1"
-      self.by-version."osenv"."0.1.0"
-      self.by-version."request"."2.36.0"
-      self.by-version."rimraf"."2.2.8"
+      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."semver"."2.2.1"
-      self.by-version."tar"."0.1.20"
+      self.by-version."tar"."0.1.19"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-gyp" ];
   };
-  "node-gyp" = self.by-version."node-gyp"."0.13.1";
+  "node-gyp" = self.by-version."node-gyp"."0.13.0";
   by-spec."node-gyp"."~0.13.0" =
-    self.by-version."node-gyp"."0.13.1";
+    self.by-version."node-gyp"."0.13.0";
   by-spec."node-inspector"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz";
-        name = "node-inspector-0.7.4.tgz";
-        sha1 = "3d07234f0834e7f1e21a1669eceaa224a7be43f2";
+        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.3.tgz";
+        name = "node-inspector-0.7.3.tgz";
+        sha1 = "988317f9a7e645d1bb78e40bb2289db82a077e73";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-inspector" or []);
     deps = [
-      self.by-version."express"."4.0.0"
-      self.by-version."async"."0.8.0"
-      self.by-version."glob"."3.2.11"
+      self.by-version."express"."3.5.1"
+      self.by-version."async"."0.4.1"
+      self.by-version."glob"."3.2.9"
       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.2.6"
+      self.by-version."yargs"."1.1.3"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-inspector" ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.7.4";
+  "node-inspector" = self.by-version."node-inspector"."0.7.3";
   by-spec."node-protobuf"."*" =
-    self.by-version."node-protobuf"."1.1.1";
-  by-version."node-protobuf"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-node-protobuf-1.1.1";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.1.1.tgz";
-        name = "node-protobuf-1.1.1.tgz";
-        sha1 = "83ae987aa5e42c04ee601f39da1d81b4cd8c762f";
+        url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.0.10.tgz";
+        name = "node-protobuf-1.0.10.tgz";
+        sha1 = "a8a02d55129efe1776bc3e038d7e6c676c001fcd";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-protobuf" or []);
     deps = [
-      self.by-version."bindings"."1.2.1"
-      self.by-version."nan"."1.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "node-protobuf" ];
   };
-  "node-protobuf" = self.by-version."node-protobuf"."1.1.1";
+  "node-protobuf" = self.by-version."node-protobuf"."1.0.10";
   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 {
@@ -15164,7 +12581,7 @@
     buildInputs =
       (self.nativeDeps."node-wsfederation" or []);
     deps = [
-      self.by-version."xml2js"."0.4.4"
+      self.by-version."xml2js"."0.4.2"
     ];
     peerDependencies = [
     ];
@@ -15203,8 +12620,8 @@
     buildInputs =
       (self.nativeDeps."nodemailer" or []);
     deps = [
-      self.by-version."mailcomposer"."0.2.11"
-      self.by-version."simplesmtp"."0.3.32"
+      self.by-version."mailcomposer"."0.2.9"
+      self.by-version."simplesmtp"."0.3.25"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -15212,28 +12629,27 @@
     passthru.names = [ "nodemailer" ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.2.1";
-  by-version."nodemon"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "nodemon-1.2.1";
+    self.by-version."nodemon"."1.0.17";
+  by-version."nodemon"."1.0.17" = lib.makeOverridable self.buildNodePackage {
+    name = "nodemon-1.0.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.1.tgz";
-        name = "nodemon-1.2.1.tgz";
-        sha1 = "02a288045652e92350e7d752a8054472ed2c4824";
+        url = "http://registry.npmjs.org/nodemon/-/nodemon-1.0.17.tgz";
+        name = "nodemon-1.0.17.tgz";
+        sha1 = "910a3f3cb66c06a3499498455cf4e0119f75799c";
       })
     ];
     buildInputs =
       (self.nativeDeps."nodemon" or []);
     deps = [
-      self.by-version."update-notifier"."0.1.10"
-      self.by-version."minimatch"."0.3.0"
-      self.by-version."ps-tree"."0.0.3"
+      self.by-version."update-notifier"."0.1.8"
+      self.by-version."minimatch"."0.2.14"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "nodemon" ];
   };
-  "nodemon" = self.by-version."nodemon"."1.2.1";
+  "nodemon" = self.by-version."nodemon"."1.0.17";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
@@ -15256,14 +12672,14 @@
     passthru.names = [ "nomnom" ];
   };
   by-spec."nopt"."2" =
-    self.by-version."nopt"."2.2.1";
-  by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-2.2.1";
+    self.by-version."nopt"."2.2.0";
+  by-version."nopt"."2.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "nopt-2.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
-        name = "nopt-2.2.1.tgz";
-        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
+        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.0.tgz";
+        name = "nopt-2.2.0.tgz";
+        sha1 = "3d106676f3607ac466af9bf82bd707b1501d3bd5";
       })
     ];
     buildInputs =
@@ -15295,30 +12711,10 @@
     ];
     passthru.names = [ "nopt" ];
   };
-  by-spec."nopt"."3.x" =
-    self.by-version."nopt"."3.0.1";
-  by-version."nopt"."3.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-3.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
-        name = "nopt-3.0.1.tgz";
-        sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nopt" or []);
-    deps = [
-      self.by-version."abbrev"."1.0.5"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "nopt" ];
-  };
+  by-spec."nopt"."2.2.x" =
+    self.by-version."nopt"."2.2.0";
   by-spec."nopt"."^2.2.0" =
-    self.by-version."nopt"."2.2.1";
-  by-spec."nopt"."^3.0.0" =
-    self.by-version."nopt"."3.0.1";
+    self.by-version."nopt"."2.2.0";
   by-spec."nopt"."~1.0.10" =
     self.by-version."nopt"."1.0.10";
   by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -15362,99 +12758,89 @@
   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.1";
-  by-spec."nopt"."~3.0.0" =
-    self.by-version."nopt"."3.0.1";
-  by-spec."nopt"."~3.0.1" =
-    self.by-version."nopt"."3.0.1";
-  by-spec."normalize-package-data"."^0.4.0" =
-    self.by-version."normalize-package-data"."0.4.1";
-  by-version."normalize-package-data"."0.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-normalize-package-data-0.4.1";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.4.1.tgz";
-        name = "normalize-package-data-0.4.1.tgz";
-        sha1 = "c7c83d0927cda14332aa08cf48e944919ed9102f";
+        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";
       })
     ];
     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.2.0"
-      self.by-version."semver"."2.3.1"
+      self.by-version."github-url-from-username-repo"."0.0.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.5.0-alpha-1";
-  by-version."npm"."1.5.0-alpha-1" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.5.0-alpha-1";
+    self.by-version."npm"."1.4.7";
+  by-version."npm"."1.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.4.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.5.0-alpha-1.tgz";
-        name = "npm-1.5.0-alpha-1.tgz";
-        sha1 = "98dd2e1562e598e2df36a11ac27a5743a9c1afa0";
+        url = "http://registry.npmjs.org/npm/-/npm-1.4.7.tgz";
+        name = "npm-1.4.7.tgz";
+        sha1 = "7e3c4385973ffb58c9bf15eebe2668c0ce3fafe0";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm" or []);
     deps = [
       self.by-version."abbrev"."1.0.5"
-      self.by-version."ansi"."0.3.0"
+      self.by-version."ansi"."0.2.1"
       self.by-version."ansicolors"."0.3.2"
       self.by-version."ansistyles"."0.1.3"
       self.by-version."archy"."0.0.2"
-      self.by-version."async-some"."1.0.1"
       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"
       self.by-version."cmd-shim"."1.1.1"
-      self.by-version."columnify"."1.1.0"
-      self.by-version."editor"."0.1.0"
-      self.by-version."fs-vacuum"."1.2.1"
-      self.by-version."fstream"."0.1.28"
-      self.by-version."fstream-npm"."0.1.7"
+      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."github-url-from-git"."1.1.1"
-      self.by-version."github-url-from-username-repo"."0.2.0"
-      self.by-version."glob"."4.0.3"
-      self.by-version."graceful-fs"."3.0.2"
-      self.by-version."inflight"."1.0.1"
-      self.by-version."ini"."1.2.1"
-      self.by-version."init-package-json"."0.1.0"
+      self.by-version."github-url-from-username-repo"."0.0.2"
+      self.by-version."glob"."3.2.9"
+      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."lockfile"."0.4.2"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."minimatch"."0.3.0"
+      self.by-version."minimatch"."0.2.14"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."node-gyp"."0.13.1"
-      self.by-version."nopt"."3.0.1"
-      self.by-version."npm-cache-filename"."1.0.1"
-      self.by-version."npm-install-checks"."1.0.2"
-      self.by-version."npm-package-arg"."2.0.0"
-      self.by-version."npm-registry-client"."3.0.0"
-      self.by-version."npm-user-validate"."0.1.0"
-      self.by-version."npmconf"."2.0.1"
-      self.by-version."npmlog"."0.1.1"
+      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."npmlog"."0.0.6"
       self.by-version."once"."1.3.0"
       self.by-version."opener"."1.3.0"
-      self.by-version."osenv"."0.1.0"
+      self.by-version."osenv"."0.0.3"
       self.by-version."path-is-inside"."1.0.1"
       self.by-version."read"."1.0.5"
-      self.by-version."read-installed"."2.0.5"
-      self.by-version."read-package-json"."1.2.3"
+      self.by-version."read-installed"."2.0.2"
+      self.by-version."read-package-json"."1.1.8"
       self.by-version."request"."2.30.0"
-      self.by-version."retry"."0.6.1"
-      self.by-version."rimraf"."2.2.8"
-      self.by-version."semver"."2.3.1"
-      self.by-version."sha"."1.2.4"
+      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."slide"."1.1.5"
       self.by-version."sorted-object"."1.0.0"
-      self.by-version."tar"."0.1.20"
+      self.by-version."tar"."0.1.19"
       self.by-version."text-table"."0.2.0"
       self.by-version."uid-number"."0.0.5"
       self.by-version."which"."1.0.5"
@@ -15463,69 +12849,28 @@
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.5.0-alpha-1";
-  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";
+  "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";
     src = [
       (fetchurl {
-        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.2" =
-    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";
+        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";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-install-checks" or []);
     deps = [
-      self.by-version."npmlog"."0.1.1"
-      self.by-version."semver"."2.3.1"
+      self.by-version."npmlog"."0.0.6"
+      self.by-version."semver"."2.2.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-install-checks" ];
   };
-  by-spec."npm-package-arg"."~2.0.0" =
-    self.by-version."npm-package-arg"."2.0.0";
-  by-version."npm-package-arg"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-package-arg-2.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.0.0.tgz";
-        name = "npm-package-arg-2.0.0.tgz";
-        sha1 = "b573aa01f3405c085564dfec930e8acc199bee08";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."npm-package-arg" or []);
-    deps = [
-      self.by-version."semver"."2.3.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "npm-package-arg" ];
-  };
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = lib.makeOverridable self.buildNodePackage {
@@ -15540,60 +12885,58 @@
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."request"."2.36.0"
+      self.by-version."request"."2.34.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.8"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."retry"."0.6.0"
       self.by-version."couch-login"."0.1.20"
-      self.by-version."npmlog"."0.1.1"
+      self.by-version."npmlog"."0.0.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~3.0.0" =
-    self.by-version."npm-registry-client"."3.0.0";
-  by-version."npm-registry-client"."3.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-3.0.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.0.0.tgz";
-        name = "npm-registry-client-3.0.0.tgz";
-        sha1 = "4febc5cdb274e9fa06bc3008910e3fa1ec007994";
+        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";
       })
     ];
     buildInputs =
       (self.nativeDeps."npm-registry-client" or []);
     deps = [
-      self.by-version."chownr"."0.0.1"
-      self.by-version."graceful-fs"."3.0.2"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."normalize-package-data"."0.4.1"
-      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."rimraf"."2.2.8"
-      self.by-version."semver"."2.3.1"
+      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."npmlog"."0.1.1"
+      self.by-version."chownr"."0.0.1"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."rimraf"."2.2.6"
+      self.by-version."retry"."0.6.0"
+      self.by-version."npmlog"."0.0.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
@@ -15618,14 +12961,14 @@
     buildInputs =
       (self.nativeDeps."npm2nix" or []);
     deps = [
-      self.by-version."semver"."2.3.1"
+      self.by-version."semver"."2.2.1"
       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.2.0"
+      self.by-version."findit"."1.1.1"
     ];
     peerDependencies = [
     ];
@@ -15651,7 +12994,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.1"
+      self.by-version."nopt"."2.2.0"
       self.by-version."semver"."1.1.4"
       self.by-version."ini"."1.1.0"
     ];
@@ -15678,23 +13021,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.1"
-      self.by-version."semver"."2.3.1"
+      self.by-version."nopt"."2.2.0"
+      self.by-version."semver"."2.2.1"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npmconf" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
-        name = "npmconf-0.1.16.tgz";
-        sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.14.tgz";
+        name = "npmconf-0.1.14.tgz";
+        sha1 = "aea4bc12c5a84191a32cd350e325da4fe8b127e7";
       })
     ];
     buildInputs =
@@ -15705,68 +13048,42 @@
       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.1"
-      self.by-version."semver"."2.3.1"
+      self.by-version."nopt"."2.2.0"
+      self.by-version."semver"."2.2.1"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npmconf" ];
   };
-  by-spec."npmconf"."~2.0.1" =
-    self.by-version."npmconf"."2.0.1";
-  by-version."npmconf"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npmconf-2.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.1.tgz";
-        name = "npmconf-2.0.1.tgz";
-        sha1 = "e9464590aeb4bf61eea8e08417cdec3af3204115";
-      })
-    ];
-    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.1"
-      self.by-version."once"."1.3.0"
-      self.by-version."osenv"."0.1.0"
-      self.by-version."semver"."2.3.1"
-      self.by-version."uid-number"."0.0.5"
-    ];
-    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."npmlog"."*" =
-    self.by-version."npmlog"."0.1.1";
-  by-version."npmlog"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npmlog-0.1.1";
+    self.by-version."npmlog"."0.0.6";
+  by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmlog-0.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz";
-        name = "npmlog-0.1.1.tgz";
-        sha1 = "8b9b9e4405d7ec48c31c2346965aadc7abaecaa5";
+        url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz";
+        name = "npmlog-0.0.6.tgz";
+        sha1 = "685043fe71aa1665d6e3b2acef180640caf40873";
       })
     ];
     buildInputs =
       (self.nativeDeps."npmlog" or []);
     deps = [
-      self.by-version."ansi"."0.3.0"
+      self.by-version."ansi"."0.2.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "npmlog" ];
   };
   by-spec."npmlog"."0" =
-    self.by-version."npmlog"."0.1.1";
-  by-spec."npmlog"."0.1" =
-    self.by-version."npmlog"."0.1.1";
-  by-spec."npmlog"."~0.1.1" =
-    self.by-version."npmlog"."0.1.1";
+    self.by-version."npmlog"."0.0.6";
+  by-spec."npmlog"."0.0.6" =
+    self.by-version."npmlog"."0.0.6";
   by-spec."nssocket"."~0.5.1" =
     self.by-version."nssocket"."0.5.1";
   by-version."nssocket"."0.5.1" = lib.makeOverridable self.buildNodePackage {
@@ -15781,7 +13098,7 @@
     buildInputs =
       (self.nativeDeps."nssocket" or []);
     deps = [
-      self.by-version."eventemitter2"."0.4.14"
+      self.by-version."eventemitter2"."0.4.13"
       self.by-version."lazy"."1.0.11"
     ];
     peerDependencies = [
@@ -15816,7 +13133,7 @@
       (fetchurl {
         url = "https://github.com/ciaranj/node-oauth/tarball/master";
         name = "oauth-0.9.11.tgz";
-        sha256 = "28bd5c01b560a08b202779792627aeb9675dcd1ad7676ecbe3499220543c907c";
+        sha256 = "14cc7a064e3eda0948ac8db72fae140cb7b0fdbe031375d02cd6d0359c8b8faa";
       })
     ];
     buildInputs =
@@ -15905,25 +13222,6 @@
   };
   by-spec."object-assign"."~0.1.2" =
     self.by-version."object-assign"."0.1.2";
-  by-spec."object-assign"."~0.3.1" =
-    self.by-version."object-assign"."0.3.1";
-  by-version."object-assign"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-object-assign-0.3.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz";
-        name = "object-assign-0.3.1.tgz";
-        sha1 = "060e2a2a27d7c0d77ec77b78f11aa47fd88008d2";
-      })
-    ];
-    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 {
@@ -15943,25 +13241,6 @@
     ];
     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 {
@@ -15981,7 +13260,9 @@
     ];
     passthru.names = [ "once" ];
   };
-  by-spec."once"."^1.3.0" =
+  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-version."once"."1.3.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-once-1.3.0";
@@ -16000,29 +13281,6 @@
     ];
     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."only"."0.0.2" =
-    self.by-version."only"."0.0.2";
-  by-version."only"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-only-0.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/only/-/only-0.0.2.tgz";
-        name = "only-0.0.2.tgz";
-        sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."only" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "only" ];
-  };
   by-spec."open"."0.0.2" =
     self.by-version."open"."0.0.2";
   by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -16042,6 +13300,25 @@
     ];
     passthru.names = [ "open" ];
   };
+  by-spec."open"."0.0.4" =
+    self.by-version."open"."0.0.4";
+  by-version."open"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-open-0.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/open/-/open-0.0.4.tgz";
+        name = "open-0.0.4.tgz";
+        sha1 = "5de46a0858b9f49f9f211aa8f26628550657f262";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."open" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "open" ];
+  };
   by-spec."open"."~0.0.3" =
     self.by-version."open"."0.0.5";
   by-version."open"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -16063,8 +13340,6 @@
   };
   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 {
@@ -16085,14 +13360,14 @@
     passthru.names = [ "opener" ];
   };
   by-spec."openid".">=0.2.0" =
-    self.by-version."openid"."0.5.9";
-  by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-openid-0.5.9";
+    self.by-version."openid"."0.5.8";
+  by-version."openid"."0.5.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-openid-0.5.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz";
-        name = "openid-0.5.9.tgz";
-        sha1 = "f44dd2609764c458c65fb22c03db068579e4bfa8";
+        url = "http://registry.npmjs.org/openid/-/openid-0.5.8.tgz";
+        name = "openid-0.5.8.tgz";
+        sha1 = "e1e3b26235cb8964ef850c074529b9d031550e85";
       })
     ];
     buildInputs =
@@ -16103,27 +13378,6 @@
     ];
     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."opn"."~0.1.1" =
-    self.by-version."opn"."0.1.2";
   by-spec."optimist"."*" =
     self.by-version."optimist"."0.6.1";
   by-version."optimist"."0.6.1" = lib.makeOverridable self.buildNodePackage {
@@ -16139,7 +13393,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.10"
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
@@ -16201,7 +13455,7 @@
       (self.nativeDeps."optimist" or []);
     deps = [
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."minimist"."0.0.10"
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
@@ -16236,6 +13490,25 @@
     ];
     passthru.names = [ "options" ];
   };
+  by-spec."optjs"."*" =
+    self.by-version."optjs"."3.2.1-boom";
+  by-version."optjs"."3.2.1-boom" = lib.makeOverridable self.buildNodePackage {
+    name = "node-optjs-3.2.1-boom";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
+        name = "optjs-3.2.1-boom.tgz";
+        sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."optjs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "optjs" ];
+  };
   by-spec."optparse"."*" =
     self.by-version."optparse"."1.0.5";
   by-version."optparse"."1.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -16258,25 +13531,6 @@
   "optparse" = self.by-version."optparse"."1.0.5";
   by-spec."optparse".">= 1.0.3" =
     self.by-version."optparse"."1.0.5";
-  by-spec."ordered-read-streams"."^0.0.7" =
-    self.by-version."ordered-read-streams"."0.0.7";
-  by-version."ordered-read-streams"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ordered-read-streams-0.0.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.0.7.tgz";
-        name = "ordered-read-streams-0.0.7.tgz";
-        sha1 = "64fb9a2e15c6513a5508389bd6df6829fad91ce9";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ordered-read-streams" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ordered-read-streams" ];
-  };
   by-spec."os-browserify"."~0.1.1" =
     self.by-version."os-browserify"."0.1.2";
   by-version."os-browserify"."0.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -16297,25 +13551,6 @@
     passthru.names = [ "os-browserify" ];
   };
   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";
@@ -16334,10 +13569,10 @@
     ];
     passthru.names = [ "osenv" ];
   };
-  by-spec."osenv"."^0.1.0" =
-    self.by-version."osenv"."0.1.0";
-  by-spec."osenv"."~0.1.0" =
-    self.by-version."osenv"."0.1.0";
+  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"."*" =
     self.by-version."owl-deepcopy"."0.0.4";
   by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -16380,34 +13615,15 @@
     ];
     passthru.names = [ "p-throttler" ];
   };
-  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/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";
+    self.by-version."pako"."0.2.0";
+  by-version."pako"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-pako-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/pako/-/pako-0.2.3.tgz";
-        name = "pako-0.2.3.tgz";
-        sha1 = "da97260282d270c43f210d9e9bf9abdf54072641";
+        url = "http://registry.npmjs.org/pako/-/pako-0.2.0.tgz";
+        name = "pako-0.2.0.tgz";
+        sha1 = "bb93787e8c60587c8b13cd3cd8802e9d6f5dd8d5";
       })
     ];
     buildInputs =
@@ -16644,14 +13860,14 @@
     passthru.names = [ "pause" ];
   };
   by-spec."phantomjs"."*" =
-    self.by-version."phantomjs"."1.9.7-12";
-  by-version."phantomjs"."1.9.7-12" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.7-12";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-12.tgz";
-        name = "phantomjs-1.9.7-12.tgz";
-        sha1 = "b6d1f76b5a81689ff8acbce01468d04b103b860c";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-4.tgz";
+        name = "phantomjs-1.9.7-4.tgz";
+        sha1 = "975b84f17b4b3bb28161d28303cb793b98c9d0dd";
       })
     ];
     buildInputs =
@@ -16662,21 +13878,16 @@
       self.by-version."ncp"."0.4.2"
       self.by-version."npmconf"."0.0.24"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."progress"."1.1.7"
-      self.by-version."request"."2.36.0"
-      self.by-version."request-progress"."0.3.1"
-      self.by-version."rimraf"."2.2.8"
+      self.by-version."rimraf"."2.2.6"
       self.by-version."which"."1.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "phantomjs" ];
   };
-  "phantomjs" = self.by-version."phantomjs"."1.9.7-12";
-  by-spec."phantomjs"."~1.9.1" =
-    self.by-version."phantomjs"."1.9.7-12";
-  by-spec."phantomjs"."~1.9.7" =
-    self.by-version."phantomjs"."1.9.7-12";
+  "phantomjs" = self.by-version."phantomjs"."1.9.7-4";
+  by-spec."phantomjs"."~1.9.1-2" =
+    self.by-version."phantomjs"."1.9.7-4";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -16720,26 +13931,26 @@
   by-spec."pkginfo"."0.x.x" =
     self.by-version."pkginfo"."0.3.0";
   by-spec."plist-native"."*" =
-    self.by-version."plist-native"."0.3.1";
-  by-version."plist-native"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-plist-native-0.3.1";
+    self.by-version."plist-native"."0.2.3";
+  by-version."plist-native"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-plist-native-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz";
-        name = "plist-native-0.3.1.tgz";
-        sha1 = "c9cd71ae2ac6aa16c315dde213c65d6cc53dee1a";
+        url = "http://registry.npmjs.org/plist-native/-/plist-native-0.2.3.tgz";
+        name = "plist-native-0.2.3.tgz";
+        sha1 = "76843a2da80d587b75dcbcc1634c6f3968a2af17";
       })
     ];
     buildInputs =
       (self.nativeDeps."plist-native" or []);
     deps = [
-      self.by-version."libxmljs"."0.10.0"
+      self.by-version."libxmljs"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "plist-native" ];
   };
-  "plist-native" = self.by-version."plist-native"."0.3.1";
+  "plist-native" = self.by-version."plist-native"."0.2.3";
   by-spec."policyfile"."0.0.4" =
     self.by-version."policyfile"."0.0.4";
   by-version."policyfile"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -16799,14 +14010,14 @@
     passthru.names = [ "posix-getopt" ];
   };
   by-spec."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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.1.tgz";
-        name = "pretty-bytes-0.1.1.tgz";
-        sha1 = "c99fc780053e49397155295f2fd1a196e8c3937a";
+        url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.0.tgz";
+        name = "pretty-bytes-0.1.0.tgz";
+        sha1 = "2cad1cdd7838fe59018ae5e0ccf7cae741942f8e";
       })
     ];
     buildInputs =
@@ -16817,25 +14028,6 @@
     ];
     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 {
@@ -16874,25 +14066,6 @@
     ];
     passthru.names = [ "process" ];
   };
-  by-spec."progress"."^1.1.5" =
-    self.by-version."progress"."1.1.7";
-  by-version."progress"."1.1.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-progress-1.1.7";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/progress/-/progress-1.1.7.tgz";
-        name = "progress-1.1.7.tgz";
-        sha1 = "0c739597be1cceb68e9a66d4a70fd92705aa975b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."progress" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "progress" ];
-  };
   by-spec."promise"."~2.0" =
     self.by-version."promise"."2.0.0";
   by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16907,7 +14080,7 @@
     buildInputs =
       (self.nativeDeps."promise" or []);
     deps = [
-      self.by-version."is-promise"."1.0.1"
+      self.by-version."is-promise"."1.0.0"
     ];
     peerDependencies = [
     ];
@@ -16929,7 +14102,7 @@
     deps = [
       self.by-version."pkginfo"."0.3.0"
       self.by-version."read"."1.0.5"
-      self.by-version."revalidator"."0.1.8"
+      self.by-version."revalidator"."0.1.7"
       self.by-version."utile"."0.2.1"
       self.by-version."winston"."0.6.2"
     ];
@@ -16958,14 +14131,14 @@
     passthru.names = [ "promptly" ];
   };
   by-spec."promzard"."~0.2.0" =
-    self.by-version."promzard"."0.2.2";
-  by-version."promzard"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-promzard-0.2.2";
+    self.by-version."promzard"."0.2.1";
+  by-version."promzard"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-promzard-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz";
-        name = "promzard-0.2.2.tgz";
-        sha1 = "918b9f2b29458cb001781a8856502e4a79b016e0";
+        url = "http://registry.npmjs.org/promzard/-/promzard-0.2.1.tgz";
+        name = "promzard-0.2.1.tgz";
+        sha1 = "c4c7cbe5182465c13b43540be9daf47098b4e75b";
       })
     ];
     buildInputs =
@@ -16977,34 +14150,15 @@
     ];
     passthru.names = [ "promzard" ];
   };
-  by-spec."propprop"."^0.3.0" =
-    self.by-version."propprop"."0.3.0";
-  by-version."propprop"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-propprop-0.3.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/propprop/-/propprop-0.3.0.tgz";
-        name = "propprop-0.3.0.tgz";
-        sha1 = "78e396cc1e652685ae2bf452a6690644786dd258";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."propprop" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "propprop" ];
-  };
   by-spec."proto-list"."~1.2.1" =
-    self.by-version."proto-list"."1.2.3";
-  by-version."proto-list"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-proto-list-1.2.3";
+    self.by-version."proto-list"."1.2.2";
+  by-version."proto-list"."1.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-proto-list-1.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz";
-        name = "proto-list-1.2.3.tgz";
-        sha1 = "6235554a1bca1f0d15e3ca12ca7329d5def42bd9";
+        url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz";
+        name = "proto-list-1.2.2.tgz";
+        sha1 = "48b88798261ec2c4a785720cdfec6200d57d3326";
       })
     ];
     buildInputs =
@@ -17015,25 +14169,26 @@
     ];
     passthru.names = [ "proto-list" ];
   };
-  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";
+  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";
     src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
-        name = "proxy-addr-1.0.1.tgz";
-        sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
+      (self.patchSource fetchurl {
+        url = "http://registry.npmjs.org/protobufjs/-/protobufjs-2.0.5.tgz";
+        name = "protobufjs-2.0.5.tgz";
+        sha1 = "7f351178c959b333d2327b773325ca4b2627a242";
       })
     ];
     buildInputs =
-      (self.nativeDeps."proxy-addr" or []);
+      (self.nativeDeps."protobufjs" or []);
     deps = [
-      self.by-version."ipaddr.js"."0.1.2"
+      self.by-version."bytebuffer"."2.3.1"
+      self.by-version."ascli"."0.3.0"
     ];
     peerDependencies = [
     ];
-    passthru.names = [ "proxy-addr" ];
+    passthru.names = [ "protobufjs" ];
   };
   by-spec."ps-tree"."0.0.x" =
     self.by-version."ps-tree"."0.0.3";
@@ -17055,8 +14210,6 @@
     ];
     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 {
@@ -17077,14 +14230,16 @@
     passthru.names = [ "punycode" ];
   };
   by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.3.0";
-  by-version."punycode"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-punycode-1.3.0";
+    self.by-version."punycode"."1.2.4";
+  by-spec."punycode".">=1.0.0 <1.1.0" =
+    self.by-version."punycode"."1.0.0";
+  by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-punycode-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz";
-        name = "punycode-1.3.0.tgz";
-        sha1 = "7f5009ef539b9444be5c7a19abd2c3ca49e1731c";
+        url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz";
+        name = "punycode-1.0.0.tgz";
+        sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3";
       })
     ];
     buildInputs =
@@ -17097,8 +14252,6 @@
   };
   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 {
@@ -17120,14 +14273,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.2";
-  by-version."q"."2.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-q-2.0.2";
+    self.by-version."q"."2.0.1";
+  by-version."q"."2.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-q-2.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/q/-/q-2.0.2.tgz";
-        name = "q-2.0.2.tgz";
-        sha1 = "4629e6cc668ff8554cfa775dab5aba50bad8f56d";
+        url = "http://registry.npmjs.org/q/-/q-2.0.1.tgz";
+        name = "q-2.0.1.tgz";
+        sha1 = "ae9dc1edd970e72820a1ca716ecc1b0fc96c1c5a";
       })
     ];
     buildInputs =
@@ -17325,15 +14478,36 @@
     self.by-version."qs"."0.5.6";
   by-spec."qs"."~0.6.0" =
     self.by-version."qs"."0.6.6";
-  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";
+  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 {
+    name = "node-querystring-0.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1-0.tgz";
-        name = "querystring-es3-0.2.1-0.tgz";
-        sha1 = "bd38cbd701040e7ef66c94a93db4a5b45be39565";
+        url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
+        name = "querystring-0.1.0.tgz";
+        sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."querystring" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "querystring" ];
+  };
+  by-spec."querystring-es3"."0.2.0" =
+    self.by-version."querystring-es3"."0.2.0";
+  by-version."querystring-es3"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-querystring-es3-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.0.tgz";
+        name = "querystring-es3-0.2.0.tgz";
+        sha1 = "c365a08a69c443accfeb3a9deab35e3f0abaa476";
       })
     ];
     buildInputs =
@@ -17344,15 +14518,15 @@
     ];
     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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rai/-/rai-0.1.11.tgz";
-        name = "rai-0.1.11.tgz";
-        sha1 = "ea0ba30ceecfb77a46d3b2d849e3d4249d056228";
+        url = "http://registry.npmjs.org/rai/-/rai-0.1.9.tgz";
+        name = "rai-0.1.9.tgz";
+        sha1 = "0f71aac1b8787828b0e0bdae73ec4fe64bad11fc";
       })
     ];
     buildInputs =
@@ -17403,27 +14577,24 @@
   };
   by-spec."range-parser"."~1.0.0" =
     self.by-version."range-parser"."1.0.0";
-  by-spec."raven"."~0.7.0" =
-    self.by-version."raven"."0.7.0";
-  by-version."raven"."0.7.0" = lib.makeOverridable self.buildNodePackage {
-    name = "raven-0.7.0";
+  by-spec."raven"."~0.6.3" =
+    self.by-version."raven"."0.6.3";
+  by-version."raven"."0.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "raven-0.6.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raven/-/raven-0.7.0.tgz";
-        name = "raven-0.7.0.tgz";
-        sha1 = "ec7fea6c0b87c59b252a9491c93d5bcf8d0c7ba0";
+        url = "http://registry.npmjs.org/raven/-/raven-0.6.3.tgz";
+        name = "raven-0.6.3.tgz";
+        sha1 = "3e7c72d45e0dff93ecc54978661331755c637320";
       })
     ];
     buildInputs =
       (self.nativeDeps."raven" or []);
     deps = [
-      self.by-version."cookie"."0.1.0"
-      self.by-version."lsmod"."0.0.3"
       self.by-version."node-uuid"."1.4.1"
       self.by-version."stack-trace"."0.0.7"
-      self.by-version."connect"."3.0.1"
-      self.by-version."express"."4.4.5"
-      self.by-version."koa"."0.8.1"
+      self.by-version."lsmod"."0.0.3"
+      self.by-version."cookie"."0.1.0"
     ];
     peerDependencies = [
     ];
@@ -17468,22 +14639,41 @@
     ];
     passthru.names = [ "raw-body" ];
   };
-  by-spec."raw-body"."1.2.2" =
-    self.by-version."raw-body"."1.2.2";
-  by-version."raw-body"."1.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-raw-body-1.2.2";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.2.2.tgz";
-        name = "raw-body-1.2.2.tgz";
-        sha1 = "0c68e1ee28cfed7dba4822234aec6078461cbc1f";
+        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.3.tgz";
+        name = "raw-body-1.1.3.tgz";
+        sha1 = "3d2f91e2449259cc67b8c3ce9f061db5b987935b";
       })
     ];
     buildInputs =
       (self.nativeDeps."raw-body" or []);
     deps = [
-      self.by-version."bytes"."1.0.0"
-      self.by-version."iconv-lite"."0.4.3"
+      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"
     ];
     peerDependencies = [
     ];
@@ -17542,37 +14732,16 @@
     buildInputs =
       (self.nativeDeps."rc" or []);
     deps = [
-      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.4.0" =
-    self.by-version."rc"."0.4.0";
-  by-version."rc"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "rc-0.4.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
-        name = "rc-0.4.0.tgz";
-        sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rc" or []);
-    deps = [
-      self.by-version."minimist"."0.0.10"
-      self.by-version."deep-extend"."0.2.10"
-      self.by-version."strip-json-comments"."0.1.3"
+      self.by-version."minimist"."0.0.8"
+      self.by-version."deep-extend"."0.2.8"
       self.by-version."ini"."1.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rc" ];
   };
+  by-spec."rc"."~0.3.4" =
+    self.by-version."rc"."0.3.5";
   by-spec."react"."*" =
     self.by-version."react"."0.10.0";
   by-version."react"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -17620,78 +14789,55 @@
     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.5" =
-    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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.5.tgz";
-        name = "read-installed-2.0.5.tgz";
-        sha1 = "761eda1fd2dc322f8e77844a8bf1ddedbcfc754b";
+        url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.2.tgz";
+        name = "read-installed-2.0.2.tgz";
+        sha1 = "e69e7e1946af932b2fa454465639ebea4d63773c";
       })
     ];
     buildInputs =
       (self.nativeDeps."read-installed" or []);
     deps = [
-      self.by-version."read-package-json"."1.2.3"
-      self.by-version."semver"."2.3.1"
+      self.by-version."read-package-json"."1.1.8"
+      self.by-version."semver"."2.2.1"
       self.by-version."slide"."1.1.5"
       self.by-version."util-extend"."1.0.1"
-      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."graceful-fs"."2.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-installed" ];
   };
   by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.2.3";
-  by-version."read-package-json"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-package-json-1.2.3";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.3.tgz";
-        name = "read-package-json-1.2.3.tgz";
-        sha1 = "12efad3cce1ff64bed9da951e9f4ed3d1b1d185e";
+        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";
       })
     ];
     buildInputs =
       (self.nativeDeps."read-package-json" or []);
     deps = [
-      self.by-version."glob"."4.0.3"
+      self.by-version."glob"."3.2.9"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."normalize-package-data"."0.4.1"
-      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."normalize-package-data"."0.2.12"
+      self.by-version."graceful-fs"."2.0.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "read-package-json" ];
   };
-  by-spec."read-package-json"."~1.2.3" =
-    self.by-version."read-package-json"."1.2.3";
-  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."read-package-json"."~1.1.8" =
+    self.by-version."read-package-json"."1.1.8";
   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 {
@@ -17715,22 +14861,35 @@
     ];
     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-spec."readable-stream"."^1.0.27-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.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" =
@@ -17749,7 +14908,7 @@
     buildInputs =
       (self.nativeDeps."readdirp" or []);
     deps = [
-      self.by-version."minimatch"."0.3.0"
+      self.by-version."minimatch"."0.2.14"
     ];
     peerDependencies = [
     ];
@@ -17817,14 +14976,14 @@
     passthru.names = [ "redeyed" ];
   };
   by-spec."redis"."*" =
-    self.by-version."redis"."0.10.3";
-  by-version."redis"."0.10.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-redis-0.10.3";
+    self.by-version."redis"."0.10.1";
+  by-version."redis"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-redis-0.10.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
-        name = "redis-0.10.3.tgz";
-        sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
+        url = "http://registry.npmjs.org/redis/-/redis-0.10.1.tgz";
+        name = "redis-0.10.1.tgz";
+        sha1 = "4f09258931d961377239fdbd495e1d99a263a8ec";
       })
     ];
     buildInputs =
@@ -17835,9 +14994,7 @@
     ];
     passthru.names = [ "redis" ];
   };
-  "redis" = self.by-version."redis"."0.10.3";
-  by-spec."redis"."0.10.x" =
-    self.by-version."redis"."0.10.3";
+  "redis" = self.by-version."redis"."0.10.1";
   by-spec."redis"."0.7.2" =
     self.by-version."redis"."0.7.2";
   by-version."redis"."0.7.2" = lib.makeOverridable self.buildNodePackage {
@@ -17852,7 +15009,7 @@
     buildInputs =
       (self.nativeDeps."redis" or []);
     deps = [
-      self.by-version."hiredis"."0.1.17"
+      self.by-version."hiredis"."0.1.16"
     ];
     peerDependencies = [
     ];
@@ -17877,8 +15034,27 @@
     ];
     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.3";
+    self.by-version."redis"."0.10.1";
   by-spec."reds"."~0.2.4" =
     self.by-version."reds"."0.2.4";
   by-version."reds"."0.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -17960,15 +15136,15 @@
     ];
     passthru.names = [ "replace" ];
   };
-  by-spec."request"."*" =
-    self.by-version."request"."2.36.0";
-  by-version."request"."2.36.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-request-2.36.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz";
-        name = "request-2.36.0.tgz";
-        sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
+        url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
+        name = "request-2.34.0.tgz";
+        sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
       })
     ];
     buildInputs =
@@ -17976,12 +15152,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.4"
-      self.by-version."tunnel-agent"."0.4.0"
+      self.by-version."form-data"."0.1.2"
+      self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
       self.by-version."hawk"."1.0.0"
@@ -17991,12 +15167,10 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request"."2" =
-    self.by-version."request"."2.36.0";
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.36.0";
+    self.by-version."request"."2.34.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.36.0";
+    self.by-version."request"."2.34.0";
   by-spec."request"."2.16.2" =
     self.by-version."request"."2.16.2";
   by-version."request"."2.16.2" = lib.makeOverridable self.buildNodePackage {
@@ -18057,8 +15231,6 @@
     ];
     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 {
@@ -18078,12 +15250,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.36.0";
-  by-spec."request"."^2.36.0" =
-    self.by-version."request"."2.36.0";
+    self.by-version."request"."2.34.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.36.0";
+    self.by-version."request"."2.34.0";
   by-spec."request"."~2.27.0" =
     self.by-version."request"."2.27.0";
   by-version."request"."2.27.0" = lib.makeOverridable self.buildNodePackage {
@@ -18109,7 +15281,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.4"
+      self.by-version."form-data"."0.1.2"
     ];
     peerDependencies = [
     ];
@@ -18135,7 +15307,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.4"
+      self.by-version."form-data"."0.1.2"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
@@ -18166,7 +15338,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.4"
+      self.by-version."form-data"."0.1.2"
       self.by-version."tunnel-agent"."0.3.0"
       self.by-version."http-signature"."0.10.0"
       self.by-version."oauth-sign"."0.3.0"
@@ -18177,40 +15349,7 @@
     ];
     passthru.names = [ "request" ];
   };
-  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.34.0.tgz";
-        name = "request-2.34.0.tgz";
-        sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = [
-      self.by-version."qs"."0.6.6"
-      self.by-version."json-stringify-safe"."5.0.0"
-      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.4"
-      self.by-version."tunnel-agent"."0.3.0"
-      self.by-version."http-signature"."0.10.0"
-      self.by-version."oauth-sign"."0.3.0"
-      self.by-version."hawk"."1.0.0"
-      self.by-version."aws-sign2"."0.5.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
-  };
-  by-spec."request"."~2.36.0" =
-    self.by-version."request"."2.36.0";
-  by-spec."request-progress"."^0.3.1" =
+  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 {
     name = "node-request-progress-0.3.1";
@@ -18230,8 +15369,6 @@
     ];
     passthru.names = [ "request-progress" ];
   };
-  by-spec."request-progress"."~0.3.0" =
-    self.by-version."request-progress"."0.3.1";
   by-spec."request-replay"."~0.2.0" =
     self.by-version."request-replay"."0.2.0";
   by-version."request-replay"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -18246,21 +15383,21 @@
     buildInputs =
       (self.nativeDeps."request-replay" or []);
     deps = [
-      self.by-version."retry"."0.6.1"
+      self.by-version."retry"."0.6.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "request-replay" ];
   };
   by-spec."requirejs"."~2.1" =
-    self.by-version."requirejs"."2.1.14";
-  by-version."requirejs"."2.1.14" = lib.makeOverridable self.buildNodePackage {
-    name = "requirejs-2.1.14";
+    self.by-version."requirejs"."2.1.11";
+  by-version."requirejs"."2.1.11" = lib.makeOverridable self.buildNodePackage {
+    name = "requirejs-2.1.11";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.14.tgz";
-        name = "requirejs-2.1.14.tgz";
-        sha1 = "de00290aa526192ff8df4dc0ba9370ce399a76b0";
+        url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.11.tgz";
+        name = "requirejs-2.1.11.tgz";
+        sha1 = "0eafaa6b46ca9b5b1e13406f119c020190a24442";
       })
     ];
     buildInputs =
@@ -18272,7 +15409,7 @@
     passthru.names = [ "requirejs" ];
   };
   by-spec."requirejs"."~2.1.0" =
-    self.by-version."requirejs"."2.1.14";
+    self.by-version."requirejs"."2.1.11";
   by-spec."resolve"."0.6.3" =
     self.by-version."resolve"."0.6.3";
   by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage {
@@ -18292,27 +15429,8 @@
     ];
     passthru.names = [ "resolve" ];
   };
-  by-spec."resolve"."0.7.1" =
-    self.by-version."resolve"."0.7.1";
-  by-version."resolve"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-resolve-0.7.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-0.7.1.tgz";
-        name = "resolve-0.7.1.tgz";
-        sha1 = "74c73ad05bb62da19391a79c3de63b5cf7aeba51";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."resolve" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "resolve" ];
-  };
-  by-spec."resolve"."0.7.x" =
-    self.by-version."resolve"."0.7.1";
+  by-spec."resolve"."0.6.x" =
+    self.by-version."resolve"."0.6.3";
   by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -18334,25 +15452,24 @@
   };
   by-spec."resolve"."~0.3.1" =
     self.by-version."resolve"."0.3.1";
-  by-spec."resolve"."~0.6.3" =
+  by-spec."resolve"."~0.6.0" =
     self.by-version."resolve"."0.6.3";
-  by-spec."resolve"."~0.7.1" =
-    self.by-version."resolve"."0.7.1";
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/response-time/-/response-time-2.0.0.tgz";
-        name = "response-time-2.0.0.tgz";
-        sha1 = "65cb39fd50de2f4ffdbdd285f1855966bd6fcb36";
+        url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
+        name = "response-time-1.0.0.tgz";
+        sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9";
       })
     ];
     buildInputs =
       (self.nativeDeps."response-time" or []);
     deps = [
-      self.by-version."on-headers"."0.0.0"
     ];
     peerDependencies = [
     ];
@@ -18395,26 +15512,26 @@
     passthru.names = [ "restify" ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."1.13.0-2";
-  by-version."rethinkdb"."1.13.0-2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rethinkdb-1.13.0-2";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.13.0-2.tgz";
-        name = "rethinkdb-1.13.0-2.tgz";
-        sha1 = "cde28ef912beba82aab695d95153de4b1f5019ca";
+        url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.12.0-0.tgz";
+        name = "rethinkdb-1.12.0-0.tgz";
+        sha1 = "cad01e869bd12dcd09f235c5ec8f5ccf26cc6f81";
       })
     ];
     buildInputs =
       (self.nativeDeps."rethinkdb" or []);
     deps = [
-      self.by-version."bluebird"."2.1.3"
+      self.by-version."protobufjs"."2.0.5"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "rethinkdb" ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.13.0-2";
+  "rethinkdb" = self.by-version."rethinkdb"."1.12.0-0";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -18435,33 +15552,16 @@
     passthru.names = [ "retry" ];
   };
   by-spec."retry"."~0.6.0" =
-    self.by-version."retry"."0.6.1";
-  by-version."retry"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-retry-0.6.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
-        name = "retry-0.6.1.tgz";
-        sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."retry" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "retry" ];
-  };
+    self.by-version."retry"."0.6.0";
   by-spec."revalidator"."0.1.x" =
-    self.by-version."revalidator"."0.1.8";
-  by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-revalidator-0.1.8";
+    self.by-version."revalidator"."0.1.7";
+  by-version."revalidator"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-revalidator-0.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
-        name = "revalidator-0.1.8.tgz";
-        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
+        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.7.tgz";
+        name = "revalidator-0.1.7.tgz";
+        sha1 = "f0b68b01bc5c5e0e9e6d864154d7098f24fec1db";
       })
     ];
     buildInputs =
@@ -18515,14 +15615,14 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.2.8";
-  by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.2.8";
+    self.by-version."rimraf"."2.2.6";
+  by-version."rimraf"."2.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "rimraf-2.2.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-        name = "rimraf-2.2.8.tgz";
-        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
+        name = "rimraf-2.2.6.tgz";
+        sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c";
       })
     ];
     buildInputs =
@@ -18534,15 +15634,11 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."2.x.x" =
-    self.by-version."rimraf"."2.2.8";
-  by-spec."rimraf"."^2.2.0" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."^2.2.2" =
-    self.by-version."rimraf"."2.2.8";
-  by-spec."rimraf"."^2.2.8" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2.0.2" =
     self.by-version."rimraf"."2.0.3";
   by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -18584,53 +15680,13 @@
     passthru.names = [ "rimraf" ];
   };
   by-spec."rimraf"."~2.2.0" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2.2.2" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.2.6";
   by-spec."rimraf"."~2.2.5" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.2.6";
   by-spec."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."ripemd160"."0.2.0" =
-    self.by-version."ripemd160"."0.2.0";
-  by-version."ripemd160"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-ripemd160-0.2.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
-        name = "ripemd160-0.2.0.tgz";
-        sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ripemd160" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "ripemd160" ];
-  };
-  by-spec."rndm"."1" =
-    self.by-version."rndm"."1.0.0";
-  by-version."rndm"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-rndm-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rndm/-/rndm-1.0.0.tgz";
-        name = "rndm-1.0.0.tgz";
-        sha1 = "dcb6eb485b9b416d15e097f39c31458e4cfda2da";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rndm" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "rndm" ];
-  };
+    self.by-version."rimraf"."2.2.6";
   by-spec."ruglify"."~1.0.0" =
     self.by-version."ruglify"."1.0.0";
   by-version."ruglify"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -18716,7 +15772,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.8"
+      self.by-version."rimraf"."2.2.6"
     ];
     peerDependencies = [
     ];
@@ -18741,25 +15797,6 @@
     ];
     passthru.names = [ "saucelabs" ];
   };
-  by-spec."sax"."0.4.2" =
-    self.by-version."sax"."0.4.2";
-  by-version."sax"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sax-0.4.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
-        name = "sax-0.4.2.tgz";
-        sha1 = "39f3b601733d6bec97105b242a2a40fd6978ac3c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sax" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "sax" ];
-  };
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.8";
   by-version."sax"."0.5.8" = lib.makeOverridable self.buildNodePackage {
@@ -18779,7 +15816,7 @@
     ];
     passthru.names = [ "sax" ];
   };
-  by-spec."sax"."0.6.x" =
+  by-spec."sax".">=0.4.2" =
     self.by-version."sax"."0.6.0";
   by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage {
     name = "node-sax-0.6.0";
@@ -18798,8 +15835,6 @@
     ];
     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 {
@@ -18820,14 +15855,14 @@
     passthru.names = [ "scmp" ];
   };
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.42.1";
-  by-version."selenium-webdriver"."2.42.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-selenium-webdriver-2.42.1";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.42.1.tgz";
-        name = "selenium-webdriver-2.42.1.tgz";
-        sha1 = "61984d1583b89c80a9f3bf31623d00bcc82a8d0e";
+        url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.41.0.tgz";
+        name = "selenium-webdriver-2.41.0.tgz";
+        sha1 = "d084dfbc73bdf33aedc7d731eaab028affad7f16";
       })
     ];
     buildInputs =
@@ -18838,16 +15873,16 @@
     ];
     passthru.names = [ "selenium-webdriver" ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.42.1";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.41.0";
   by-spec."semver"."*" =
-    self.by-version."semver"."2.3.1";
-  by-version."semver"."2.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "semver-2.3.1";
+    self.by-version."semver"."2.2.1";
+  by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "semver-2.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-2.3.1.tgz";
-        name = "semver-2.3.1.tgz";
-        sha1 = "6f65ee7d1aed753cdf9dda70e5631a3fb42a5bee";
+        url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
+        name = "semver-2.2.1.tgz";
+        sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213";
       })
     ];
     buildInputs =
@@ -18858,7 +15893,7 @@
     ];
     passthru.names = [ "semver" ];
   };
-  "semver" = self.by-version."semver"."2.3.1";
+  "semver" = self.by-version."semver"."2.2.1";
   by-spec."semver"."1.1.0" =
     self.by-version."semver"."1.1.0";
   by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -18898,17 +15933,15 @@
     passthru.names = [ "semver" ];
   };
   by-spec."semver"."2" =
-    self.by-version."semver"."2.3.1";
-  by-spec."semver"."2 >=2.2.1" =
-    self.by-version."semver"."2.3.1";
+    self.by-version."semver"."2.2.1";
   by-spec."semver"."2.x" =
-    self.by-version."semver"."2.3.1";
+    self.by-version."semver"."2.2.1";
   by-spec."semver".">=2.0.10 <3.0.0" =
-    self.by-version."semver"."2.3.1";
+    self.by-version."semver"."2.2.1";
   by-spec."semver".">=2.2.1 <3" =
-    self.by-version."semver"."2.3.1";
-  by-spec."semver"."^2.3.0" =
-    self.by-version."semver"."2.3.1";
+    self.by-version."semver"."2.2.1";
+  by-spec."semver"."^2.2.1" =
+    self.by-version."semver"."2.2.1";
   by-spec."semver"."~1.1.0" =
     self.by-version."semver"."1.1.4";
   by-spec."semver"."~1.1.4" =
@@ -18953,47 +15986,23 @@
   };
   by-spec."semver"."~2.2.1" =
     self.by-version."semver"."2.2.1";
-  by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "semver-2.2.1";
-    src = [
-      (fetchurl {
-        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.1";
-  by-spec."semver"."~2.3.1" =
-    self.by-version."semver"."2.3.1";
   by-spec."send"."*" =
-    self.by-version."send"."0.5.0";
-  by-version."send"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-send-0.5.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.5.0.tgz";
-        name = "send-0.5.0.tgz";
-        sha1 = "fc0f7e2f92e29aebfd8a1b2deb4a394e7a531a68";
+        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.2"
-      self.by-version."escape-html"."1.0.1"
-      self.by-version."finished"."1.2.2"
-      self.by-version."fresh"."0.2.2"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."ms"."0.6.2"
+      self.by-version."fresh"."0.2.2"
       self.by-version."range-parser"."1.0.0"
     ];
     peerDependencies = [
@@ -19014,7 +16023,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."1.0.2"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -19037,7 +16046,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."1.0.2"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -19060,7 +16069,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."1.0.2"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.0"
       self.by-version."range-parser"."0.0.4"
@@ -19071,54 +16080,6 @@
   };
   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.2"
-      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.4.3" =
-    self.by-version."send"."0.4.3";
-  by-version."send"."0.4.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-send-0.4.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/send/-/send-0.4.3.tgz";
-        name = "send-0.4.3.tgz";
-        sha1 = "9627b23b7707fbf6373831cac5793330b594b640";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."send" or []);
-    deps = [
-      self.by-version."debug"."1.0.2"
-      self.by-version."escape-html"."1.0.1"
-      self.by-version."finished"."1.2.2"
-      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.5.0" =
-    self.by-version."send"."0.5.0";
   by-spec."sequence"."2.2.1" =
     self.by-version."sequence"."2.2.1";
   by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -19140,42 +16101,22 @@
   };
   by-spec."sequence"."2.x" =
     self.by-version."sequence"."2.2.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";
+  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";
     src = [
       (fetchurl {
-        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.3" =
-    self.by-version."serve-index"."1.1.4";
-  by-version."serve-index"."1.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-index-1.1.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.1.4.tgz";
-        name = "serve-index-1.1.4.tgz";
-        sha1 = "5aee90b78c0f6543af0df69f85c8443317fdd898";
+        url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
+        name = "serve-index-1.0.1.tgz";
+        sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6";
       })
     ];
     buildInputs =
       (self.nativeDeps."serve-index" or []);
     deps = [
-      self.by-version."accepts"."1.0.6"
-      self.by-version."batch"."0.5.1"
+      self.by-version."batch"."0.5.0"
+      self.by-version."negotiator"."0.4.2"
     ];
     peerDependencies = [
     ];
@@ -19201,59 +16142,58 @@
     ];
     passthru.names = [ "serve-static" ];
   };
-  by-spec."serve-static"."1.2.3" =
-    self.by-version."serve-static"."1.2.3";
-  by-version."serve-static"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-static-1.2.3";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.2.3.tgz";
-        name = "serve-static-1.2.3.tgz";
-        sha1 = "93cecbc340f079ecb8589281d1dc31c26c0cd158";
+        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."escape-html"."1.0.1"
-      self.by-version."parseurl"."1.0.1"
-      self.by-version."send"."0.4.3"
+      self.by-version."send"."0.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "serve-static" ];
   };
-  by-spec."serve-static"."~1.3.0" =
-    self.by-version."serve-static"."1.3.0";
-  by-version."serve-static"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-serve-static-1.3.0";
+  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.3.0.tgz";
-        name = "serve-static-1.3.0.tgz";
-        sha1 = "0aba0b27c1b8264eee1a3f9c615886738d9727cb";
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.4.tgz";
+        name = "serve-static-1.0.4.tgz";
+        sha1 = "426fedebe77bad21f373f1efcae09746639fba06";
       })
     ];
     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.5.0"
+      self.by-version."send"."0.2.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "serve-static" ];
   };
-  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";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz";
-        name = "setimmediate-1.0.2.tgz";
-        sha1 = "d8221c4fdfeb2561556c5184fa05fb7ce0af73bd";
+        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
+        name = "setimmediate-1.0.1.tgz";
+        sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
       })
     ];
     buildInputs =
@@ -19265,46 +16205,26 @@
     passthru.names = [ "setimmediate" ];
   };
   by-spec."sha"."~1.2.1" =
-    self.by-version."sha"."1.2.4";
-  by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sha-1.2.4";
+    self.by-version."sha"."1.2.3";
+  by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sha-1.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz";
-        name = "sha-1.2.4.tgz";
-        sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d";
+        url = "http://registry.npmjs.org/sha/-/sha-1.2.3.tgz";
+        name = "sha-1.2.3.tgz";
+        sha1 = "3a96ef3054a0fe0b87c9aa985824a6a736fc0329";
       })
     ];
     buildInputs =
       (self.nativeDeps."sha" or []);
     deps = [
-      self.by-version."graceful-fs"."3.0.2"
+      self.by-version."graceful-fs"."2.0.3"
       self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "sha" ];
   };
-  by-spec."sha.js"."2.1.3" =
-    self.by-version."sha.js"."2.1.3";
-  by-version."sha.js"."2.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "sha.js-2.1.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sha.js/-/sha.js-2.1.3.tgz";
-        name = "sha.js-2.1.3.tgz";
-        sha1 = "cf55f22929f57a9cd1c27a8355ba09ac4d8ab0ce";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sha.js" or []);
-    deps = [
-      self.by-version."native-buffer-browserify"."2.0.17"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "sha.js" ];
-  };
   by-spec."shallow-copy"."0.0.1" =
     self.by-version."shallow-copy"."0.0.1";
   by-version."shallow-copy"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -19367,30 +16287,6 @@
     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";
@@ -19409,15 +16305,37 @@
     ];
     passthru.names = [ "shelljs" ];
   };
-  by-spec."should"."*" =
-    self.by-version."should"."4.0.4";
-  by-version."should"."4.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-should-4.0.4";
+  "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/should/-/should-4.0.4.tgz";
-        name = "should-4.0.4.tgz";
-        sha1 = "8efaa304f1f148cf3d2e955862990f9ab9ea628f";
+        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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/should/-/should-3.3.1.tgz";
+        name = "should-3.3.1.tgz";
+        sha1 = "28c93a522ba001146af96078f0a88bf5ac929522";
       })
     ];
     buildInputs =
@@ -19428,7 +16346,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."4.0.4";
+  "should" = self.by-version."should"."3.3.1";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -19491,20 +16409,20 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.32";
-  by-version."simplesmtp"."0.3.32" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.32";
+    self.by-version."simplesmtp"."0.3.25";
+  by-version."simplesmtp"."0.3.25" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.25";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.32.tgz";
-        name = "simplesmtp-0.3.32.tgz";
-        sha1 = "b3589b4cbf90624e712ab0ec1a7480ec14fd1c12";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.25.tgz";
+        name = "simplesmtp-0.3.25.tgz";
+        sha1 = "09b6ac292b7dae8053cfba11da09a0458eb8af39";
       })
     ];
     buildInputs =
       (self.nativeDeps."simplesmtp" or []);
     deps = [
-      self.by-version."rai"."0.1.11"
+      self.by-version."rai"."0.1.9"
       self.by-version."xoauth2"."0.1.8"
     ];
     peerDependencies = [
@@ -19512,14 +16430,14 @@
     passthru.names = [ "simplesmtp" ];
   };
   by-spec."sinon"."*" =
-    self.by-version."sinon"."1.10.2";
-  by-version."sinon"."1.10.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sinon-1.10.2";
+    self.by-version."sinon"."1.9.1";
+  by-version."sinon"."1.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sinon-1.9.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sinon/-/sinon-1.10.2.tgz";
-        name = "sinon-1.10.2.tgz";
-        sha1 = "a33a1b902ee080da2bdca19781993a03c78bb5cc";
+        url = "http://registry.npmjs.org/sinon/-/sinon-1.9.1.tgz";
+        name = "sinon-1.9.1.tgz";
+        sha1 = "0dac622bd3f0e6f9662a7431baf65f58c3459d69";
       })
     ];
     buildInputs =
@@ -19532,7 +16450,7 @@
     ];
     passthru.names = [ "sinon" ];
   };
-  "sinon" = self.by-version."sinon"."1.10.2";
+  "sinon" = self.by-version."sinon"."1.9.1";
   by-spec."slasp"."*" =
     self.by-version."slasp"."0.0.3";
   by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -19748,14 +16666,14 @@
     passthru.names = [ "socket.io" ];
   };
   by-spec."socket.io"."~0.9.13" =
-    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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
-        name = "socket.io-0.9.17.tgz";
-        sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
+        url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
+        name = "socket.io-0.9.16.tgz";
+        sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76";
       })
     ];
     buildInputs =
@@ -19771,7 +16689,7 @@
     passthru.names = [ "socket.io" ];
   };
   by-spec."socket.io"."~0.9.16" =
-    self.by-version."socket.io"."0.9.17";
+    self.by-version."socket.io"."0.9.16";
   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 {
@@ -19819,27 +16737,27 @@
     passthru.names = [ "socket.io-client" ];
   };
   by-spec."sockjs"."*" =
-    self.by-version."sockjs"."0.3.9";
-  by-version."sockjs"."0.3.9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sockjs-0.3.9";
+    self.by-version."sockjs"."0.3.8";
+  by-version."sockjs"."0.3.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sockjs-0.3.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.9.tgz";
-        name = "sockjs-0.3.9.tgz";
-        sha1 = "5ae2c732dac07f6d7e9e8a9a60ec86ec4fc3ffc7";
+        url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.8.tgz";
+        name = "sockjs-0.3.8.tgz";
+        sha1 = "c083cb0505db1ea1a949d3bd12d8a1ea385a456c";
       })
     ];
     buildInputs =
       (self.nativeDeps."sockjs" or []);
     deps = [
       self.by-version."node-uuid"."1.3.3"
-      self.by-version."faye-websocket"."0.7.2"
+      self.by-version."faye-websocket"."0.7.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "sockjs" ];
   };
-  "sockjs" = self.by-version."sockjs"."0.3.9";
+  "sockjs" = self.by-version."sockjs"."0.3.8";
   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 {
@@ -19860,14 +16778,14 @@
     passthru.names = [ "sorted-object" ];
   };
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.1.34";
-  by-version."source-map"."0.1.34" = lib.makeOverridable self.buildNodePackage {
-    name = "node-source-map-0.1.34";
+    self.by-version."source-map"."0.1.33";
+  by-version."source-map"."0.1.33" = lib.makeOverridable self.buildNodePackage {
+    name = "node-source-map-0.1.33";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
-        name = "source-map-0.1.34.tgz";
-        sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.33.tgz";
+        name = "source-map-0.1.33.tgz";
+        sha1 = "c659297a73af18c073b0aa2e7cc91e316b5c570c";
       })
     ];
     buildInputs =
@@ -19879,7 +16797,7 @@
     ];
     passthru.names = [ "source-map" ];
   };
-  "source-map" = self.by-version."source-map"."0.1.34";
+  "source-map" = self.by-version."source-map"."0.1.33";
   by-spec."source-map"."0.1.11" =
     self.by-version."source-map"."0.1.11";
   by-version."source-map"."0.1.11" = lib.makeOverridable self.buildNodePackage {
@@ -19921,19 +16839,19 @@
     passthru.names = [ "source-map" ];
   };
   by-spec."source-map"."0.1.x" =
-    self.by-version."source-map"."0.1.34";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map".">= 0.1.2" =
-    self.by-version."source-map"."0.1.34";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~ 0.1.8" =
-    self.by-version."source-map"."0.1.34";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.30" =
-    self.by-version."source-map"."0.1.34";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.31" =
-    self.by-version."source-map"."0.1.34";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.33" =
-    self.by-version."source-map"."0.1.34";
+    self.by-version."source-map"."0.1.33";
   by-spec."source-map"."~0.1.7" =
-    self.by-version."source-map"."0.1.34";
+    self.by-version."source-map"."0.1.33";
   by-spec."spdy"."1.7.1" =
     self.by-version."spdy"."1.7.1";
   by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -20034,14 +16952,14 @@
     passthru.names = [ "stack-trace" ];
   };
   by-spec."stackdriver-statsd-backend"."*" =
-    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";
+    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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
@@ -20052,7 +16970,45 @@
     ];
     passthru.names = [ "stackdriver-statsd-backend" ];
   };
-  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.2";
+  "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" ];
+  };
   by-spec."statsd"."*" =
     self.by-version."statsd"."0.7.1";
   by-version."statsd"."0.7.1" = lib.makeOverridable self.buildNodePackage {
@@ -20096,41 +17052,22 @@
     passthru.names = [ "statsd-librato-backend" ];
   };
   "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.2";
-  by-spec."statuses"."~1.0.1" =
-    self.by-version."statuses"."1.0.3";
-  by-version."statuses"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-statuses-1.0.3";
+  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 {
+    name = "node-stream-browserify-0.1.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/statuses/-/statuses-1.0.3.tgz";
-        name = "statuses-1.0.3.tgz";
-        sha1 = "a7d9bfb30bce92281bdba717ceb9db10d8640afb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."statuses" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "statuses" ];
-  };
-  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";
+        url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz";
+        name = "stream-browserify-0.1.3.tgz";
+        sha1 = "95cf1b369772e27adaf46352265152689c6c4be9";
       })
     ];
     buildInputs =
       (self.nativeDeps."stream-browserify" or []);
     deps = [
       self.by-version."inherits"."2.0.1"
-      self.by-version."readable-stream"."1.1.13-1"
+      self.by-version."process"."0.5.2"
     ];
     peerDependencies = [
     ];
@@ -20158,41 +17095,21 @@
   };
   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";
+  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 {
+    name = "node-stream-counter-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"."^1.0.0" =
-    self.by-version."stream-counter"."1.0.0";
-  by-version."stream-counter"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stream-counter-1.0.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
-        name = "stream-counter-1.0.0.tgz";
-        sha1 = "91cf2569ce4dc5061febcd7acb26394a5a114751";
+        url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz";
+        name = "stream-counter-0.1.0.tgz";
+        sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b";
       })
     ];
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -20258,26 +17175,6 @@
     ];
     passthru.names = [ "string" ];
   };
-  by-spec."string-length"."^0.1.2" =
-    self.by-version."string-length"."0.1.2";
-  by-version."string-length"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-string-length-0.1.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz";
-        name = "string-length-0.1.2.tgz";
-        sha1 = "ab04bb33867ee74beed7fb89bb7f089d392780f2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."string-length" or []);
-    deps = [
-      self.by-version."strip-ansi"."0.2.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "string-length" ];
-  };
   by-spec."string_decoder"."~0.0.0" =
     self.by-version."string_decoder"."0.0.1";
   by-version."string_decoder"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -20336,14 +17233,14 @@
     passthru.names = [ "stringify-object" ];
   };
   by-spec."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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.1.tgz";
-        name = "stringify-object-0.2.1.tgz";
-        sha1 = "b58be50b3ff5f371038c545d4332656bfded5620";
+        url = "http://registry.npmjs.org/stringify-object/-/stringify-object-0.2.0.tgz";
+        name = "stringify-object-0.2.0.tgz";
+        sha1 = "832996ea55ab2aaa7570cc9bc0d5774adfc2c585";
       })
     ];
     buildInputs =
@@ -20354,26 +17251,6 @@
     ];
     passthru.names = [ "stringify-object" ];
   };
-  by-spec."strip-ansi"."^0.2.1" =
-    self.by-version."strip-ansi"."0.2.2";
-  by-version."strip-ansi"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "strip-ansi-0.2.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz";
-        name = "strip-ansi-0.2.2.tgz";
-        sha1 = "854d290c981525fc8c397a910b025ae2d54ffc08";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-ansi" or []);
-    deps = [
-      self.by-version."ansi-regex"."0.1.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-ansi" ];
-  };
   by-spec."strip-ansi"."~0.1.0" =
     self.by-version."strip-ansi"."0.1.1";
   by-version."strip-ansi"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -20393,36 +17270,15 @@
     ];
     passthru.names = [ "strip-ansi" ];
   };
-  by-spec."strip-bom"."^0.3.0" =
-    self.by-version."strip-bom"."0.3.1";
-  by-version."strip-bom"."0.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "strip-bom-0.3.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/strip-bom/-/strip-bom-0.3.1.tgz";
-        name = "strip-bom-0.3.1.tgz";
-        sha1 = "9e8a39eff456ff9abc2f059f5f2225bb0f3f7ca5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."strip-bom" or []);
-    deps = [
-      self.by-version."first-chunk-stream"."0.1.0"
-      self.by-version."is-utf8"."0.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "strip-bom" ];
-  };
   by-spec."strip-json-comments"."0.1.x" =
-    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";
+    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";
     src = [
       (fetchurl {
-        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";
+        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";
       })
     ];
     buildInputs =
@@ -20454,14 +17310,14 @@
     passthru.names = [ "strong-data-uri" ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.47.1";
-  by-version."stylus"."0.47.1" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.47.1";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.47.1.tgz";
-        name = "stylus-0.47.1.tgz";
-        sha1 = "2822873555f8dcf920a4cad5b9e2813c4de68f6a";
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.44.0-beta3.tgz";
+        name = "stylus-0.44.0-beta3.tgz";
+        sha1 = "a602b30f57f1692cf0f1fb664e60a14e26102cff";
       })
     ];
     buildInputs =
@@ -20469,15 +17325,16 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."1.0.2"
+      self.by-version."debug"."0.8.1"
       self.by-version."sax"."0.5.8"
-      self.by-version."glob"."3.2.11"
+      self.by-version."glob"."3.2.9"
+      self.by-version."circular-json"."0.1.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.47.1";
+  "stylus" = self.by-version."stylus"."0.44.0-beta3";
   by-spec."stylus"."0.42.2" =
     self.by-version."stylus"."0.42.2";
   by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage {
@@ -20494,9 +17351,9 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."1.0.2"
+      self.by-version."debug"."0.8.1"
       self.by-version."sax"."0.5.8"
-      self.by-version."glob"."3.2.11"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
@@ -20516,33 +17373,12 @@
     buildInputs =
       (self.nativeDeps."subarg" or []);
     deps = [
-      self.by-version."minimist"."0.0.10"
+      self.by-version."minimist"."0.0.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "subarg" ];
   };
-  by-spec."sudo-block"."^0.4.0" =
-    self.by-version."sudo-block"."0.4.0";
-  by-version."sudo-block"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sudo-block-0.4.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.4.0.tgz";
-        name = "sudo-block-0.4.0.tgz";
-        sha1 = "38b15f09a2ee0a4b0678a0d6236df96225eda56e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sudo-block" or []);
-    deps = [
-      self.by-version."chalk"."0.4.0"
-      self.by-version."is-root"."0.1.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "sudo-block" ];
-  };
   by-spec."sudo-block"."~0.2.0" =
     self.by-version."sudo-block"."0.2.1";
   by-version."sudo-block"."0.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -20563,31 +17399,49 @@
     ];
     passthru.names = [ "sudo-block" ];
   };
-  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";
+  by-spec."sudo-block"."~0.3.0" =
+    self.by-version."sudo-block"."0.3.0";
+  by-version."sudo-block"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sudo-block-0.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz";
-        name = "superagent-0.18.0.tgz";
-        sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62";
+        url = "http://registry.npmjs.org/sudo-block/-/sudo-block-0.3.0.tgz";
+        name = "sudo-block-0.3.0.tgz";
+        sha1 = "aec27fbde8763ee32e3e47b8ba3c70584da7eb9c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sudo-block" or []);
+    deps = [
+      self.by-version."chalk"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    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";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/superagent/-/superagent-0.17.0.tgz";
+        name = "superagent-0.17.0.tgz";
+        sha1 = "aadcd50fbe5a93e71991118d79bf0714d625bba8";
       })
     ];
     buildInputs =
       (self.nativeDeps."superagent" or []);
     deps = [
-      self.by-version."qs"."0.6.6"
+      self.by-version."qs"."0.6.5"
       self.by-version."formidable"."1.0.14"
       self.by-version."mime"."1.2.5"
-      self.by-version."component-emitter"."1.1.2"
+      self.by-version."emitter-component"."1.0.0"
       self.by-version."methods"."0.0.1"
-      self.by-version."cookiejar"."1.3.2"
+      self.by-version."cookiejar"."1.3.0"
       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 = [
     ];
@@ -20618,30 +17472,30 @@
     ];
     passthru.names = [ "superagent" ];
   };
-  by-spec."superagent"."~0.18.0" =
-    self.by-version."superagent"."0.18.0";
+  by-spec."superagent"."~0.17.0" =
+    self.by-version."superagent"."0.17.0";
   by-spec."supertest"."*" =
-    self.by-version."supertest"."0.13.0";
-  by-version."supertest"."0.13.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-supertest-0.13.0";
+    self.by-version."supertest"."0.11.0";
+  by-version."supertest"."0.11.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-supertest-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz";
-        name = "supertest-0.13.0.tgz";
-        sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f";
+        url = "http://registry.npmjs.org/supertest/-/supertest-0.11.0.tgz";
+        name = "supertest-0.11.0.tgz";
+        sha1 = "f8496b9f05cac1ea2fcec1d21adeca7167f42460";
       })
     ];
     buildInputs =
       (self.nativeDeps."supertest" or []);
     deps = [
-      self.by-version."superagent"."0.18.0"
-      self.by-version."methods"."1.0.0"
+      self.by-version."superagent"."0.17.0"
+      self.by-version."methods"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "supertest" ];
   };
-  "supertest" = self.by-version."supertest"."0.13.0";
+  "supertest" = self.by-version."supertest"."0.11.0";
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
@@ -20727,30 +17581,30 @@
     passthru.names = [ "tape" ];
   };
   by-spec."tar"."*" =
-    self.by-version."tar"."0.1.20";
-  by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
-    name = "node-tar-0.1.20";
+    self.by-version."tar"."0.1.19";
+  by-version."tar"."0.1.19" = lib.makeOverridable self.buildNodePackage {
+    name = "node-tar-0.1.19";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
-        name = "tar-0.1.20.tgz";
-        sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+        url = "http://registry.npmjs.org/tar/-/tar-0.1.19.tgz";
+        name = "tar-0.1.19.tgz";
+        sha1 = "fe45941799e660ce1ea52d875d37481b4bf13eac";
       })
     ];
     buildInputs =
       (self.nativeDeps."tar" or []);
     deps = [
-      self.by-version."block-stream"."0.0.7"
-      self.by-version."fstream"."0.1.28"
       self.by-version."inherits"."2.0.1"
+      self.by-version."block-stream"."0.0.7"
+      self.by-version."fstream"."0.1.25"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "tar" ];
   };
-  "tar" = self.by-version."tar"."0.1.20";
+  "tar" = self.by-version."tar"."0.1.19";
   by-spec."tar"."0" =
-    self.by-version."tar"."0.1.20";
+    self.by-version."tar"."0.1.19";
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
   by-version."tar"."0.1.17" = lib.makeOverridable self.buildNodePackage {
@@ -20767,62 +17621,39 @@
     deps = [
       self.by-version."inherits"."1.0.0"
       self.by-version."block-stream"."0.0.7"
-      self.by-version."fstream"."0.1.28"
+      self.by-version."fstream"."0.1.25"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "tar" ];
   };
   by-spec."tar"."^0.1.18" =
-    self.by-version."tar"."0.1.20";
+    self.by-version."tar"."0.1.19";
   by-spec."tar"."~0.1.17" =
-    self.by-version."tar"."0.1.20";
-  by-spec."tar"."~0.1.20" =
-    self.by-version."tar"."0.1.20";
-  by-spec."tar-stream"."~0.4.0" =
-    self.by-version."tar-stream"."0.4.4";
-  by-version."tar-stream"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-tar-stream-0.4.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.4.tgz";
-        name = "tar-stream-0.4.4.tgz";
-        sha1 = "55733222ca3e1ebf58f2805b5b666596e1f8d5f3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar-stream" or []);
-    deps = [
-      self.by-version."bl"."0.8.2"
-      self.by-version."end-of-stream"."0.1.5"
-      self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."xtend"."3.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar-stream" ];
-  };
+    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.8.0";
-  by-version."temp"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-temp-0.8.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.8.0.tgz";
-        name = "temp-0.8.0.tgz";
-        sha1 = "3a642f54ab725c8fb6125a284b119480314b3e32";
+        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"
+      self.by-version."rimraf"."2.2.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "temp" ];
   };
-  "temp" = self.by-version."temp"."0.8.0";
+  "temp" = self.by-version."temp"."0.7.0";
   by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
   by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
@@ -20866,8 +17697,8 @@
   };
   by-spec."temp"."~0.6.0" =
     self.by-version."temp"."0.6.0";
-  by-spec."temp"."~0.8.0" =
-    self.by-version."temp"."0.8.0";
+  by-spec."temp"."~0.7.0" =
+    self.by-version."temp"."0.7.0";
   by-spec."tempfile"."^0.1.2" =
     self.by-version."tempfile"."0.1.3";
   by-version."tempfile"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -20888,7 +17719,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";
@@ -20907,8 +17738,6 @@
     ];
     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 {
@@ -20969,14 +17798,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.2";
-  by-version."through2"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-through2-0.4.2";
+    self.by-version."through2"."0.4.1";
+  by-version."through2"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through2-0.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz";
-        name = "through2-0.4.2.tgz";
-        sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b";
+        url = "http://registry.npmjs.org/through2/-/through2-0.4.1.tgz";
+        name = "through2-0.4.1.tgz";
+        sha1 = "afd849c65af513c2541a98a7cfbcfec3a15a9686";
       })
     ];
     buildInputs =
@@ -20989,38 +17818,17 @@
     ];
     passthru.names = [ "through2" ];
   };
-  by-spec."through2"."^0.5.1" =
-    self.by-version."through2"."0.5.1";
-  by-version."through2"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-through2-0.5.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
-        name = "through2-0.5.1.tgz";
-        sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through2" or []);
-    deps = [
-      self.by-version."readable-stream"."1.0.27-1"
-      self.by-version."xtend"."3.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "through2" ];
-  };
   by-spec."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.3";
-  by-version."timers-browserify"."1.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-timers-browserify-1.0.3";
+    self.by-version."through2"."0.4.1";
+  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 {
+    name = "node-timers-browserify-1.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz";
-        name = "timers-browserify-1.0.3.tgz";
-        sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551";
+        url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.1.tgz";
+        name = "timers-browserify-1.0.1.tgz";
+        sha1 = "7c93257b543cb1e3003d3663b57d560ee1d27057";
       })
     ];
     buildInputs =
@@ -21032,27 +17840,6 @@
     ];
     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 {
@@ -21073,14 +17860,14 @@
     passthru.names = [ "timespan" ];
   };
   by-spec."timezone"."*" =
-    self.by-version."timezone"."0.0.33";
-  by-version."timezone"."0.0.33" = lib.makeOverridable self.buildNodePackage {
-    name = "node-timezone-0.0.33";
+    self.by-version."timezone"."0.0.30";
+  by-version."timezone"."0.0.30" = lib.makeOverridable self.buildNodePackage {
+    name = "node-timezone-0.0.30";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.33.tgz";
-        name = "timezone-0.0.33.tgz";
-        sha1 = "b9ef1fae5eea241d32a022fbb8b6343afd3d2f40";
+        url = "http://registry.npmjs.org/timezone/-/timezone-0.0.30.tgz";
+        name = "timezone-0.0.30.tgz";
+        sha1 = "f83e46d35c017a33a684a4d8bb8fac3debed49bf";
       })
     ];
     buildInputs =
@@ -21091,7 +17878,7 @@
     ];
     passthru.names = [ "timezone" ];
   };
-  "timezone" = self.by-version."timezone"."0.0.33";
+  "timezone" = self.by-version."timezone"."0.0.30";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -21165,8 +17952,6 @@
     ];
     passthru.names = [ "tmp" ];
   };
-  by-spec."tmp"."~0.0.23" =
-    self.by-version."tmp"."0.0.23";
   by-spec."touch"."0.0.2" =
     self.by-version."touch"."0.0.2";
   by-version."touch"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -21201,7 +17986,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.3.0"
+      self.by-version."punycode"."1.2.4"
     ];
     peerDependencies = [
     ];
@@ -21221,7 +18006,7 @@
     buildInputs =
       (self.nativeDeps."tough-cookie" or []);
     deps = [
-      self.by-version."punycode"."1.3.0"
+      self.by-version."punycode"."1.2.4"
     ];
     peerDependencies = [
     ];
@@ -21268,25 +18053,6 @@
     ];
     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 {
@@ -21363,25 +18129,6 @@
     ];
     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 {
@@ -21421,70 +18168,26 @@
     ];
     passthru.names = [ "type-is" ];
   };
-  by-spec."type-is"."1.2.1" =
-    self.by-version."type-is"."1.2.1";
-  by-version."type-is"."1.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-type-is-1.2.1";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/type-is/-/type-is-1.2.1.tgz";
-        name = "type-is-1.2.1.tgz";
-        sha1 = "73d448080a4f1dd18acb1eefff62968c5b5d54a2";
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.1.0.tgz";
+        name = "type-is-1.1.0.tgz";
+        sha1 = "d0245ec8b2676668d59dd0cf3255060676a57db6";
       })
     ];
     buildInputs =
       (self.nativeDeps."type-is" or []);
     deps = [
-      self.by-version."mime-types"."1.0.0"
+      self.by-version."mime"."1.2.11"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "type-is" ];
   };
-  by-spec."type-is"."1.3.1" =
-    self.by-version."type-is"."1.3.1";
-  by-version."type-is"."1.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-type-is-1.3.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/type-is/-/type-is-1.3.1.tgz";
-        name = "type-is-1.3.1.tgz";
-        sha1 = "a6789b5a52138289ade1ef8f6d9f2874ffd70b6b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."type-is" or []);
-    deps = [
-      self.by-version."media-typer"."0.2.0"
-      self.by-version."mime-types"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "type-is" ];
-  };
-  by-spec."type-is"."~1.3.1" =
-    self.by-version."type-is"."1.3.2";
-  by-version."type-is"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-type-is-1.3.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
-        name = "type-is-1.3.2.tgz";
-        sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."type-is" or []);
-    deps = [
-      self.by-version."media-typer"."0.2.0"
-      self.by-version."mime-types"."1.0.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "type-is" ];
-  };
-  by-spec."type-is"."~1.3.2" =
-    self.by-version."type-is"."1.3.2";
   by-spec."typechecker"."~2.0.1" =
     self.by-version."typechecker"."2.0.8";
   by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -21505,14 +18208,14 @@
     passthru.names = [ "typechecker" ];
   };
   by-spec."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";
+    self.by-version."typedarray"."0.0.5";
+  by-version."typedarray"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-typedarray-0.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
-        name = "typedarray-0.0.6.tgz";
-        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+        url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.5.tgz";
+        name = "typedarray-0.0.5.tgz";
+        sha1 = "c4158fcd96c8ef91ef03cc72584c95e032877664";
       })
     ];
     buildInputs =
@@ -21544,21 +18247,21 @@
   };
   "typescript" = self.by-version."typescript"."1.0.1";
   by-spec."uglify-js"."*" =
-    self.by-version."uglify-js"."2.4.14";
-  by-version."uglify-js"."2.4.14" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.14";
+    self.by-version."uglify-js"."2.4.13";
+  by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.14.tgz";
-        name = "uglify-js-2.4.14.tgz";
-        sha1 = "2ae753ede3bb4ebbf25d07bb99cf13e9de007b3e";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz";
+        name = "uglify-js-2.4.13.tgz";
+        sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba";
       })
     ];
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -21566,7 +18269,7 @@
     ];
     passthru.names = [ "uglify-js" ];
   };
-  "uglify-js" = self.by-version."uglify-js"."2.4.14";
+  "uglify-js" = self.by-version."uglify-js"."2.4.13";
   by-spec."uglify-js"."1.2.5" =
     self.by-version."uglify-js"."1.2.5";
   by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -21601,7 +18304,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
       self.by-version."optimist"."0.3.7"
       self.by-version."uglify-to-browserify"."1.0.2"
     ];
@@ -21610,7 +18313,7 @@
     passthru.names = [ "uglify-js" ];
   };
   by-spec."uglify-js"."^2.4.0" =
-    self.by-version."uglify-js"."2.4.14";
+    self.by-version."uglify-js"."2.4.13";
   by-spec."uglify-js"."~2.2" =
     self.by-version."uglify-js"."2.2.5";
   by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -21625,7 +18328,7 @@
     buildInputs =
       (self.nativeDeps."uglify-js" or []);
     deps = [
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -21649,7 +18352,7 @@
       (self.nativeDeps."uglify-js" or []);
     deps = [
       self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.34"
+      self.by-version."source-map"."0.1.33"
       self.by-version."optimist"."0.3.7"
     ];
     peerDependencies = [
@@ -21659,9 +18362,9 @@
   by-spec."uglify-js"."~2.3.6" =
     self.by-version."uglify-js"."2.3.6";
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.14";
+    self.by-version."uglify-js"."2.4.13";
   by-spec."uglify-js"."~2.4.12" =
-    self.by-version."uglify-js"."2.4.14";
+    self.by-version."uglify-js"."2.4.13";
   by-spec."uglify-to-browserify"."~1.0.0" =
     self.by-version."uglify-to-browserify"."1.0.2";
   by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -21700,29 +18403,6 @@
     ];
     passthru.names = [ "uid-number" ];
   };
-  by-spec."uid-safe"."1" =
-    self.by-version."uid-safe"."1.0.1";
-  by-version."uid-safe"."1.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uid-safe-1.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
-        name = "uid-safe-1.0.1.tgz";
-        sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uid-safe" or []);
-    deps = [
-      self.by-version."mz"."1.0.0"
-      self.by-version."base64-url"."1.0.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "uid-safe" ];
-  };
-  by-spec."uid-safe"."1.0.1" =
-    self.by-version."uid-safe"."1.0.1";
   by-spec."uid2"."0.0.3" =
     self.by-version."uid2"."0.0.3";
   by-version."uid2"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -21742,15 +18422,17 @@
     ];
     passthru.names = [ "uid2" ];
   };
-  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";
+  by-spec."uid2"."~0.0.2" =
+    self.by-version."uid2"."0.0.3";
+  by-spec."umd"."~2.0.0" =
+    self.by-version."umd"."2.0.0";
+  by-version."umd"."2.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "umd-2.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
-        name = "umd-2.1.0.tgz";
-        sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf";
+        url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz";
+        name = "umd-2.0.0.tgz";
+        sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f";
       })
     ];
     buildInputs =
@@ -21759,7 +18441,7 @@
       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.14"
+      self.by-version."uglify-js"."2.4.13"
     ];
     peerDependencies = [
     ];
@@ -21785,19 +18467,7 @@
     passthru.names = [ "underscore" ];
   };
   "underscore" = self.by-version."underscore"."1.6.0";
-  by-spec."underscore"."1.6.x" =
-    self.by-version."underscore"."1.6.0";
-  by-spec."underscore".">= 1.3.0" =
-    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" =
+  by-spec."underscore"."1.4.x" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-underscore-1.4.4";
@@ -21816,6 +18486,14 @@
     ];
     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" =
@@ -21839,31 +18517,8 @@
     ];
     passthru.names = [ "underscore" ];
   };
-  by-spec."underscore"."~1.5.1" =
-    self.by-version."underscore"."1.5.2";
   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 {
@@ -21885,6 +18540,23 @@
   };
   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" =
@@ -21903,114 +18575,93 @@
     deps = [
       self.by-version."diff"."1.0.8"
       self.by-version."jsesc"."0.4.3"
-      self.by-version."ministyle"."0.1.4"
+      self.by-version."ministyle"."0.1.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.8.2";
-  by-version."ungit"."0.8.2" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.8.2";
+    self.by-version."ungit"."0.8.0";
+  by-version."ungit"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.8.2.tgz";
-        name = "ungit-0.8.2.tgz";
-        sha1 = "11fe51329ab2aaafaccd155eb0c911a90036b27f";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.8.0.tgz";
+        name = "ungit-0.8.0.tgz";
+        sha1 = "ca1f166ee65fbfe54469459d51f77ca502f1c6a4";
       })
     ];
     buildInputs =
       (self.nativeDeps."ungit" or []);
     deps = [
-      self.by-version."express"."4.4.5"
-      self.by-version."superagent"."0.18.0"
+      self.by-version."express"."4.0.0"
+      self.by-version."superagent"."0.17.0"
       self.by-version."lodash"."2.4.1"
-      self.by-version."temp"."0.8.0"
-      self.by-version."socket.io"."0.9.17"
-      self.by-version."moment"."2.7.0"
-      self.by-version."async"."0.9.0"
-      self.by-version."rc"."0.4.0"
+      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."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.3.1"
+      self.by-version."semver"."2.2.1"
       self.by-version."forever-monitor"."1.1.0"
-      self.by-version."open"."0.0.5"
+      self.by-version."open"."0.0.4"
       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.6.0"
-      self.by-version."keen.io"."0.1.2"
+      self.by-version."color"."0.5.0"
+      self.by-version."keen.io"."0.0.4"
       self.by-version."getmac"."1.0.6"
-      self.by-version."deep-extend"."0.2.10"
-      self.by-version."raven"."0.7.0"
+      self.by-version."deep-extend"."0.2.8"
+      self.by-version."raven"."0.6.3"
       self.by-version."knockout"."3.1.0"
-      self.by-version."npm-registry-client"."3.0.0"
-      self.by-version."npmconf"."2.0.1"
-      self.by-version."mkdirp"."0.5.0"
-      self.by-version."body-parser"."1.4.3"
-      self.by-version."cookie-parser"."1.3.2"
-      self.by-version."express-session"."1.6.1"
-      self.by-version."serve-static"."1.3.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."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"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.8.2";
-  by-spec."unique-stream"."^1.0.0" =
-    self.by-version."unique-stream"."1.0.0";
-  by-version."unique-stream"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-unique-stream-1.0.0";
+  "ungit" = self.by-version."ungit"."0.8.0";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
-        name = "unique-stream-1.0.0.tgz";
-        sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."unique-stream" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "unique-stream" ];
-  };
-  by-spec."update-notifier"."^0.1.3" =
-    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.10.tgz";
-        name = "update-notifier-0.1.10.tgz";
-        sha1 = "215cbe1053369f0d4a44f84b51eba7cb80484695";
+        url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.1.8.tgz";
+        name = "update-notifier-0.1.8.tgz";
+        sha1 = "ebf5c698375f5c232031a419634fab66cc0322a6";
       })
     ];
     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.1"
-      self.by-version."request"."2.36.0"
-      self.by-version."semver"."2.3.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "update-notifier" ];
   };
-  by-spec."update-notifier"."~0.1.3" =
-    self.by-version."update-notifier"."0.1.10";
   by-spec."update-notifier"."~0.1.7" =
-    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"."*" =
+    self.by-version."update-notifier"."0.1.8";
+  by-spec."url"."~0.10.1" =
     self.by-version."url"."0.10.1";
   by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-url-0.10.1";
@@ -22030,8 +18681,27 @@
     ];
     passthru.names = [ "url" ];
   };
-  by-spec."url"."~0.10.1" =
-    self.by-version."url"."0.10.1";
+  by-spec."url"."~0.7.9" =
+    self.by-version."url"."0.7.9";
+  by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-url-0.7.9";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz";
+        name = "url-0.7.9.tgz";
+        sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."url" or []);
+    deps = [
+      self.by-version."querystring"."0.1.0"
+      self.by-version."punycode"."1.0.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "url" ];
+  };
   by-spec."useragent"."~2.0.4" =
     self.by-version."useragent"."2.0.8";
   by-version."useragent"."2.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -22169,7 +18839,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.5.0"
+      self.by-version."mkdirp"."0.3.5"
       self.by-version."ncp"."0.2.7"
       self.by-version."rimraf"."1.0.9"
     ];
@@ -22194,9 +18864,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.5.0"
+      self.by-version."mkdirp"."0.3.5"
       self.by-version."ncp"."0.4.2"
-      self.by-version."rimraf"."2.2.8"
+      self.by-version."rimraf"."2.2.6"
     ];
     peerDependencies = [
     ];
@@ -22204,6 +18874,8 @@
   };
   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" =
@@ -22286,27 +18958,6 @@
     ];
     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."vary"."~0.1.0" =
-    self.by-version."vary"."0.1.0";
   by-spec."vasync"."1.3.3" =
     self.by-version."vasync"."1.3.3";
   by-version."vasync"."1.3.3" = lib.makeOverridable self.buildNodePackage {
@@ -22388,15 +19039,15 @@
     ];
     passthru.names = [ "verror" ];
   };
-  by-spec."vhost"."2.0.0" =
-    self.by-version."vhost"."2.0.0";
-  by-version."vhost"."2.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-vhost-2.0.0";
+  by-spec."vhost"."1.0.0" =
+    self.by-version."vhost"."1.0.0";
+  by-version."vhost"."1.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-vhost-1.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/vhost/-/vhost-2.0.0.tgz";
-        name = "vhost-2.0.0.tgz";
-        sha1 = "1e26770bd0fce86c40945591e6f284c6891791e2";
+        url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
+        name = "vhost-1.0.0.tgz";
+        sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0";
       })
     ];
     buildInputs =
@@ -22408,14 +19059,14 @@
     passthru.names = [ "vhost" ];
   };
   by-spec."view-helpers"."*" =
-    self.by-version."view-helpers"."0.1.5";
-  by-version."view-helpers"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-view-helpers-0.1.5";
+    self.by-version."view-helpers"."0.1.4";
+  by-version."view-helpers"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-view-helpers-0.1.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
-        name = "view-helpers-0.1.5.tgz";
-        sha1 = "175d220a6afeca8e3b497b003e2337bcc596f761";
+        url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.4.tgz";
+        name = "view-helpers-0.1.4.tgz";
+        sha1 = "aeadfbcc2c21343d2b0ef4d4f20f805764286cee";
       })
     ];
     buildInputs =
@@ -22426,56 +19077,7 @@
     ];
     passthru.names = [ "view-helpers" ];
   };
-  "view-helpers" = self.by-version."view-helpers"."0.1.5";
-  by-spec."vinyl"."^0.2.0" =
-    self.by-version."vinyl"."0.2.3";
-  by-version."vinyl"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-vinyl-0.2.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz";
-        name = "vinyl-0.2.3.tgz";
-        sha1 = "bca938209582ec5a49ad538a00fa1f125e513252";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vinyl" or []);
-    deps = [
-      self.by-version."clone-stats"."0.0.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "vinyl" ];
-  };
-  by-spec."vinyl"."^0.2.3" =
-    self.by-version."vinyl"."0.2.3";
-  by-spec."vinyl-fs"."^0.3.3" =
-    self.by-version."vinyl-fs"."0.3.4";
-  by-version."vinyl-fs"."0.3.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-vinyl-fs-0.3.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.4.tgz";
-        name = "vinyl-fs-0.3.4.tgz";
-        sha1 = "0df7154a9e07d47b14d2fcff914303439da97a84";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."vinyl-fs" or []);
-    deps = [
-      self.by-version."glob-stream"."3.1.13"
-      self.by-version."glob-watcher"."0.0.6"
-      self.by-version."graceful-fs"."3.0.2"
-      self.by-version."lodash.defaults"."2.4.1"
-      self.by-version."mkdirp"."0.5.0"
-      self.by-version."strip-bom"."0.3.1"
-      self.by-version."through2"."0.5.1"
-      self.by-version."vinyl"."0.2.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "vinyl-fs" ];
-  };
+  "view-helpers" = self.by-version."view-helpers"."0.1.4";
   by-spec."vm-browserify"."~0.0.1" =
     self.by-version."vm-browserify"."0.0.4";
   by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -22518,26 +19120,26 @@
     passthru.names = [ "vows" ];
   };
   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";
+    self.by-version."walk"."2.3.1";
+  by-version."walk"."2.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-walk-2.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/walk/-/walk-2.3.3.tgz";
-        name = "walk-2.3.3.tgz";
-        sha1 = "b4c0e8c42464c16dbbe1d71666765eac07819e5f";
+        url = "http://registry.npmjs.org/walk/-/walk-2.3.1.tgz";
+        name = "walk-2.3.1.tgz";
+        sha1 = "015e0ef7a636ac43185661a9673d459572a44050";
       })
     ];
     buildInputs =
       (self.nativeDeps."walk" or []);
     deps = [
-      self.by-version."foreachasync"."3.0.0"
+      self.by-version."forEachAsync"."2.2.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "walk" ];
   };
-  "walk" = self.by-version."walk"."2.3.3";
+  "walk" = self.by-version."walk"."2.3.1";
   by-spec."walk"."~2.2.1" =
     self.by-version."walk"."2.2.1";
   by-version."walk"."2.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -22596,61 +19198,41 @@
     ];
     passthru.names = [ "watch" ];
   };
-  by-spec."wcwidth.js"."~0.0.4" =
-    self.by-version."wcwidth.js"."0.0.4";
-  by-version."wcwidth.js"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-wcwidth.js-0.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wcwidth.js/-/wcwidth.js-0.0.4.tgz";
-        name = "wcwidth.js-0.0.4.tgz";
-        sha1 = "44298a7c899c17501990fdaddd76ef6bd081be75";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wcwidth.js" or []);
-    deps = [
-      self.by-version."underscore"."1.6.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "wcwidth.js" ];
-  };
   by-spec."wd"."~0.2.12" =
-    self.by-version."wd"."0.2.27";
-  by-version."wd"."0.2.27" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.27";
+    self.by-version."wd"."0.2.19";
+  by-version."wd"."0.2.19" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.2.19";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.27.tgz";
-        name = "wd-0.2.27.tgz";
-        sha1 = "db25a671e14d76e4886a0c5014606acde065f4cf";
+        url = "http://registry.npmjs.org/wd/-/wd-0.2.19.tgz";
+        name = "wd-0.2.19.tgz";
+        sha1 = "347ae75adebc15ad642baec118742344d749f169";
       })
     ];
     buildInputs =
       (self.nativeDeps."wd" or []);
     deps = [
-      self.by-version."archiver"."0.10.1"
-      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."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."lodash"."2.4.1"
+      self.by-version."underscore.string"."2.3.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "wd" ];
   };
   by-spec."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";
+    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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
-        name = "weak-map-1.0.5.tgz";
-        sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
+        url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.4.tgz";
+        name = "weak-map-1.0.4.tgz";
+        sha1 = "1acddee2cc90eb30950860b7415c79cefc5f07c9";
       })
     ];
     buildInputs =
@@ -22662,14 +19244,14 @@
     passthru.names = [ "weak-map" ];
   };
   by-spec."webdrvr"."*" =
-    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";
+    self.by-version."webdrvr"."2.40.0";
+  by-version."webdrvr"."2.40.0" = lib.makeOverridable self.buildNodePackage {
+    name = "webdrvr-2.40.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.41.0-0.tgz";
-        name = "webdrvr-2.41.0-0.tgz";
-        sha1 = "c74f22b27f0778d0c2b7e5cbda1edd113d782884";
+        url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.40.0.tgz";
+        name = "webdrvr-2.40.0.tgz";
+        sha1 = "689f5d3fad5008ffc7b273d607eea9dd7d26ca42";
       })
     ];
     buildInputs =
@@ -22678,8 +19260,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.16"
-      self.by-version."phantomjs"."1.9.7-12"
+      self.by-version."npmconf"."0.1.14"
+      self.by-version."phantomjs"."1.9.7-4"
       self.by-version."tmp"."0.0.23"
       self.by-version."follow-redirects"."0.0.3"
     ];
@@ -22687,16 +19269,16 @@
     ];
     passthru.names = [ "webdrvr" ];
   };
-  "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";
+  "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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.4.tgz";
-        name = "websocket-driver-0.3.4.tgz";
-        sha1 = "f37ab303f6a602c4b0dbcaa1cdd771e442b04ea7";
+        url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.2.tgz";
+        name = "websocket-driver-0.3.2.tgz";
+        sha1 = "f177ef6611390e2401ae47f35e8386dda987daca";
       })
     ];
     buildInputs =
@@ -22707,6 +19289,8 @@
     ];
     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 {
@@ -22855,28 +19439,23 @@
     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.8.1";
-  by-version."wiredep"."1.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "wiredep-1.8.1";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wiredep/-/wiredep-1.8.1.tgz";
-        name = "wiredep-1.8.1.tgz";
-        sha1 = "2ed95a4c3065760ac29831a78036b7a2e8bb0422";
+        url = "http://registry.npmjs.org/wiredep/-/wiredep-1.0.0.tgz";
+        name = "wiredep-1.0.0.tgz";
+        sha1 = "2e570465657b97e7494abf62978a3e52fc37ac52";
       })
     ];
     buildInputs =
       (self.nativeDeps."wiredep" or []);
     deps = [
-      self.by-version."bower-config"."0.5.2"
-      self.by-version."chalk"."0.1.1"
-      self.by-version."glob"."3.2.11"
       self.by-version."lodash"."1.3.1"
-      self.by-version."minimist"."0.1.0"
-      self.by-version."modmod"."0.1.2"
-      self.by-version."propprop"."0.3.0"
-      self.by-version."through2"."0.4.2"
+      self.by-version."chalk"."0.1.1"
+      self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
     ];
@@ -22936,31 +19515,12 @@
     buildInputs =
       (self.nativeDeps."with" or []);
     deps = [
-      self.by-version."uglify-js"."2.4.14"
+      self.by-version."uglify-js"."2.4.13"
     ];
     peerDependencies = [
     ];
     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 {
@@ -23024,6 +19584,25 @@
   };
   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 {
@@ -23109,41 +19688,41 @@
     ];
     passthru.names = [ "xml2js" ];
   };
-  by-spec."xml2js"."0.2.6" =
-    self.by-version."xml2js"."0.2.6";
-  by-version."xml2js"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xml2js-0.2.6";
+  by-spec."xml2js"."0.2.x" =
+    self.by-version."xml2js"."0.2.8";
+  by-version."xml2js"."0.2.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xml2js-0.2.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
-        name = "xml2js-0.2.6.tgz";
-        sha1 = "d209c4e4dda1fc9c452141ef41c077f5adfdf6c4";
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
+        name = "xml2js-0.2.8.tgz";
+        sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
       })
     ];
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.4.2"
+      self.by-version."sax"."0.5.8"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "xml2js" ];
   };
   by-spec."xml2js".">= 0.0.1" =
-    self.by-version."xml2js"."0.4.4";
-  by-version."xml2js"."0.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xml2js-0.4.4";
+    self.by-version."xml2js"."0.4.2";
+  by-version."xml2js"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xml2js-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
-        name = "xml2js-0.4.4.tgz";
-        sha1 = "3111010003008ae19240eba17497b57c729c555d";
+        url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.2.tgz";
+        name = "xml2js-0.4.2.tgz";
+        sha1 = "93911c393c4a332a2dce1222801eb571453b2f90";
       })
     ];
     buildInputs =
       (self.nativeDeps."xml2js" or []);
     deps = [
-      self.by-version."sax"."0.6.0"
+      self.by-version."sax"."0.5.8"
       self.by-version."xmlbuilder"."2.2.1"
     ];
     peerDependencies = [
@@ -23151,9 +19730,7 @@
     passthru.names = [ "xml2js" ];
   };
   by-spec."xml2js".">=0.1.7" =
-    self.by-version."xml2js"."0.4.4";
-  by-spec."xml2js"."^0.4.4" =
-    self.by-version."xml2js"."0.4.4";
+    self.by-version."xml2js"."0.4.2";
   by-spec."xmlbuilder"."0.4.2" =
     self.by-version."xmlbuilder"."0.4.2";
   by-version."xmlbuilder"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -23173,7 +19750,7 @@
     ];
     passthru.names = [ "xmlbuilder" ];
   };
-  by-spec."xmlbuilder".">=1.0.0" =
+  by-spec."xmlbuilder".">=0.4.2" =
     self.by-version."xmlbuilder"."2.2.1";
   by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-xmlbuilder-2.2.1";
@@ -23231,7 +19808,7 @@
     ];
     passthru.names = [ "xmlhttprequest" ];
   };
-  by-spec."xoauth2"."~0.1.8" =
+  by-spec."xoauth2"."~0.1" =
     self.by-version."xoauth2"."0.1.8";
   by-version."xoauth2"."0.1.8" = lib.makeOverridable self.buildNodePackage {
     name = "node-xoauth2-0.1.8";
@@ -23250,25 +19827,6 @@
     ];
     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 {
@@ -23291,159 +19849,26 @@
   };
   by-spec."xtend"."~2.1.2" =
     self.by-version."xtend"."2.1.2";
-  by-spec."xtend"."~3.0.0" =
-    self.by-version."xtend"."3.0.0";
-  by-spec."yargs"."~1.2.1" =
-    self.by-version."yargs"."1.2.6";
-  by-version."yargs"."1.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yargs-1.2.6";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz";
-        name = "yargs-1.2.6.tgz";
-        sha1 = "9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b";
+        url = "http://registry.npmjs.org/yargs/-/yargs-1.1.3.tgz";
+        name = "yargs-1.1.3.tgz";
+        sha1 = "c44ed2bb9c86d55b557f2179fea7c7013fe4c42a";
       })
     ];
     buildInputs =
       (self.nativeDeps."yargs" or []);
     deps = [
-      self.by-version."minimist"."0.1.0"
+      self.by-version."minimist"."0.0.8"
     ];
     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.18"
-      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.1";
-  by-version."yeoman-generator"."0.17.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-yeoman-generator-0.17.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yeoman-generator/-/yeoman-generator-0.17.1.tgz";
-        name = "yeoman-generator-0.17.1.tgz";
-        sha1 = "f479d9a5fdf9d9590ef14f86954efd25ad1c0778";
-      })
-    ];
-    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.17.0"
-      self.by-version."class-extend"."0.1.1"
-      self.by-version."dargs"."0.1.0"
-      self.by-version."debug"."1.0.2"
-      self.by-version."diff"."1.0.8"
-      self.by-version."download"."0.1.18"
-      self.by-version."file-utils"."0.2.0"
-      self.by-version."findup-sync"."0.1.3"
-      self.by-version."github-username"."0.1.1"
-      self.by-version."glob"."4.0.3"
-      self.by-version."grouped-queue"."0.3.0"
-      self.by-version."gruntfile-editor"."0.1.1"
-      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"."3.0.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"."git://github.com/yeoman/generator#02dc62715d0bc0550def40290fd38a48bd6e63d3" =
-    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 = [
-      (fetchgit {
-        url = "git://github.com/yeoman/generator";
-        rev = "02dc62715d0bc0550def40290fd38a48bd6e63d3";
-        sha256 = "f00ff56324d77adea72131ea408ce1062edde74c41bd07a098ec313b29ccdd3f";
-      })
-    ];
-    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.17.0"
-      self.by-version."class-extend"."0.1.1"
-      self.by-version."dargs"."0.1.0"
-      self.by-version."debug"."1.0.2"
-      self.by-version."diff"."1.0.8"
-      self.by-version."download"."0.1.18"
-      self.by-version."file-utils"."0.2.0"
-      self.by-version."findup-sync"."0.1.3"
-      self.by-version."github-username"."0.1.1"
-      self.by-version."glob"."4.0.3"
-      self.by-version."grouped-queue"."0.3.0"
-      self.by-version."gruntfile-editor"."0.1.1"
-      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"."3.0.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 {
@@ -23459,13 +19884,13 @@
       (self.nativeDeps."yeoman-generator" or []);
     deps = [
       self.by-version."cheerio"."0.12.4"
-      self.by-version."rimraf"."2.2.8"
+      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.2.1"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."glob"."3.2.11"
+      self.by-version."glob"."3.2.9"
       self.by-version."debug"."0.7.4"
       self.by-version."isbinaryfile"."0.1.9"
       self.by-version."dargs"."0.1.0"
@@ -23476,7 +19901,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.18"
+      self.by-version."download"."0.1.16"
       self.by-version."request"."2.27.0"
       self.by-version."file-utils"."0.1.5"
     ];
@@ -23484,74 +19909,84 @@
     ];
     passthru.names = [ "yeoman-generator" ];
   };
-  by-spec."yo"."*" =
-    self.by-version."yo"."1.2.0";
-  by-version."yo"."1.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "yo-1.2.0";
+  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/yo/-/yo-1.2.0.tgz";
-        name = "yo-1.2.0.tgz";
-        sha1 = "ce499ba3f06963772d77c03e8daefe8686d8047d";
+        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 {
+    name = "yo-1.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/yo/-/yo-1.1.2.tgz";
+        name = "yo-1.1.2.tgz";
+        sha1 = "a0d4da72e83fa0e0dbfe1d0ba258881b240ab854";
       })
     ];
     buildInputs =
       (self.nativeDeps."yo" or []);
     deps = [
-      self.by-version."async"."0.9.0"
+      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."insight"."0.3.1"
+      self.by-version."sudo-block"."0.3.0"
+      self.by-version."async"."0.2.10"
+      self.by-version."open"."0.0.4"
       self.by-version."chalk"."0.4.0"
       self.by-version."findup"."0.1.5"
-      self.by-version."fullname"."0.1.0"
-      self.by-version."insight"."0.3.1"
-      self.by-version."is-root"."0.1.0"
-      self.by-version."lodash"."2.4.1"
-      self.by-version."nopt"."3.0.1"
-      self.by-version."opn"."0.1.2"
-      self.by-version."shelljs"."0.3.0"
-      self.by-version."string-length"."0.1.2"
-      self.by-version."sudo-block"."0.4.0"
-      self.by-version."update-notifier"."0.1.10"
-      self.by-version."yeoman-generator"."0.17.1"
-      self.by-version."yosay"."0.2.1"
+      self.by-version."shelljs"."0.2.6"
     ];
     peerDependencies = [
       self.by-version."grunt-cli"."0.1.13"
-      self.by-version."bower"."1.3.6"
+      self.by-version."bower"."1.3.2"
     ];
     passthru.names = [ "yo" ];
   };
-  "yo" = self.by-version."yo"."1.2.0";
+  "yo" = self.by-version."yo"."1.1.2";
   by-spec."yo".">=1.0.0" =
-    self.by-version."yo"."1.2.0";
+    self.by-version."yo"."1.1.2";
   by-spec."yo".">=1.0.0-rc.1.1" =
-    self.by-version."yo"."1.2.0";
-  by-spec."yo".">=1.2.0" =
-    self.by-version."yo"."1.2.0";
-  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."yosay"."^0.2.1" =
-    self.by-version."yosay"."0.2.1";
+    self.by-version."yo"."1.1.2";
   by-spec."zeparser"."0.0.5" =
     self.by-version."zeparser"."0.0.5";
   by-version."zeparser"."0.0.5" = lib.makeOverridable self.buildNodePackage {
@@ -23571,26 +20006,22 @@
     ];
     passthru.names = [ "zeparser" ];
   };
-  by-spec."zip-stream"."~0.3.0" =
-    self.by-version."zip-stream"."0.3.6";
-  by-version."zip-stream"."0.3.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-zip-stream-0.3.6";
+  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";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.3.6.tgz";
-        name = "zip-stream-0.3.6.tgz";
-        sha1 = "0f5396e003d40c5052bc53357354d75f96d9b217";
+        url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.1.4.tgz";
+        name = "zip-stream-0.1.4.tgz";
+        sha1 = "fe5b565bc366b8d73d5d4c1606e07c8947de1654";
       })
     ];
     buildInputs =
       (self.nativeDeps."zip-stream" or []);
     deps = [
-      self.by-version."buffer-crc32"."0.2.3"
-      self.by-version."crc32-stream"."0.2.0"
-      self.by-version."debug"."1.0.2"
-      self.by-version."deflate-crc32-stream"."0.1.1"
-      self.by-version."lodash"."2.4.1"
       self.by-version."readable-stream"."1.0.27-1"
+      self.by-version."lodash.defaults"."2.4.1"
     ];
     peerDependencies = [
     ];
@@ -23616,4 +20047,6 @@
     ];
     passthru.names = [ "zlib-browserify" ];
   };
+  by-spec."zlib-browserify"."~0.0.3" =
+    self.by-version."zlib-browserify"."0.0.3";
 }
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 58f01d064850..4d220a008290 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -131,5 +131,4 @@
 , "sinon"
 , "shelljs"
 , "typescript"
-, "couchapp"
 ]

From e658ae9694301671ec73acdfe588ddbf78fbae99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 5 Jul 2014 16:09:27 +0200
Subject: [PATCH 162/167] Revert "haskell-gtkglext: update to version 0.12.5.0"

Because it breaks nixpkgs evaluation:

$ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named `haskell-gtkglext-ghc7.6.3-0.12.5.0':
while evaluating the attribute `propagatedNativeBuildInputs' of the derivation `haskell-gtkglext-ghc7.6.3-0.12.5.0' at /home/bfo/nixpkgs/pkgs/build-support/cabal/default.nix:70:13:
infinite recursion encountered

This reverts commit 6ba32aa8bdfd73b6b55d07f270a3f344007ab7cb.
---
 pkgs/development/libraries/haskell/gtkglext/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gtkglext/default.nix b/pkgs/development/libraries/haskell/gtkglext/default.nix
index 3612962ec882..b98b478429cd 100644
--- a/pkgs/development/libraries/haskell/gtkglext/default.nix
+++ b/pkgs/development/libraries/haskell/gtkglext/default.nix
@@ -1,12 +1,12 @@
-{ cabal, glib, gtk, gtk2hsBuildtools, gtkglext, pango }:
+{ pkgs, cabal, gtk, gtk2hsBuildtools, pangox_compat }:
 
 cabal.mkDerivation (self: {
   pname = "gtkglext";
   version = "0.12.5.0";
   sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
-  buildDepends = [ glib gtk pango ];
+  buildDepends = [ gtk ];
   buildTools = [ gtk2hsBuildtools ];
-  pkgconfigDepends = [ gtkglext ];
+  pkgconfigDepends = [ pkgs.gnome2.gtkglext pangox_compat ];
   meta = {
     homepage = "http://projects.haskell.org/gtk2hs/";
     description = "Binding to the GTK+ OpenGL Extension";

From 9ec0a105d31391fad2e7a3d86fd6ca78a2036fae Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 5 Jul 2014 19:25:22 +0200
Subject: [PATCH 163/167] gnome-shell: enable parallel building

---
 pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
index 49514b3dbe44..50250c75aa71 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
@@ -41,6 +41,9 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };

From 55dc58d7d04c73608074d5d7e81e3669ef637afa Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 5 Jul 2014 19:25:33 +0200
Subject: [PATCH 164/167] evolution-data-server: wrap all libexec executables

---
 .../gnome-3/3.12/core/evolution-data-server/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
index d7f65ca6741a..b8711f7e563d 100644
--- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
                    ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
 
   preFixup = ''
-    for f in "$out/libexec/evolution-addressbook-factory" "$out/libexec/evolution-calendar-factory"; do
-      wrapProgram $f --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    for f in "$out/libexec/"*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 

From 1c1747be0d2c85c45ba13aa78b50ff62d7a80c3c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 5 Jul 2014 21:15:51 +0200
Subject: [PATCH 165/167] Add gnome shell extensions plugin for browsers

---
 pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix                         | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
index 50250c75aa71..2fb1e091aa0e 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
@@ -39,11 +39,16 @@ stdenv.mkDerivation rec {
 
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+    echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
   '';
 
-
   enableParallelBuilding = true;
 
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6535fea8162..f20f6ef89531 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9924,6 +9924,7 @@ let
           ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin
           ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
           ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
+          ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
          );
       libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
              (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);

From 1b7d5ff4697eca40a5ace34bb14bc56031f6b5ea Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Jul 2014 11:30:47 +0200
Subject: [PATCH 166/167] empathy: fix icons

---
 pkgs/desktops/gnome-3/3.12/core/empathy/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
index 458bd33240e5..7fb341948be5 100644
--- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
@@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
-                            gnome3.gnome_icon_theme hicolor_icon_theme
-                            gnome_online_accounts shared_mime_info
-                            gnome3.gnome_icon_theme_symbolic ];
+                            gnome_online_accounts shared_mime_info ];
   propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
                             telepathy_mission_control ];
   buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
@@ -31,6 +29,7 @@ stdenv.mkDerivation rec {
                   gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
                   libnotify clutter libsoup gnutls libgee p11_kit
                   libcanberra_gtk3 telepathy_farstream farstream
+                  gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   gnome3.gsettings_desktop_schemas file libtool librsvg ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
     for f in $out/bin/* $out/libexec/*; do
       wrapProgram $f \
         --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
     done
     rm $out/share/icons/hicolor/icon-theme.cache
   '';

From 873832ab6db5bafaaa9070ab5c0dacca551d062c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 6 Jul 2014 11:49:52 +0200
Subject: [PATCH 167/167] telepathy-gabble: build on hydra

---
 .../instant-messengers/telepathy/gabble/default.nix           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index b3036037f7fa..8a945bc7e2d0 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -9,12 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "137sslbgh0326lmwihcr2ybljgq9mzsx5wnciilpx884si22wpk8";
   };
 
-  nativeBuildInputs = [pkgconfig libxslt];
+  nativeBuildInputs = [ pkgconfig libxslt ];
   buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
 
   meta = {
     homepage = http://telepathy.freedesktop.org;
+    description = "Jabber/XMPP connection manager for the Telepathy framework";
+    platforms = stdenv.lib.platforms.gnu;
   };
 }